Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions secretstores/aws/secretmanager/secretmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/dapr/components-contrib/metadata"
"github.com/dapr/components-contrib/secretstores"
"github.com/dapr/kit/logger"
kitmd "github.com/dapr/kit/metadata"
)

const (
Expand Down Expand Up @@ -177,17 +178,11 @@ func (s *smSecretStore) BulkGetSecret(ctx context.Context, req secretstores.Bulk
}

func (s *smSecretStore) getSecretManagerMetadata(spec secretstores.Metadata) (*SecretManagerMetaData, error) {
b, err := json.Marshal(spec.Properties)
if err != nil {
return nil, err
}

var meta SecretManagerMetaData
err = json.Unmarshal(b, &meta)
err := kitmd.DecodeMetadata(spec.Properties, &meta)
if err != nil {
return nil, err
}

return &meta, nil
}

Expand Down
20 changes: 20 additions & 0 deletions secretstores/aws/secretmanager/secretmanager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -499,3 +499,23 @@ func TestGetFeatures(t *testing.T) {
assert.Empty(t, f)
})
}

func TestGetSecretManagerMetadata(t *testing.T) {
s := &smSecretStore{
logger: logger.NewLogger("test"),
}

t.Run("parse multipleKeyValuesPerSecret as string", func(t *testing.T) {
metadata := secretstores.Metadata{}
metadata.Properties = map[string]string{
"region": "us-east-1",
"accessKey": "test",
"secretKey": "test",
"multipleKeyValuesPerSecret": "true",
}

meta, err := s.getSecretManagerMetadata(metadata)
require.NoError(t, err)
assert.True(t, meta.MultipleKeyValuesPerSecret)
})
}
Loading