controller: bugfix aws oidc secret upsert process #397
+18
−8
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
Signed-off-by: Xiaolin Lin <xlin158@bloomberg.net>
xiaolin593
changed the title
xiaolin593
changed the title
|
Can you write a test? |
aabchoo
reviewed
Feb 21, 2025
|
|
||
| return r.client.Update(ctx, secret) | ||
| } else { | ||
| r.logger.Info(fmt.Sprintf("creating aws secret %s for backend security policy namespace: %s, name: %s", |
There was a problem hiding this comment.
Could you change the log to specify new aws credential secret? or however to make it clear that a new secret containing aws credentials will be created
| return fmt.Errorf("failed to create secret: %w", err) | ||
| } | ||
| if secretFound { | ||
| r.logger.Info(fmt.Sprintf("updating aws secret %s for backend security policy namespace: %s, name: %s", |
| if err != nil { | ||
| if !apierrors.IsNotFound(err) { | ||
| return err | ||
| } | ||
|
|
There was a problem hiding this comment.
Consider adding a comment to explain this? (Could also add it on line 133?)
There was a problem hiding this comment.
How about rewrite the code to
if err == nil {
updateSecret
} else if apierrors.IsNotFound(err) {
createSecret
}
yuzisun
reviewed
Feb 21, 2025
| @@ -130,11 +130,15 @@ func (r *AWSOIDCRotator) Rotate(ctx context.Context, token string) error { | |||
| return err | |||
| } | |||
|
|
|||
| secretFound := true | |||
There was a problem hiding this comment.
I think the code can be written without using this variable.
| if err != nil { | ||
| if !apierrors.IsNotFound(err) { | ||
| return err | ||
| } | ||
|
|
There was a problem hiding this comment.
How about rewrite the code to
if err == nil {
updateSecret
} else if apierrors.IsNotFound(err) {
createSecret
}
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.
Commit Message
This commit fixes the bug when creating secret for AWS OIDC rotation and streamlines secret upsert operation into Kubernetes.
Detailed explanation:
In aws_oidc_rotator.go [1], existing buggy code snippet:
The intention of above code is to create secret regardless of its existence, then check if k8s returns
AlreadyExisterror.However, k8s returns
BadRequesterror with messageresourceVersion can not be set for Create requestsif debug through and inspect err at [2]Discussed with original commit author and fixed the bug by changing secret upsert process with a control flag to improve readability instead of a quick fix to switch condition from
errors.IsAlreadyExiststoerrors.IsBadRequest.Related Issues/PRs (if applicable)
Related PR: #306
1:
ai-gateway/internal/controller/rotators/aws_oidc_rotator.go
Lines 162 to 168 in 1192716
2:
ai-gateway/internal/controller/rotators/aws_oidc_rotator.go
Line 164 in 1192716