🐛 fix hashi vault (#1801)

Migrate #1459 Fixes #1476 Signed-off-by: Dominik Richter <[email protected]>
mondoohq · Sep 20, 2023 · 6497412 · 6497412
1 parent a6bad70
commit 6497412
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/providers-sdk/v1/vault/hashivault/hashivault.go b/providers-sdk/v1/vault/hashivault/hashivault.go
@@ -11,12 +11,14 @@ import (
 	"strings"
 
 	"github.com/hashicorp/vault/api"
+	"github.com/rs/zerolog/log"
 	"go.mondoo.com/cnquery/providers-sdk/v1/vault"
 )
 
 var notImplemented = errors.New("not implemented")
 
 func New(serverURL string, token string) *Vault {
+	log.Debug().Bool("token-sec", len(token) > 0).Msgf("Using HashiCorp Vault at %s", serverURL)
 	return &Vault{
 		Token: token,
 		APIConfig: api.Config{
@@ -65,6 +67,7 @@ func validKey(key string) error {
 
 // https://learn.hashicorp.com/tutorials/vault/versioned-kv?in=vault/secrets-management#step-2-write-secrets
 func (v *Vault) Get(ctx context.Context, id *vault.SecretID) (*vault.Secret, error) {
+	log.Debug().Str("secret", id.Key).Msg("gather secret from hashicorp-vault")
 	c, err := v.client()
 	if err != nil {
 		return nil, err
@@ -86,8 +89,9 @@ func (v *Vault) Get(ctx context.Context, id *vault.SecretID) (*vault.Secret, err
 	}
 
 	return &vault.Secret{
-		Key:  id.Key,
-		Data: secretBytes,
+		Key:      id.Key,
+		Data:     secretBytes,
+		Encoding: vault.SecretEncoding_encoding_json,
 	}, nil
 }
 

diff --git a/providers-sdk/v1/vault/hashivault/hashivault_test.go b/providers-sdk/v1/vault/hashivault/hashivault_test.go
@@ -40,7 +40,7 @@ func TestHashiVault(t *testing.T) {
 	require.NoError(t, err)
 
 	jsonSecret := make(map[string]string)
-	err = json.Unmarshal([]byte(newCred.Secret), &jsonSecret)
+	err = json.Unmarshal(newCred.Data, &jsonSecret)
 	require.NoError(t, err)
 
 	assert.Equal(t, jsonSecret, fields)