Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(S3): Add check for S3 tagging api error code when empty TagSet #2054

Merged
merged 1 commit into from
May 2, 2024
Merged

fix(S3): Add check for S3 tagging api error code when empty TagSet #2054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/controller/s3/bucket/taggingConfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ func (in *TaggingConfigurationClient) CacheBucketTaggingOutput(ctx context.Conte
if in.cache.getBucketTaggingOutput == nil {
external, err := in.client.GetBucketTagging(ctx, &awss3.GetBucketTaggingInput{Bucket: bucketName})
if err != nil {
if s3.TaggingNotFound(err) {
return &awss3.GetBucketTaggingOutput{TagSet: nil}, nil
}
return external, err
}
in.cache.getBucketTaggingOutput = external
Expand Down
16 changes: 16 additions & 0 deletions pkg/controller/s3/bucket/taggingConfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,22 @@ func TestTaggingCreateOrUpdate(t *testing.T) {
err: nil,
},
},
"SuccessfulCreateNoExistingTags": {
args: args{
b: s3testing.Bucket(s3testing.WithTaggingConfig(generateTaggingConfig())),
cl: NewTaggingConfigurationClient(fake.MockBucketClient{
MockPutBucketTagging: func(ctx context.Context, input *s3.PutBucketTaggingInput, opts []func(*s3.Options)) (*s3.PutBucketTaggingOutput, error) {
return &s3.PutBucketTaggingOutput{}, nil
},
MockGetBucketTagging: func(ctx context.Context, input *s3.GetBucketTaggingInput, opts []func(*s3.Options)) (*s3.GetBucketTaggingOutput, error) {
return nil, &smithy.GenericAPIError{Code: clientss3.TaggingNotFoundErrCode}
},
}),
},
want: want{
err: nil,
},
},
}

for name, tc := range cases {
Expand Down