Merge pull request #28530 from myst3k/add-NoSuchTagSetError-support

adding support for NoSuchTagSetError
hashicorp · Feb 11, 2023 · e3ade2d · e3ade2d
2 parents 3c8bd5a + 96a7810
commit e3ade2d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.changelog/28530.txt b/.changelog/28530.txt
@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_s3_bucket: Accept 'NoSuchTagSetError' responses from S3-compatible services
+```
+
+```release-note:enhancement
+resource/aws_s3_object: Accept 'NoSuchTagSetError' responses from S3-compatible services
+```
diff --git a/internal/service/s3/tags.go b/internal/service/s3/tags.go
@@ -17,7 +17,8 @@ import (
 )
 
 const (
-	ErrCodeNoSuchTagSet = "NoSuchTagSet"
+	ErrCodeNoSuchTagSet      = "NoSuchTagSet"
+	ErrCodeNoSuchTagSetError = "NoSuchTagSetError"
 )
 
 // Custom S3 tag service update functions using the same format as generated code.
@@ -34,7 +35,7 @@ func BucketListTags(ctx context.Context, conn *s3.S3, identifier string) (tftags
 	// S3 API Reference (https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketTagging.html)
 	// lists the special error as NoSuchTagSetError, however the existing logic used NoSuchTagSet
 	// and the AWS Go SDK has neither as a constant.
-	if tfawserr.ErrCodeEquals(err, ErrCodeNoSuchTagSet) {
+	if tfawserr.ErrCodeEquals(err, ErrCodeNoSuchTagSet, ErrCodeNoSuchTagSetError) {
 		return tftags.New(nil), nil
 	}
 
@@ -115,7 +116,7 @@ func ObjectListTags(ctx context.Context, conn *s3.S3, bucket, key string) (tftag
 		output, err = conn.GetObjectTaggingWithContext(ctx, input)
 	}
 
-	if tfawserr.ErrCodeEquals(err, ErrCodeNoSuchTagSet) {
+	if tfawserr.ErrCodeEquals(err, ErrCodeNoSuchTagSet, ErrCodeNoSuchTagSetError) {
 		return tftags.New(nil), nil
 	}