fix: remarks

Signed-off-by: Bence Csati <[email protected]>
bank-vaults · Apr 5, 2024 · a7464bd · a7464bd
1 parent e4e21f6
commit a7464bd
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 36 deletions.
diff --git a/env_store.go b/env_store.go
@@ -38,10 +38,11 @@ var supportedProviders = []string{
 // EnvStore is a helper for managing interactions between environment variables and providers,
 // including tasks like extracting and converting provider-specific paths and secrets.
 type EnvStore struct {
-	data map[string]string
+	data      map[string]string
+	appConfig *common.Config
 }
 
-func NewEnvStore() *EnvStore {
+func NewEnvStore(appConfig *common.Config) *EnvStore {
 	environ := make(map[string]string, len(os.Environ()))
 	for _, env := range os.Environ() {
 		split := strings.SplitN(env, "=", 2)
@@ -51,7 +52,8 @@ func NewEnvStore() *EnvStore {
 	}
 
 	return &EnvStore{
-		data: environ,
+		data:      environ,
+		appConfig: appConfig,
 	}
 }
 
@@ -83,7 +85,7 @@ func (s *EnvStore) GetProviderPaths() map[string][]string {
 // LoadProviderSecrets creates a new provider for each detected provider using a specified config.
 // It then asynchronously loads secrets using each provider and it's corresponding paths.
 // The secrets from each provider are then placed into a map with the provider name as the key.
-func (s *EnvStore) LoadProviderSecrets(providerPaths map[string][]string, appConfig *common.Config) (map[string][]provider.Secret, error) {
+func (s *EnvStore) LoadProviderSecrets(providerPaths map[string][]string) (map[string][]provider.Secret, error) {
 	// At most, we will have one error per provider
 	errCh := make(chan error, len(supportedProviders))
 	providerSecrets := make(map[string][]provider.Secret)
@@ -93,7 +95,7 @@ func (s *EnvStore) LoadProviderSecrets(providerPaths map[string][]string, appCon
 	vaultPaths, ok := providerPaths[vault.ProviderName]
 	if ok {
 		var err error
-		providerSecrets[vault.ProviderName], err = s.workaroundForBao(vaultPaths, appConfig)
+		providerSecrets[vault.ProviderName], err = s.workaroundForBao(vaultPaths)
 		if err != nil {
 			return nil, fmt.Errorf("failed to workaround for bao: %w", err)
 		}
@@ -111,7 +113,7 @@ func (s *EnvStore) LoadProviderSecrets(providerPaths map[string][]string, appCon
 		go func(providerName string, paths []string, errCh chan<- error) {
 			defer wg.Done()
 
-			provider, err := newProvider(providerName, appConfig)
+			provider, err := newProvider(providerName, s.appConfig)
 			if err != nil {
 				errCh <- fmt.Errorf("failed to create provider %s: %w", providerName, err)
 				return
@@ -148,10 +150,10 @@ func (s *EnvStore) LoadProviderSecrets(providerPaths map[string][]string, appCon
 }
 
 // Workaround for openBao, essentially loading secretes from Vault first.
-func (s *EnvStore) workaroundForBao(vaultPaths []string, appConfig *common.Config) ([]provider.Secret, error) {
+func (s *EnvStore) workaroundForBao(vaultPaths []string) ([]provider.Secret, error) {
 	var secrets []provider.Secret
 
-	provider, err := newProvider(vault.ProviderName, appConfig)
+	provider, err := newProvider(vault.ProviderName, s.appConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create provider %s: %w", vault.ProviderName, err)
 	}

diff --git a/env_store_test.go b/env_store_test.go
@@ -95,7 +95,7 @@ func TestEnvStore_GetProviderPaths(t *testing.T) {
 				os.Clearenv()
 			})
 
-			paths := NewEnvStore().GetProviderPaths()
+			paths := NewEnvStore(&common.Config{}).GetProviderPaths()
 
 			for key, expectedSlice := range ttp.wantPaths {
 				actualSlice, ok := paths[key]
@@ -151,7 +151,7 @@ func TestEnvStore_LoadProviderSecrets(t *testing.T) {
 		t.Run(ttp.name, func(t *testing.T) {
 			createEnvsForProvider(ttp.addvault, secretFile)
 
-			providerSecrets, err := NewEnvStore().LoadProviderSecrets(ttp.providerPaths, &common.Config{})
+			providerSecrets, err := NewEnvStore(&common.Config{}).LoadProviderSecrets(ttp.providerPaths)
 			if err != nil {
 				assert.EqualError(t, ttp.err, err.Error(), "Unexpected error message")
 			}
@@ -208,7 +208,7 @@ func TestEnvStore_ConvertProviderSecrets(t *testing.T) {
 		t.Run(ttp.name, func(t *testing.T) {
 			createEnvsForProvider(ttp.addvault, secretFile)
 
-			secretsEnv, err := NewEnvStore().ConvertProviderSecrets(ttp.providerSecrets)
+			secretsEnv, err := NewEnvStore(&common.Config{}).ConvertProviderSecrets(ttp.providerSecrets)
 			if err != nil {
 				assert.EqualError(t, ttp.err, err.Error(), "Unexpected error message")
 			}

diff --git a/main.go b/main.go
@@ -50,11 +50,11 @@ func main() {
 	}
 
 	// Fetch all provider secrets and assemble env variables using envstore
-	envStore := NewEnvStore()
+	envStore := NewEnvStore(config)
 
 	providerPaths := envStore.GetProviderPaths()
 
-	providerSecrets, err := envStore.LoadProviderSecrets(providerPaths, config)
+	providerSecrets, err := envStore.LoadProviderSecrets(providerPaths)
 	if err != nil {
 		slog.Error(fmt.Errorf("failed to extract secrets: %w", err).Error())
 		os.Exit(1)

diff --git a/pkg/provider/bao/bao.go b/pkg/provider/bao/bao.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Bank-Vaults Maintainers
+// Copyright © 2024 Bank-Vaults Maintainers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import (
 	bao "github.com/bank-vaults/vault-sdk/vault"
 
 	"github.com/bank-vaults/secret-init/pkg/common"
-	"github.com/bank-vaults/secret-init/pkg/internal/utils"
 	"github.com/bank-vaults/secret-init/pkg/provider"
 )
 
@@ -69,7 +68,7 @@ func (s *sanitized) append(key string, value string) {
 }
 
 func NewProvider(config *Config, appConfig *common.Config) (*Provider, error) {
-	clientOptions := []bao.ClientOption{bao.ClientLogger(utils.ClientLogger{Logger: slog.Default()})}
+	clientOptions := []bao.ClientOption{bao.ClientLogger(clientLogger{slog.Default()})}
 	if config.TokenFile != "" {
 		clientOptions = append(clientOptions, bao.ClientToken(config.Token))
 	} else {

diff --git a/pkg/provider/bao/bao_test.go b/pkg/provider/bao/bao_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Bank-Vaults Maintainers
+// Copyright © 2024 Bank-Vaults Maintainers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/provider/bao/client_logger.go b/pkg/provider/bao/client_logger.go
@@ -0,0 +1,59 @@
+// Copyright © 2024 Bank-Vaults Maintainers
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bao
+
+import (
+	"log/slog"
+
+	bao "github.com/bank-vaults/vault-sdk/vault"
+)
+
+var _ bao.Logger = &clientLogger{}
+
+type clientLogger struct {
+	logger *slog.Logger
+}
+
+func (l clientLogger) Trace(msg string, args ...map[string]interface{}) {
+	l.Debug(msg, args...)
+}
+
+func (l clientLogger) Debug(msg string, args ...map[string]interface{}) {
+	l.logger.Debug(msg, l.argsToAttrs(args...)...)
+}
+
+func (l clientLogger) Info(msg string, args ...map[string]interface{}) {
+	l.logger.Info(msg, l.argsToAttrs(args...)...)
+}
+
+func (l clientLogger) Warn(msg string, args ...map[string]interface{}) {
+	l.logger.Warn(msg, l.argsToAttrs(args...)...)
+}
+
+func (l clientLogger) Error(msg string, args ...map[string]interface{}) {
+	l.logger.Error(msg, l.argsToAttrs(args...)...)
+}
+
+func (clientLogger) argsToAttrs(args ...map[string]interface{}) []any {
+	var attrs []any
+
+	for _, arg := range args {
+		for key, value := range arg {
+			attrs = append(attrs, slog.Any(key, value))
+		}
+	}
+
+	return attrs
+}
diff --git a/pkg/provider/bao/config.go b/pkg/provider/bao/config.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Bank-Vaults Maintainers
+// Copyright © 2024 Bank-Vaults Maintainers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/provider/bao/config_test.go b/pkg/provider/bao/config_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Bank-Vaults Maintainers
+// Copyright © 2024 Bank-Vaults Maintainers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/provider/bao/daemon_secret_renewer.go b/pkg/provider/bao/daemon_secret_renewer.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Bank-Vaults Maintainers
+// Copyright © 2024 Bank-Vaults Maintainers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/internal/utils/client_logger.go → pkg/provider/vault/client_logger.go b/pkg/internal/utils/client_logger.go → pkg/provider/vault/client_logger.go
@@ -12,41 +12,41 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package utils
+package vault
 
 import (
 	"log/slog"
 
 	"github.com/bank-vaults/vault-sdk/vault"
 )
 
-var _ vault.Logger = &ClientLogger{}
+var _ vault.Logger = &clientLogger{}
 
-type ClientLogger struct {
-	Logger *slog.Logger
+type clientLogger struct {
+	logger *slog.Logger
 }
 
-func (l ClientLogger) Trace(msg string, args ...map[string]interface{}) {
+func (l clientLogger) Trace(msg string, args ...map[string]interface{}) {
 	l.Debug(msg, args...)
 }
 
-func (l ClientLogger) Debug(msg string, args ...map[string]interface{}) {
-	l.Logger.Debug(msg, l.argsToAttrs(args...)...)
+func (l clientLogger) Debug(msg string, args ...map[string]interface{}) {
+	l.logger.Debug(msg, l.argsToAttrs(args...)...)
 }
 
-func (l ClientLogger) Info(msg string, args ...map[string]interface{}) {
-	l.Logger.Info(msg, l.argsToAttrs(args...)...)
+func (l clientLogger) Info(msg string, args ...map[string]interface{}) {
+	l.logger.Info(msg, l.argsToAttrs(args...)...)
 }
 
-func (l ClientLogger) Warn(msg string, args ...map[string]interface{}) {
-	l.Logger.Warn(msg, l.argsToAttrs(args...)...)
+func (l clientLogger) Warn(msg string, args ...map[string]interface{}) {
+	l.logger.Warn(msg, l.argsToAttrs(args...)...)
 }
 
-func (l ClientLogger) Error(msg string, args ...map[string]interface{}) {
-	l.Logger.Error(msg, l.argsToAttrs(args...)...)
+func (l clientLogger) Error(msg string, args ...map[string]interface{}) {
+	l.logger.Error(msg, l.argsToAttrs(args...)...)
 }
 
-func (ClientLogger) argsToAttrs(args ...map[string]interface{}) []any {
+func (clientLogger) argsToAttrs(args ...map[string]interface{}) []any {
 	var attrs []any
 
 	for _, arg := range args {

diff --git a/pkg/provider/vault/vault.go b/pkg/provider/vault/vault.go
@@ -27,7 +27,6 @@ import (
 	"github.com/bank-vaults/vault-sdk/vault"
 
 	"github.com/bank-vaults/secret-init/pkg/common"
-	"github.com/bank-vaults/secret-init/pkg/internal/utils"
 	"github.com/bank-vaults/secret-init/pkg/provider"
 )
 
@@ -69,7 +68,7 @@ func (s *sanitized) append(key string, value string) {
 }
 
 func NewProvider(config *Config, appConfig *common.Config) (provider.Provider, error) {
-	clientOptions := []vault.ClientOption{vault.ClientLogger(utils.ClientLogger{Logger: slog.Default()})}
+	clientOptions := []vault.ClientOption{vault.ClientLogger(clientLogger{slog.Default()})}
 	if config.TokenFile != "" {
 		clientOptions = append(clientOptions, vault.ClientToken(config.Token))
 	} else {