Log vault logs instead of vault-http logs

vault/client.go

@@ -70,10 +70,11 @@ func SetCustomClient(c VaultClient) {
 
 func newBankVaultClient(deletionPolicy synv1alpha1.DeletionPolicy, log logr.Logger) (*BankVaultClient, error) {
 
-	client, err := vault.NewClientFromConfig(&api.Config{
-		Address: os.Getenv(api.EnvVaultAddress),
-		Logger:  logAdapter{log},
-	}, vault.ClientRole("lieutenant-operator"))
+	client, err := vault.NewClientFromConfig(
+		&api.Config{Address: os.Getenv(api.EnvVaultAddress)},
+		vault.ClientRole("lieutenant-operator"),
+		vault.ClientLogger(logAdapter{log.WithName("vaultclient")}),
+	)
 	if err != nil {
 		return nil, err
 	}

vault/log_adapter.go

@@ -12,14 +12,37 @@ type logAdapter struct {
 
 var errLogAdapterLogError = errors.New("vault error log")
 
-func (l logAdapter) Debug(msg string, keysAndValues ...interface{}) {
-	l.V(1).Info(msg, keysAndValues...)
+func (l logAdapter) Trace(msg string, fields ...map[string]interface{}) {
+	l.V(2).Info(msg, flatten(fields)...)
 }
 
-func (l logAdapter) Warn(msg string, keysAndValues ...interface{}) {
-	l.Info("WARN: "+msg, keysAndValues...)
+func (l logAdapter) Debug(msg string, fields ...map[string]interface{}) {
+	l.V(1).Info(msg, flatten(fields)...)
 }
 
-func (l logAdapter) Error(msg string, keysAndValues ...interface{}) {
-	l.Logger.Error(errLogAdapterLogError, msg, keysAndValues...)
+func (l logAdapter) Info(msg string, fields ...map[string]interface{}) {
+	l.V(0).Info(msg, flatten(fields)...)
+}
+
+func (l logAdapter) Warn(msg string, fields ...map[string]interface{}) {
+	l.V(0).Info("Warn: "+msg, flatten(fields)...)
+}
+
+func (l logAdapter) Error(msg string, fields ...map[string]interface{}) {
+	l.V(0).Error(errLogAdapterLogError, msg, flatten(fields)...)
+}
+
+func flatten(fields []map[string]interface{}) []interface{} {
+	flattenedLen := 0
+	for _, field := range fields {
+		flattenedLen += len(field) * 2
+	}
+
+	flattened := make([]interface{}, 0, flattenedLen)
+	for _, field := range fields {
+		for name, value := range field {
+			flattened = append(flattened, name, value)
+		}
+	}
+	return flattened
 }

vault/log_adapter_test.go

@@ -0,0 +1,13 @@
+package vault
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLogAdapterFlatten(t *testing.T) {
+	assert.Equal(t, flatten([]map[string]interface{}{}), []interface{}{}, "empty array")
+
+	assert.Equal(t, flatten([]map[string]interface{}{{"key1": "val"}, {}, {"key1": "val2"}}), []interface{}{"key1", "val", "key1", "val2"})
+}