Skip to content

Commit 1587066

Browse files
mikeeemikeee
committed
feat: upgrade aws secrets manager to v2
Also bumps the sdk to 1.36.6 Disables the mock tests by tagging with legacy Signed-off-by: mikeee <[email protected]>
1 parent 3ec9774 commit 1587066

File tree

6 files changed

+39
-31
lines changed

6 files changed

+39
-31
lines changed

‎go.mod‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ require (
4141
github.com/apache/thrift v0.13.0
4242
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.1-0.20241125194140-078c08b8574a
4343
github.com/aws/aws-sdk-go v1.55.6
44-
github.com/aws/aws-sdk-go-v2 v1.36.5
44+
github.com/aws/aws-sdk-go-v2 v1.36.6
4545
github.com/aws/aws-sdk-go-v2/config v1.29.17
4646
github.com/aws/aws-sdk-go-v2/credentials v1.17.70
4747
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.19.3
@@ -50,6 +50,7 @@ require (
5050
github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.17.3
5151
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.43.4
5252
github.com/aws/aws-sdk-go-v2/service/s3 v1.83.0
53+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.35.8
5354
github.com/aws/aws-sdk-go-v2/service/sns v1.34.7
5455
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.8
5556
github.com/aws/aws-sdk-go-v2/service/sts v1.34.0
@@ -198,8 +199,8 @@ require (
198199
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
199200
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 // indirect
200201
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
201-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
202-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
202+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37 // indirect
203+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37 // indirect
203204
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
204205
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 // indirect
205206
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.25.6 // indirect

‎go.sum‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk
281281
github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
282282
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
283283
github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
284-
github.com/aws/aws-sdk-go-v2 v1.36.5 h1:0OF9RiEMEdDdZEMqF9MRjevyxAQcf6gY+E7vwBILFj0=
285-
github.com/aws/aws-sdk-go-v2 v1.36.5/go.mod h1:EYrzvCCN9CMUTa5+6lf6MM4tq3Zjp8UhSGR/cBsjai0=
284+
github.com/aws/aws-sdk-go-v2 v1.36.6 h1:zJqGjVbRdTPojeCGWn5IR5pbJwSQSBh5RWFTQcEQGdU=
285+
github.com/aws/aws-sdk-go-v2 v1.36.6/go.mod h1:EYrzvCCN9CMUTa5+6lf6MM4tq3Zjp8UhSGR/cBsjai0=
286286
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 h1:12SpdwU8Djs+YGklkinSSlcrPyj3H4VifVsKf78KbwA=
287287
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11/go.mod h1:dd+Lkp6YmMryke+qxW/VnKyhMBDTYP41Q2Bb+6gNZgY=
288288
github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw=
@@ -300,10 +300,10 @@ github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.3.10 h1:z6fAXB4HSuYjrE/P8RU3NdC
300300
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.3.10/go.mod h1:PoPjOi7j+/DtKIGC58HRfcdWKBPYYXwdKnRG+po+hzo=
301301
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.83 h1:08otkOELsIi0toRRGMytlJhOctcN8xfKfKFR2NXz3kE=
302302
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.83/go.mod h1:dGsGb2wI8JDWeMAhjVPP+z+dqvYjL6k6o+EujcRNk5c=
303-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 h1:SsytQyTMHMDPspp+spo7XwXTP44aJZZAC7fBV2C5+5s=
304-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36/go.mod h1:Q1lnJArKRXkenyog6+Y+zr7WDpk4e6XlR6gs20bbeNo=
305-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 h1:i2vNHQiXUvKhs3quBR6aqlgJaiaexz/aNvdCktW/kAM=
306-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36/go.mod h1:UdyGa7Q91id/sdyHPwth+043HhmP6yP9MBHgbZM0xo8=
303+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37 h1:osMWfm/sC/L4tvEdQ65Gri5ZZDCUpuYJZbTTDrsn4I0=
304+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37/go.mod h1:ZV2/1fbjOPr4G4v38G3Ww5TBT4+hmsK45s/rxu1fGy0=
305+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37 h1:v+X21AvTb2wZ+ycg1gx+orkB/9U6L7AOp93R7qYxsxM=
306+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37/go.mod h1:G0uM1kyssELxmJ2VZEfG0q2npObR3BAkF3c1VsfVnfs=
307307
github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ=
308308
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
309309
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
@@ -329,6 +329,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17 h1:qcLWgdhq45sDM
329329
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17/go.mod h1:M+jkjBFZ2J6DJrjMv2+vkBbuht6kxJYtJiwoVgX4p4U=
330330
github.com/aws/aws-sdk-go-v2/service/s3 v1.83.0 h1:5Y75q0RPQoAbieyOuGLhjV9P3txvYgXv2lg0UwJOfmE=
331331
github.com/aws/aws-sdk-go-v2/service/s3 v1.83.0/go.mod h1:kUklwasNoCn5YpyAqC/97r6dzTA1SRKJfKq16SXeoDU=
332+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.35.8 h1:HD6R8K10gPbN9CNqRDOs42QombXlYeLOr4KkIxe2lQs=
333+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.35.8/go.mod h1:x66GdH8qjYTr6Kb4ik38Ewl6moLsg8igbceNsmxVxeA=
332334
github.com/aws/aws-sdk-go-v2/service/sns v1.34.7 h1:OBuZE9Wt8h2imuRktu+WfjiTGrnYdCIJg8IX92aalHE=
333335
github.com/aws/aws-sdk-go-v2/service/sns v1.34.7/go.mod h1:4WYoZAhHt+dWYpoOQUgkUKfuQbE6Gg/hW4oXE0pKS9U=
334336
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.8 h1:80dpSqWMwx2dAm30Ib7J6ucz1ZHfiv5OCRwN/EnCOXQ=

‎secretstores/aws/secretmanager/secretmanager.go‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ import (
1717
"context"
1818
"encoding/json"
1919
"fmt"
20+
awsCommon "github.com/dapr/components-contrib/common/aws"
21+
awsCommonAuth "github.com/dapr/components-contrib/common/aws/auth"
2022
"reflect"
2123

22-
"github.com/aws/aws-sdk-go/service/secretsmanager"
24+
"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
2325

24-
awsAuth "github.com/dapr/components-contrib/common/authentication/aws"
2526
"github.com/dapr/components-contrib/metadata"
2627
"github.com/dapr/components-contrib/secretstores"
2728
"github.com/dapr/kit/logger"
@@ -48,8 +49,9 @@ type SecretManagerMetaData struct {
4849
}
4950

5051
type smSecretStore struct {
51-
authProvider awsAuth.Provider
52-
logger logger.Logger
52+
logger logger.Logger
53+
54+
secretsManagerClient *secretsmanager.Client
5355
}
5456

5557
// Init creates an AWS secret manager client.
@@ -59,7 +61,7 @@ func (s *smSecretStore) Init(ctx context.Context, metadata secretstores.Metadata
5961
return err
6062
}
6163

62-
opts := awsAuth.Options{
64+
configOpts := awsCommonAuth.Options{
6365
Logger: s.logger,
6466
Region: meta.Region,
6567
AccessKey: meta.AccessKey,
@@ -68,11 +70,13 @@ func (s *smSecretStore) Init(ctx context.Context, metadata secretstores.Metadata
6870
Endpoint: meta.Endpoint,
6971
}
7072

71-
provider, err := awsAuth.NewProvider(ctx, opts, awsAuth.GetConfig(opts))
73+
awsConfig, err := awsCommon.NewConfig(ctx, configOpts)
7274
if err != nil {
7375
return err
7476
}
75-
s.authProvider = provider
77+
78+
s.secretsManagerClient = secretsmanager.NewFromConfig(awsConfig)
79+
7680
return nil
7781
}
7882

@@ -86,7 +90,7 @@ func (s *smSecretStore) GetSecret(ctx context.Context, req secretstores.GetSecre
8690
if value, ok := req.Metadata[VersionStage]; ok {
8791
versionStage = &value
8892
}
89-
output, err := s.authProvider.SecretManager().Manager.GetSecretValueWithContext(ctx, &secretsmanager.GetSecretValueInput{
93+
output, err := s.secretsManagerClient.GetSecretValue(ctx, &secretsmanager.GetSecretValueInput{
9094
SecretId: &req.Name,
9195
VersionId: versionID,
9296
VersionStage: versionStage,
@@ -115,7 +119,7 @@ func (s *smSecretStore) BulkGetSecret(ctx context.Context, req secretstores.Bulk
115119
var nextToken *string = nil
116120

117121
for search {
118-
output, err := s.authProvider.SecretManager().Manager.ListSecretsWithContext(ctx, &secretsmanager.ListSecretsInput{
122+
output, err := s.secretsManagerClient.ListSecrets(ctx, &secretsmanager.ListSecretsInput{
119123
MaxResults: nil,
120124
NextToken: nextToken,
121125
})
@@ -124,7 +128,7 @@ func (s *smSecretStore) BulkGetSecret(ctx context.Context, req secretstores.Bulk
124128
}
125129

126130
for _, entry := range output.SecretList {
127-
secrets, err := s.authProvider.SecretManager().Manager.GetSecretValueWithContext(ctx, &secretsmanager.GetSecretValueInput{
131+
secrets, err := s.secretsManagerClient.GetSecretValue(ctx, &secretsmanager.GetSecretValueInput{
128132
SecretId: entry.Name,
129133
})
130134
if err != nil {
@@ -170,8 +174,6 @@ func (s *smSecretStore) GetComponentMetadata() (metadataInfo metadata.MetadataMa
170174
}
171175

172176
func (s *smSecretStore) Close() error {
173-
if s.authProvider != nil {
174-
return s.authProvider.Close()
175-
}
177+
// Removed auth provider
176178
return nil
177179
}

‎secretstores/aws/secretmanager/secretmanager_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// TODO: Migrate mocks
2+
//go:build legacy
3+
14
/*
25
Copyright 2021 The Dapr Authors
36
Licensed under the Apache License, Version 2.0 (the "License");

‎tests/certification/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,16 @@ require (
8484
github.com/armon/go-metrics v0.4.1 // indirect
8585
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
8686
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.1-0.20241125194140-078c08b8574a // indirect
87-
github.com/aws/aws-sdk-go-v2 v1.36.5 // indirect
87+
github.com/aws/aws-sdk-go-v2 v1.36.6 // indirect
8888
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 // indirect
8989
github.com/aws/aws-sdk-go-v2/config v1.29.17 // indirect
9090
github.com/aws/aws-sdk-go-v2/credentials v1.17.70 // indirect
9191
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.19.3 // indirect
9292
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
9393
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.3.10 // indirect
9494
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.83 // indirect
95-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
96-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
95+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37 // indirect
96+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37 // indirect
9797
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
9898
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 // indirect
9999
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.43.4 // indirect

‎tests/certification/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk
207207
github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
208208
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
209209
github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
210-
github.com/aws/aws-sdk-go-v2 v1.36.5 h1:0OF9RiEMEdDdZEMqF9MRjevyxAQcf6gY+E7vwBILFj0=
211-
github.com/aws/aws-sdk-go-v2 v1.36.5/go.mod h1:EYrzvCCN9CMUTa5+6lf6MM4tq3Zjp8UhSGR/cBsjai0=
210+
github.com/aws/aws-sdk-go-v2 v1.36.6 h1:zJqGjVbRdTPojeCGWn5IR5pbJwSQSBh5RWFTQcEQGdU=
211+
github.com/aws/aws-sdk-go-v2 v1.36.6/go.mod h1:EYrzvCCN9CMUTa5+6lf6MM4tq3Zjp8UhSGR/cBsjai0=
212212
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 h1:12SpdwU8Djs+YGklkinSSlcrPyj3H4VifVsKf78KbwA=
213213
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11/go.mod h1:dd+Lkp6YmMryke+qxW/VnKyhMBDTYP41Q2Bb+6gNZgY=
214214
github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw=
@@ -226,10 +226,10 @@ github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.3.10 h1:z6fAXB4HSuYjrE/P8RU3NdC
226226
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.3.10/go.mod h1:PoPjOi7j+/DtKIGC58HRfcdWKBPYYXwdKnRG+po+hzo=
227227
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.83 h1:08otkOELsIi0toRRGMytlJhOctcN8xfKfKFR2NXz3kE=
228228
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.83/go.mod h1:dGsGb2wI8JDWeMAhjVPP+z+dqvYjL6k6o+EujcRNk5c=
229-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 h1:SsytQyTMHMDPspp+spo7XwXTP44aJZZAC7fBV2C5+5s=
230-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36/go.mod h1:Q1lnJArKRXkenyog6+Y+zr7WDpk4e6XlR6gs20bbeNo=
231-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 h1:i2vNHQiXUvKhs3quBR6aqlgJaiaexz/aNvdCktW/kAM=
232-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36/go.mod h1:UdyGa7Q91id/sdyHPwth+043HhmP6yP9MBHgbZM0xo8=
229+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37 h1:osMWfm/sC/L4tvEdQ65Gri5ZZDCUpuYJZbTTDrsn4I0=
230+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37/go.mod h1:ZV2/1fbjOPr4G4v38G3Ww5TBT4+hmsK45s/rxu1fGy0=
231+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37 h1:v+X21AvTb2wZ+ycg1gx+orkB/9U6L7AOp93R7qYxsxM=
232+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37/go.mod h1:G0uM1kyssELxmJ2VZEfG0q2npObR3BAkF3c1VsfVnfs=
233233
github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ=
234234
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
235235
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=

0 commit comments

Comments
 (0)