feat(maestro): cleaning and fixes.

orb-community · Sep 26, 2023 · 089acb0 · 089acb0
1 parent 86b8ffc
commit 089acb0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cmd/maestro/main.go b/cmd/maestro/main.go
@@ -51,6 +51,8 @@ func main() {
 	jCfg := config.LoadJaegerConfig(envPrefix)
 	sinksGRPCCfg := config.LoadGRPCConfig("orb", "sinks")
 	dbCfg := config.LoadPostgresConfig(envPrefix, svcName)
+	encryptionKey := config.LoadEncryptionKey(envPrefix)
+	svcCfg.EncryptionKey = encryptionKey.Key
 
 	// logger
 	var logger *zap.Logger

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -46,11 +46,10 @@ type InMemoryCacheConfig struct {
 }
 
 type EsConfig struct {
-	URL           string `mapstructure:"url"`
-	Pass          string `mapstructure:"pass"`
-	DB            string `mapstructure:"db"`
-	Consumer      string `mapstructure:"consumer"`
-	EncryptionKey string `mapstructure:"encryption_key"`
+	URL      string `mapstructure:"url"`
+	Pass     string `mapstructure:"pass"`
+	DB       string `mapstructure:"db"`
+	Consumer string `mapstructure:"consumer"`
 }
 
 type JaegerConfig struct {
@@ -66,6 +65,7 @@ type BaseSvcConfig struct {
 	HttpPort       string `mapstructure:"http_port"`
 	HttpServerCert string `mapstructure:"server_cert"`
 	HttpServerKey  string `mapstructure:"server_key"`
+	EncryptionKey  string `mapstructure:"encryption_key"`
 }
 
 type PostgresConfig struct {