Skip to content

Commit 481e469

Browse files
authored
Fix aws secrets manager yaml (#4044)
Signed-off-by: MyMirelHub <[email protected]>
1 parent b0942a1 commit 481e469

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

secretstores/aws/secretmanager/secretmanager.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/dapr/components-contrib/metadata"
2626
"github.com/dapr/components-contrib/secretstores"
2727
"github.com/dapr/kit/logger"
28+
kitmd "github.com/dapr/kit/metadata"
2829
)
2930

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

179180
func (s *smSecretStore) getSecretManagerMetadata(spec secretstores.Metadata) (*SecretManagerMetaData, error) {
180-
b, err := json.Marshal(spec.Properties)
181-
if err != nil {
182-
return nil, err
183-
}
184-
185181
var meta SecretManagerMetaData
186-
err = json.Unmarshal(b, &meta)
182+
err := kitmd.DecodeMetadata(spec.Properties, &meta)
187183
if err != nil {
188184
return nil, err
189185
}
190-
191186
return &meta, nil
192187
}
193188

secretstores/aws/secretmanager/secretmanager_test.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,3 +499,23 @@ func TestGetFeatures(t *testing.T) {
499499
assert.Empty(t, f)
500500
})
501501
}
502+
503+
func TestGetSecretManagerMetadata(t *testing.T) {
504+
s := &smSecretStore{
505+
logger: logger.NewLogger("test"),
506+
}
507+
508+
t.Run("parse multipleKeyValuesPerSecret as string", func(t *testing.T) {
509+
metadata := secretstores.Metadata{}
510+
metadata.Properties = map[string]string{
511+
"region": "us-east-1",
512+
"accessKey": "test",
513+
"secretKey": "test",
514+
"multipleKeyValuesPerSecret": "true",
515+
}
516+
517+
meta, err := s.getSecretManagerMetadata(metadata)
518+
require.NoError(t, err)
519+
assert.True(t, meta.MultipleKeyValuesPerSecret)
520+
})
521+
}

0 commit comments

Comments
 (0)