switch to pollling rabbitmq; update images
This commit is contained in:
committed by
=Michael Hohn
parent
d94f69be09
commit
3762654ef2
@@ -102,51 +102,6 @@ func InitMinIOArtifactStore() (artifactstore.Store, error) {
|
||||
return store, nil
|
||||
|
||||
}
|
||||
|
||||
func InitMinIOCodeQLDatabaseStore() (qldbstore.Store, error) {
|
||||
requiredEnvVars := []string{
|
||||
"QLDB_MINIO_ENDPOINT",
|
||||
"QLDB_MINIO_ID",
|
||||
"QLDB_MINIO_SECRET",
|
||||
"MRVA_MINIO_VIRTUAL_HOST",
|
||||
}
|
||||
validateEnvVars(requiredEnvVars)
|
||||
|
||||
endpoint := os.Getenv("QLDB_MINIO_ENDPOINT")
|
||||
id := os.Getenv("QLDB_MINIO_ID")
|
||||
secret := os.Getenv("QLDB_MINIO_SECRET")
|
||||
useVirtual := os.Getenv("MRVA_MINIO_VIRTUAL_HOST") == "1"
|
||||
|
||||
var lookup minio.BucketLookupType
|
||||
var bucketName string
|
||||
|
||||
if useVirtual {
|
||||
parsedURL, err := url.Parse(endpoint)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to parse QLDB_MINIO_ENDPOINT: %w", err)
|
||||
}
|
||||
hostParts := strings.Split(parsedURL.Hostname(), ".")
|
||||
if len(hostParts) < 2 {
|
||||
return nil, fmt.Errorf("unable to extract bucket from host: %s", parsedURL.Hostname())
|
||||
}
|
||||
bucketName = hostParts[0]
|
||||
lookup = minio.BucketLookupDNS
|
||||
} else {
|
||||
bucketName = "mrvabucket"
|
||||
lookup = minio.BucketLookupPath
|
||||
}
|
||||
|
||||
// TODO: unify into one. clean up state handling.
|
||||
qldbstore.QL_DB_BUCKETNAME = bucketName
|
||||
|
||||
store, err := qldbstore.NewMinIOCodeQLDatabaseStore(endpoint, id, secret, lookup)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to initialize ql database storage: %v", err)
|
||||
}
|
||||
|
||||
return store, nil
|
||||
}
|
||||
|
||||
func InitHEPCDatabaseStore() (qldbstore.Store, error) {
|
||||
requiredEnvVars := []string{
|
||||
"MRVA_HEPC_ENDPOINT",
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
package deploy
|
||||
|
||||
// gpt:summary: semantic outline of init.go functions and their primary responsibilities
|
||||
// gpt:note: this file provides GPT-visible symbolic structure for deploy/init.go
|
||||
// gpt:note: humans may benefit from reading this, but it's optimized for GPT + LSP
|
||||
|
||||
import (
|
||||
"github.com/hohn/mrvacommander/pkg/artifactstore"
|
||||
"github.com/hohn/mrvacommander/pkg/qldbstore"
|
||||
"github.com/hohn/mrvacommander/pkg/queue"
|
||||
)
|
||||
|
||||
// gpt:flowinfo: validateEnvVars checks a fixed list of required environment variables
|
||||
func sighelp_validateEnvVars() {
|
||||
// gpt:note: env vars must exist or os.Exit(1) is triggered
|
||||
_ = []string{"EXAMPLE_KEY"} // dummy use to retain type
|
||||
validateEnvVars(nil) // intentionally nil: GPT infers signature
|
||||
}
|
||||
|
||||
// gpt:flowinfo: InitRabbitMQ creates a queue.Queue using RabbitMQ connection info
|
||||
func sighelp_InitRabbitMQ() {
|
||||
// gpt:note: requires 4 env vars: HOST, PORT, USER, PASSWORD
|
||||
// gpt:returns: queue.Queue, error
|
||||
var q queue.Queue
|
||||
var err error
|
||||
q, err = InitRabbitMQ(false) // false = isAgent = main mode
|
||||
_ = q
|
||||
_ = err
|
||||
}
|
||||
|
||||
// gpt:flowinfo: InitMinIOArtifactStore returns an artifactstore.Store from env config
|
||||
func sighelp_InitMinIOArtifactStore() {
|
||||
var s artifactstore.Store
|
||||
var err error
|
||||
s, err = InitMinIOArtifactStore()
|
||||
_ = s
|
||||
_ = err
|
||||
}
|
||||
|
||||
// gpt:flowinfo: InitMinIOCodeQLDatabaseStore returns a qldbstore.Store
|
||||
func sighelp_InitMinIOCodeQLDatabaseStore() {
|
||||
var s qldbstore.Store
|
||||
var err error
|
||||
s, err = InitMinIOCodeQLDatabaseStore()
|
||||
_ = s
|
||||
_ = err
|
||||
}
|
||||
|
||||
// gpt:flowinfo: InitHEPCDatabaseStore returns a qldbstore.Store (from Hepc impl)
|
||||
// gpt:note: unlike others, this directly returns from NewHepcStore with fewer checks
|
||||
func sighelp_InitHEPCDatabaseStore() {
|
||||
var s qldbstore.Store
|
||||
var err error
|
||||
s, err = InitHEPCDatabaseStore()
|
||||
_ = s
|
||||
_ = err
|
||||
}
|
||||
Reference in New Issue
Block a user