Use static strings for enums

aws · Dec 23, 2020 · d1a795c · d1a795c
1 parent 7ca5d89
commit d1a795c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/feature/dynamodb/expression/examples_test.go b/feature/dynamodb/expression/examples_test.go
@@ -232,7 +232,7 @@ func ExampleBuilder_WithUpdate() {
 			"Artist":    &types.AttributeValueMemberS{Value: "Acme Band"},
 			"SongTitle": &types.AttributeValueMemberS{Value: "Happy Day"},
 		},
-		ReturnValues:     types.ReturnValueAllNew,
+		ReturnValues:     "ALL_NEW",
 		TableName:        aws.String("Music"),
 		UpdateExpression: expr.Update(),
 	}

diff --git a/feature/s3/manager/upload_test.go b/feature/s3/manager/upload_test.go
@@ -41,7 +41,7 @@ func TestUploadOrderMulti(t *testing.T) {
 		Bucket:               aws.String("Bucket"),
 		Key:                  aws.String("Key - value"),
 		Body:                 bytes.NewReader(buf12MB),
-		ServerSideEncryption: types.ServerSideEncryptionAwsKms,
+		ServerSideEncryption: "aws:kms",
 		SSEKMSKeyId:          aws.String("KmsId"),
 		ContentType:          aws.String("content/type"),
 	})
@@ -101,7 +101,7 @@ func TestUploadOrderMulti(t *testing.T) {
 	// Custom headers
 	cmu := (*args)[0].(*s3.CreateMultipartUploadInput)
 
-	if e, a := types.ServerSideEncryptionAwsKms, cmu.ServerSideEncryption; e != a {
+	if e, a := types.ServerSideEncryption("aws:kms"), cmu.ServerSideEncryption; e != a {
 		t.Errorf("expect %q, got %q", e, a)
 	}
 
@@ -208,7 +208,7 @@ func TestUploadOrderSingle(t *testing.T) {
 		Bucket:               aws.String("Bucket"),
 		Key:                  aws.String("Key - value"),
 		Body:                 bytes.NewReader(buf2MB),
-		ServerSideEncryption: types.ServerSideEncryptionAwsKms,
+		ServerSideEncryption: "aws:kms",
 		SSEKMSKeyId:          aws.String("KmsId"),
 		ContentType:          aws.String("content/type"),
 	})
@@ -235,7 +235,7 @@ func TestUploadOrderSingle(t *testing.T) {
 
 	putObjectInput := (*params)[0].(*s3.PutObjectInput)
 
-	if e, a := types.ServerSideEncryptionAwsKms, putObjectInput.ServerSideEncryption; e != a {
+	if e, a := types.ServerSideEncryption("aws:kms"), putObjectInput.ServerSideEncryption; e != a {
 		t.Errorf("expect %q, got %q", e, a)
 	}
 

diff --git a/service/internal/integrationtest/s3shared/integ_test_setup.go b/service/internal/integrationtest/s3shared/integ_test_setup.go
@@ -27,7 +27,7 @@ func SetupBucket(ctx context.Context, svc *s3.Client, bucketName string) (err er
 	_, err = svc.CreateBucket(ctx, &s3.CreateBucketInput{
 		Bucket: &bucketName,
 		CreateBucketConfiguration: &types.CreateBucketConfiguration{
-			LocationConstraint: types.BucketLocationConstraintUsWest2,
+			LocationConstraint: "us-west-2",
 		},
 	})
 	if err != nil {

diff --git a/service/s3/internal/customizations/handle_200_error_test.go b/service/s3/internal/customizations/handle_200_error_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/internal/awstesting/unit"
 
 	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 )
 
 type EndpointResolverFunc func(region string, options s3.EndpointResolverOptions) (aws.Endpoint, error)
@@ -84,7 +83,7 @@ func TestErrorResponseWith200StatusCode(t *testing.T) {
 			svc := s3.New(options)
 			resp, err := svc.CompleteMultipartUpload(context.Background(), &s3.CompleteMultipartUploadInput{
 				UploadId:     aws.String("mockID"),
-				RequestPayer: types.RequestPayerRequester,
+				RequestPayer: "requester",
 				Bucket:       aws.String("bucket"),
 				Key:          aws.String("mockKey"),
 			})