Skip to content

Commit 5f56550

Browse files
authored
feat(sources/s3): migrate to AWS SDK v2 (#4069)
Closes #4054. This PR migrates the S3 source to use AWS SDK v2 by following the migration guide https://docs.aws.amazon.com/sdk-for-go/v2/developer-guide/migrate-gosdk.html. This brings compatibility improvements and better long-term support from AWS. To verify the changes manually, I: Created a test S3 bucket. Uploaded sample files containing dummy secrets. Set up an IAM role for access. Ran trufflehog s3 and confirmed it behaves as expected post-migration. additional notes by @rosecodym: The existing S3 automated tests passed, modulo some flakiness that we will address in a follow-up commit.
1 parent d545063 commit 5f56550

File tree

5 files changed

+109
-239
lines changed

5 files changed

+109
-239
lines changed

go.mod

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ require (
1919
github.com/adrg/strutil v0.3.1
2020
github.com/alecthomas/kingpin/v2 v2.4.0
2121
github.com/avast/apkparser v0.0.0-20250307094510-e2100ee9c0f5
22-
github.com/aws/aws-sdk-go v1.55.6
2322
github.com/aws/aws-sdk-go-v2 v1.36.3
2423
github.com/aws/aws-sdk-go-v2/config v1.29.14
2524
github.com/aws/aws-sdk-go-v2/credentials v1.17.67
25+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.75
26+
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3
2627
github.com/aws/aws-sdk-go-v2/service/sns v1.34.4
2728
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19
2829
github.com/aws/smithy-go v1.22.3
@@ -150,12 +151,16 @@ require (
150151
github.com/andybalholm/brotli v1.1.1 // indirect
151152
github.com/apache/arrow/go/v14 v14.0.2 // indirect
152153
github.com/atotto/clipboard v0.1.4 // indirect
154+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
153155
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
154156
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
155157
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
156158
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
159+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
157160
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
161+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 // indirect
158162
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
163+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
159164
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
160165
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
161166
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
@@ -231,7 +236,6 @@ require (
231236
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
232237
github.com/hashicorp/go-multierror v1.1.1 // indirect
233238
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
234-
github.com/jmespath/go-jmespath v0.4.0 // indirect
235239
github.com/jpillora/s3 v1.1.4 // indirect
236240
github.com/kevinburke/ssh_config v1.2.0 // indirect
237241
github.com/kjk/lzma v0.0.0-20161016003348-3fd93898850d // indirect

0 commit comments

Comments
 (0)