Revert "breakfix: update s3-consuming modules for nil changes (#2237)" (

#2257) This reverts commit 8eeaba3.
aws · Aug 24, 2023 · efd4b30 · efd4b30
1 parent 8eeaba3
commit efd4b30
Show file tree

Hide file tree

Showing 37 changed files with 468 additions and 304 deletions.
diff --git a/.changelog/331929f2c5c941d49d6160d2d2f34ee7.json b/.changelog/331929f2c5c941d49d6160d2d2f34ee7.json
diff --git a/codegen/sdk-codegen/aws-models/s3.json b/codegen/sdk-codegen/aws-models/s3.json
diff --git a/feature/s3/manager/internal/integration/integration.go b/feature/s3/manager/internal/integration/integration.go
@@ -156,7 +156,7 @@ func CleanupBucket(client *s3.Client, bucketName string) error {
 				errs = append(errs, fmt.Errorf("failed to delete %s, %s", aws.ToString(deleteError.Key), aws.ToString(deleteError.Message)))
 			}
 
-			if aws.ToBool(listObjectsV2.IsTruncated) {
+			if listObjectsV2.IsTruncated {
 				input.ContinuationToken = listObjectsV2.NextContinuationToken
 			} else {
 				break
@@ -182,7 +182,7 @@ func CleanupBucket(client *s3.Client, bucketName string) error {
 				})
 			}
 
-			if aws.ToBool(uploads.IsTruncated) {
+			if uploads.IsTruncated {
 				input.KeyMarker = uploads.NextKeyMarker
 				input.UploadIdMarker = uploads.NextUploadIdMarker
 			} else {

diff --git a/feature/s3/manager/upload.go b/feature/s3/manager/upload.go
@@ -501,7 +501,7 @@ func (u *uploader) singlePart(r io.ReadSeeker, cleanup func()) (*UploadOutput, e
 	return &UploadOutput{
 		Location: locationRecorder.location,
 
-		BucketKeyEnabled:     aws.ToBool(out.BucketKeyEnabled),
+		BucketKeyEnabled:     out.BucketKeyEnabled,
 		ChecksumCRC32:        out.ChecksumCRC32,
 		ChecksumCRC32C:       out.ChecksumCRC32C,
 		ChecksumSHA1:         out.ChecksumSHA1,
@@ -639,7 +639,7 @@ func (u *multiuploader) upload(firstBuf io.ReadSeeker, cleanup func()) (*UploadO
 		UploadID:       u.uploadID,
 		CompletedParts: u.parts,
 
-		BucketKeyEnabled:     aws.ToBool(completeOut.BucketKeyEnabled),
+		BucketKeyEnabled:     completeOut.BucketKeyEnabled,
 		ChecksumCRC32:        completeOut.ChecksumCRC32,
 		ChecksumCRC32C:       completeOut.ChecksumCRC32C,
 		ChecksumSHA1:         completeOut.ChecksumSHA1,

diff --git a/service/internal/integrationtest/s3/checksum_test.go b/service/internal/integrationtest/s3/checksum_test.go
@@ -449,7 +449,7 @@ func TestInteg_RequireChecksum(t *testing.T) {
 					Objects: []s3types.ObjectIdentifier{
 						{Key: aws.String(t.Name())},
 					},
-					Quiet: aws.Bool(true),
+					Quiet: true,
 				},
 				ChecksumAlgorithm: c.checksumAlgorithm,
 			})

diff --git a/service/s3/api_op_CompleteMultipartUpload.go b/service/s3/api_op_CompleteMultipartUpload.go
diff --git a/service/s3/api_op_CopyObject.go b/service/s3/api_op_CopyObject.go
diff --git a/service/s3/api_op_CreateBucket.go b/service/s3/api_op_CreateBucket.go
diff --git a/service/s3/api_op_CreateMultipartUpload.go b/service/s3/api_op_CreateMultipartUpload.go
diff --git a/service/s3/api_op_DeleteObject.go b/service/s3/api_op_DeleteObject.go
diff --git a/service/s3/api_op_DeleteObjects.go b/service/s3/api_op_DeleteObjects.go
diff --git a/service/s3/api_op_GetObject.go b/service/s3/api_op_GetObject.go
diff --git a/service/s3/api_op_GetObjectAttributes.go b/service/s3/api_op_GetObjectAttributes.go
diff --git a/service/s3/api_op_HeadObject.go b/service/s3/api_op_HeadObject.go
diff --git a/service/s3/api_op_ListBucketAnalyticsConfigurations.go b/service/s3/api_op_ListBucketAnalyticsConfigurations.go
diff --git a/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go b/service/s3/api_op_ListBucketIntelligentTieringConfigurations.go
diff --git a/service/s3/api_op_ListBucketInventoryConfigurations.go b/service/s3/api_op_ListBucketInventoryConfigurations.go
diff --git a/service/s3/api_op_ListBucketMetricsConfigurations.go b/service/s3/api_op_ListBucketMetricsConfigurations.go
diff --git a/service/s3/api_op_ListMultipartUploads.go b/service/s3/api_op_ListMultipartUploads.go
diff --git a/service/s3/api_op_ListObjectVersions.go b/service/s3/api_op_ListObjectVersions.go
diff --git a/service/s3/api_op_ListObjects.go b/service/s3/api_op_ListObjects.go
diff --git a/service/s3/api_op_ListObjectsV2.go b/service/s3/api_op_ListObjectsV2.go
diff --git a/service/s3/api_op_ListParts.go b/service/s3/api_op_ListParts.go
diff --git a/service/s3/api_op_PutBucketNotificationConfiguration.go b/service/s3/api_op_PutBucketNotificationConfiguration.go
diff --git a/service/s3/api_op_PutBucketPolicy.go b/service/s3/api_op_PutBucketPolicy.go
diff --git a/service/s3/api_op_PutObject.go b/service/s3/api_op_PutObject.go
diff --git a/service/s3/api_op_PutObjectRetention.go b/service/s3/api_op_PutObjectRetention.go
diff --git a/service/s3/api_op_UploadPart.go b/service/s3/api_op_UploadPart.go
diff --git a/service/s3/api_op_UploadPartCopy.go b/service/s3/api_op_UploadPartCopy.go
diff --git a/service/s3/api_op_WriteGetObjectResponse.go b/service/s3/api_op_WriteGetObjectResponse.go