Skip to content

Commit 12ebad5

Browse files
committed
Remove TODOs related to use of FIPS endpoints with DynamoDB
Decided to keep the current code as-is, so removing the TODOs aws/aws-sdk-go#5078 was landed upstream, so bump `aws-sdk-go` to pick up the change. Note that this new functionality is not used, but would like to keep it updated so it can possibly be used in the future without needing to bump the SDK version.
1 parent 3d2e9ec commit 12ebad5

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/andybalholm/brotli v1.0.6
3838
github.com/aquasecurity/libbpfgo v0.5.1-libbpf-1.2
3939
github.com/armon/go-radix v1.0.0
40-
github.com/aws/aws-sdk-go v1.49.4
40+
github.com/aws/aws-sdk-go v1.49.13
4141
github.com/aws/aws-sdk-go-v2 v1.24.0
4242
github.com/aws/aws-sdk-go-v2/config v1.26.1
4343
github.com/aws/aws-sdk-go-v2/credentials v1.16.12

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQ
194194
github.com/aws/aws-sdk-go v1.17.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
195195
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
196196
github.com/aws/aws-sdk-go v1.44.263/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
197-
github.com/aws/aws-sdk-go v1.49.4 h1:qiXsqEeLLhdLgUIyfr5ot+N/dGPWALmtM1SetRmbUlY=
198-
github.com/aws/aws-sdk-go v1.49.4/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
197+
github.com/aws/aws-sdk-go v1.49.13 h1:f4mGztsgnx2dR9r8FQYa9YW/RsKb+N7bgef4UGrOW1Y=
198+
github.com/aws/aws-sdk-go v1.49.13/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
199199
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
200200
github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
201201
github.com/aws/aws-sdk-go-v2 v1.24.0 h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk=

lib/backend/dynamo/dynamodbbk.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,11 @@ func New(ctx context.Context, params backend.Params) (*Backend, error) {
275275
}
276276
b.session.Config.HTTPClient = httpClient
277277

278-
// create DynamoDB service:
278+
// Create DynamoDB service.
279279
svc, err := dynamometrics.NewAPIMetrics(dynamometrics.Backend, dynamodb.New(b.session, &aws.Config{
280280
// Setting this on the individual service instead of the session, as DynamoDB Streams
281281
// and Application Auto Scaling do not yet have FIPS endpoints in non-GovCloud.
282282
// See also: https://aws.amazon.com/compliance/fips/#FIPS_Endpoints_by_Service
283-
// TODO(reed): This can be simplified once https://github.com/aws/aws-sdk-go/pull/5078
284-
// is available (or whenever AWS adds the missing FIPS endpoints).
285283
UseFIPSEndpoint: useFIPSEndpoint,
286284
}))
287285
if err != nil {

lib/events/dynamoevents/dynamoevents.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,11 @@ func New(ctx context.Context, cfg Config) (*Log, error) {
287287
return nil, trace.Wrap(err)
288288
}
289289

290-
// create DynamoDB service:
290+
// Create DynamoDB service.
291291
svc, err := dynamometrics.NewAPIMetrics(dynamometrics.Events, dynamodb.New(b.session, &aws.Config{
292292
// Setting this on the individual service instead of the session, as DynamoDB Streams
293293
// and Application Auto Scaling do not yet have FIPS endpoints in non-GovCloud.
294294
// See also: https://aws.amazon.com/compliance/fips/#FIPS_Endpoints_by_Service
295-
// TODO(reed): This can be simplified once https://github.com/aws/aws-sdk-go/pull/5078
296-
// is available (or whenever AWS adds the missing FIPS endpoints).
297295
UseFIPSEndpoint: events.FIPSProtoStateToAWSState(cfg.UseFIPSEndpoint),
298296
}))
299297
if err != nil {

0 commit comments

Comments
 (0)