Skip to content

Commit

Permalink
[v17] Restore S3 FIPS and custom endpoint capabilities (#48821)
Browse files Browse the repository at this point in the history
* Restore S3 FIPS and custom endpoint capabilities

When migrating the S3 events handler to use aws-sdk-go-v2 applying
the FIPS settings and custom endpoint were inadvertently dropped.
This restores the functionality, while also adding tests to ensure
that they are always respected going forward.

A similar test was added to the dynamodb events handler as well to
prevent any regressions with FIPS settings there.

* chore: Bump AWS modules (#48322)

* chore: Bump api/ modules

* Tidy other modules

* chore: Bump AWS SDKv2 modules

* chore: Bump github.com/awslabs/amazon-ecr-credential-helper/ecr-login

* Tidy integrations/ modules

* Replace usages of s3types.LifecycleRuleFilterMemberPrefix

---------

Co-authored-by: Alan Parra <[email protected]>
  • Loading branch information
rosstimothy and codingllama authored Nov 12, 2024
1 parent af029b6 commit 1cf82ed
Show file tree
Hide file tree
Showing 15 changed files with 476 additions and 337 deletions.
68 changes: 34 additions & 34 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -43,37 +43,37 @@ require (
github.com/armon/go-radix v1.0.0
github.com/aws/aws-sdk-go v1.55.5
github.com/aws/aws-sdk-go-v2 v1.32.3
github.com/aws/aws-sdk-go-v2/config v1.27.39
github.com/aws/aws-sdk-go-v2/credentials v1.17.37
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.8
github.com/aws/aws-sdk-go-v2/feature/dynamodbstreams/attributevalue v1.14.24
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.25
github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.32.3
github.com/aws/aws-sdk-go-v2/service/athena v1.46.2
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.35.3
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.23.3
github.com/aws/aws-sdk-go-v2/service/ec2 v1.179.2
github.com/aws/aws-sdk-go-v2/service/ec2instanceconnect v1.26.3
github.com/aws/aws-sdk-go-v2/service/ecs v1.46.3
github.com/aws/aws-sdk-go-v2/service/eks v1.49.3
github.com/aws/aws-sdk-go-v2/service/glue v1.99.2
github.com/aws/aws-sdk-go-v2/service/iam v1.36.3
github.com/aws/aws-sdk-go-v2/config v1.28.1
github.com/aws/aws-sdk-go-v2/credentials v1.17.42
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.13
github.com/aws/aws-sdk-go-v2/feature/dynamodbstreams/attributevalue v1.14.48
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.35
github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.33.3
github.com/aws/aws-sdk-go-v2/service/athena v1.48.1
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.36.3
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.3
github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.0
github.com/aws/aws-sdk-go-v2/service/ec2instanceconnect v1.27.3
github.com/aws/aws-sdk-go-v2/service/ecs v1.49.0
github.com/aws/aws-sdk-go-v2/service/eks v1.51.1
github.com/aws/aws-sdk-go-v2/service/glue v1.101.0
github.com/aws/aws-sdk-go-v2/service/iam v1.37.3
github.com/aws/aws-sdk-go-v2/service/identitystore v1.27.3
github.com/aws/aws-sdk-go-v2/service/kms v1.36.3
github.com/aws/aws-sdk-go-v2/service/kms v1.37.3
github.com/aws/aws-sdk-go-v2/service/organizations v1.34.3
github.com/aws/aws-sdk-go-v2/service/rds v1.85.2
github.com/aws/aws-sdk-go-v2/service/redshift v1.47.3
github.com/aws/aws-sdk-go-v2/service/s3 v1.63.3
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.33.3
github.com/aws/aws-sdk-go-v2/service/sns v1.32.3
github.com/aws/aws-sdk-go-v2/service/sqs v1.35.3
github.com/aws/aws-sdk-go-v2/service/ssm v1.54.3
github.com/aws/aws-sdk-go-v2/service/rds v1.89.0
github.com/aws/aws-sdk-go-v2/service/redshift v1.51.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.3
github.com/aws/aws-sdk-go-v2/service/sns v1.33.3
github.com/aws/aws-sdk-go-v2/service/sqs v1.36.3
github.com/aws/aws-sdk-go-v2/service/ssm v1.55.3
github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.29.3
github.com/aws/aws-sdk-go-v2/service/sts v1.32.3
github.com/aws/aws-sigv4-auth-cassandra-gocql-driver-plugin v1.1.0
github.com/aws/smithy-go v1.22.0
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20240918142057-e21b7a4e92d1
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20241029204838-fb9784500689
github.com/beevik/etree v1.4.1
github.com/buildkite/bintest/v3 v3.3.0
github.com/charmbracelet/bubbles v0.20.0
Expand Down Expand Up @@ -266,20 +266,20 @@ require (
github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 // indirect
github.com/apache/arrow/go/v15 v15.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.33.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.25.6 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.27.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.19 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
Expand Down
Loading

0 comments on commit 1cf82ed

Please sign in to comment.