Modify http cred provider resolving logic #2259
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
lucix-aws
approved these changes
Aug 31, 2023
Comment on lines
180
to
184
| input := &client.GetCredentialsInput{} | ||
| if authToken != "" { | ||
| input.AuthorizationToken = authToken | ||
| } | ||
| return p.client.GetCredentials(ctx, input) |
There was a problem hiding this comment.
You can condense this to like what it was before:
Suggested change
| input := &client.GetCredentialsInput{} | |
| if authToken != "" { | |
| input.AuthorizationToken = authToken | |
| } | |
| return p.client.GetCredentials(ctx, input) | |
| return p.client.GetCredentials(ctx, &client.GetCredentialsInput{AuthorizationToken: authToken}) |
The zero value for string is already "" - there's no need to check whether you ended up with something else in authToken.
| @@ -132,5 +163,23 @@ func (p *Provider) Retrieve(ctx context.Context) (aws.Credentials, error) { | |||
| } | |||
|
|
|||
| func (p *Provider) getCredentials(ctx context.Context) (*client.GetCredentialsOutput, error) { | |||
| return p.client.GetCredentials(ctx, &client.GetCredentialsInput{AuthorizationToken: p.options.AuthorizationToken}) | |||
| authToken := p.options.AuthorizationToken | |||
There was a problem hiding this comment.
I recommend you compartmentalize this-- e.g.
authToken, err := p.resolveAuthToken()
if err != nil {
return nil, fmt.Errorf("resolve auth token: %v", err)
}
lucix-aws
reviewed
Nov 13, 2023
lucix-aws
reviewed
Nov 13, 2023
lucix-aws
approved these changes
Nov 13, 2023
2 tasks
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.
Modify http cred provider resolving logic to allow EKS/ECS host url and auth token from a file, which can be retrieved from env var