Unify S3 client creation logic #1657
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rosecodym
force-pushed
the
test-s3-role-assume
branch
from
b231c2a
to
2e35bff
Compare
rosecodym
force-pushed
the
unify-s3-client-creation
branch
from
2853b43
to
765f689
Compare
rosecodym
force-pushed
the
unify-s3-client-creation
branch
from
765f689
to
a0de9fd
Compare
|
@codevbus this is a refactor of a feature you added so shout if anything looks incorrectly implemented |
mcastorina
approved these changes
Aug 30, 2023
Comment on lines
+131
to
+134
| stsClient := sts.New(sess) | ||
| cfg.Credentials = stscreds.NewCredentialsWithClient(stsClient, roleArn, func(p *stscreds.AssumeRoleProvider) { | ||
| p.RoleSessionName = "trufflehog" | ||
| }) |
There was a problem hiding this comment.
Nit (optional): This would be equivalent:
cfg.Credentials = stscreds.NewCredentials(sess, roleArn, func(p *stscreds.AssumeRoleProvider) {
p.RoleSessionName = "trufflehog"
})
Comment on lines
+216
to
+219
| roles := s.conn.Roles | ||
| if len(roles) == 0 { | ||
| roles = []string{""} | ||
| } |
There was a problem hiding this comment.
If I understand correctly, this means we won't do the non-ARN scan of a bucket if any ARNs are given. Just confirming that's the expected behavior.
There was a problem hiding this comment.
yep, that's the existing behavior. the check is here.
0x1
approved these changes
Aug 30, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR unifies some code paths within the S3 source. This is being done to better support a future implementation of S3 source validation; less code that runs means less code to validate. The logical change is to move the handling of "role-less" operation down the call tree, which allows for a single code path for more of the S3 code.
This PR also fixes a bug that would occur in the (rare) case that the source couldn't create a regional S3 client. Before, an error would be logged, but it would be followed by a panic. Now the bucket in question is skipped.