Adds handling when HashiVault value is still a map[string]interface{}

Fixes #649

Signed-off-by: Gustavo Carvalho <gustavo.carvalho@container-solutions.com>

pkg/provider/vault/vault.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -253,6 +254,12 @@ func (v *client) readSecret(ctx context.Context, path, version string) (map[stri
 			byteMap[k] = t
 		case nil:
 			byteMap[k] = []byte(nil)
+		case map[string]interface{}:
+			jsonData, err := json.Marshal(t)
+			if err != nil {
+				return nil, err
+			}
+			byteMap[k] = jsonData
 		default:
 			return nil, errors.New(errSecretFormat)
 		}

pkg/provider/vault/vault_test.go

@@ -417,7 +417,7 @@ MIICsTCCAZkCFEJJ4daz5sxkFlzq9n1djLEuG7bmMA0GCSqGSIb3DQEBCwUAMBMxETAPBgNVBAMMCHZh
 			},
 		},
 		"SuccessfulVaultStoreWithK8sCertConfigMap": {
-			reason: "Should return a Vault prodvider with the cert from k8s",
+			reason: "Should return a Vault provider with the cert from k8s",
 			args: args{
 				store: makeValidSecretStoreWithK8sCerts(false),
 				kube: &test.MockClient{
@@ -562,6 +562,15 @@ func TestGetSecretMap(t *testing.T) {
 		"access_secret": "access_secret",
 		"token":         nil,
 	}
+	secretWithNestedVal := map[string]interface{}{
+		"access_key":    "access_key",
+		"access_secret": "access_secret",
+		"address": map[string]interface{}{
+			"location": "US",
+			"zip":      "12345",
+			"address":  "123 Main St",
+		},
+	}
 
 	type args struct {
 		store   *esv1alpha1.VaultProvider
@@ -629,6 +638,39 @@ func TestGetSecretMap(t *testing.T) {
 				err: nil,
 			},
 		},
+		"ReadSecretWithNestedValueKV1": {
+			reason: "Should map the secret even if it has a nested value",
+			args: args{
+				store: makeValidSecretStoreWithVersion(esv1alpha1.VaultKVStoreV1).Spec.Provider.Vault,
+				vClient: &fake.VaultClient{
+					MockNewRequest: fake.NewMockNewRequestFn(&vault.Request{}),
+					MockRawRequestWithContext: fake.NewMockRawRequestWithContextFn(
+						newVaultResponseWithData(secretWithNestedVal), nil,
+					),
+				},
+			},
+			want: want{
+				err: nil,
+			},
+		},
+		"ReadSecretWithNestedValueKV2": {
+			reason: "Should map the secret even if it has a nested value",
+			args: args{
+				store: makeValidSecretStoreWithVersion(esv1alpha1.VaultKVStoreV2).Spec.Provider.Vault,
+				vClient: &fake.VaultClient{
+					MockNewRequest: fake.NewMockNewRequestFn(&vault.Request{}),
+					MockRawRequestWithContext: fake.NewMockRawRequestWithContextFn(
+						newVaultResponseWithData(map[string]interface{}{
+							"data": secretWithNestedVal,
+						},
+						), nil,
+					),
+				},
+			},
+			want: want{
+				err: nil,
+			},
+		},
 		"ReadSecretWithNilValueKV2": {
 			reason: "Should map the secret even if it has a nil value",
 			args: args{