diff --git a/internal/app/app.go b/internal/app/app.go index 706841ec..4b89daa9 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -13,7 +13,6 @@ var ( Version string UserAgent string ConfigPath string - SecretPath string Info = make(map[string]any) ) @@ -78,10 +77,6 @@ func Init() { if ConfigPath != "" { Logger.Info().Str("path", ConfigPath).Msg("config") } - - if SecretPath != "" { - Logger.Info().Str("path", SecretPath).Msg("secrets") - } } func readRevisionTime() (revision, vcsTime string) { diff --git a/internal/app/secrets.go b/internal/app/secrets.go index b7773b65..3c3cbbfe 100644 --- a/internal/app/secrets.go +++ b/internal/app/secrets.go @@ -26,35 +26,35 @@ type Secrets interface { type Secret struct { Secrets - Name string + Name string Values map[string]any } func NewSecret(name string, values interface{}) *Secret { - secretsMu.Lock() - defer secretsMu.Unlock() + secretsMu.Lock() + defer secretsMu.Unlock() - if s, exists := secrets[name]; exists { - return s - } + if s, exists := secrets[name]; exists { + return s + } - s := &Secret{Name: name, Values: make(map[string]any)} - - switch v := values.(type) { - case map[string]any: - s.Values = v - default: - data, err := yaml.Encode(values, 2) - if err == nil { - var mapValues map[string]any - if err := yaml.Unmarshal(data, &mapValues); err == nil { - s.Values = mapValues - } - } - } + s := &Secret{Name: name, Values: make(map[string]any)} - secrets[name] = s - return s + switch v := values.(type) { + case map[string]any: + s.Values = v + default: + data, err := yaml.Encode(values, 2) + if err == nil { + var mapValues map[string]any + if err := yaml.Unmarshal(data, &mapValues); err == nil { + s.Values = mapValues + } + } + } + + secrets[name] = s + return s } func (s *Secret) Get(key string) any { diff --git a/pkg/core/listener.go b/pkg/core/listener.go index 2840880d..7a512741 100644 --- a/pkg/core/listener.go +++ b/pkg/core/listener.go @@ -21,4 +21,4 @@ func (l *Listener) Fire(msg any) { func (l *Listener) NewSecret(name string, defaultValues interface{}) *app.Secret { return app.NewSecret(name, defaultValues) -} \ No newline at end of file +}