Clean up S3 integrations and e2e tests

Author: 0marperez

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/express/S3ExpressIntegration.kt

@@ -25,8 +25,7 @@ import software.amazon.smithy.model.transform.ModelTransformer
  * An integration which handles codegen for S3 Express, such as:
  * 1. Configure auth scheme by applying a synthetic shape and trait
  * 2. Add ExpressClient and Bucket to execution context
- * 3. Override checksums to use CRC32 instead of MD5
- * 4. Disable all checksums for s3:UploadPart
+ * 3. Disable all checksums for s3:UploadPart
  */
 class S3ExpressIntegration : KotlinIntegration {
     companion object {

services/s3/common/src/aws/sdk/kotlin/services/s3/express/S3ExpressCrc32ChecksumInterceptor.kt

@@ -15,6 +15,8 @@ import aws.smithy.kotlin.runtime.telemetry.logging.logger
 import kotlin.coroutines.coroutineContext
 
 private const val CHECKSUM_HEADER_PREFIX = "x-amz-checksum-"
+private const val S3_EXPRESS_ENDPOINT_PROPERTY_KEY = "backend"
+private const val S3_EXPRESS_ENDPOINT_PROPERTY_VALUE = "S3Express"
 
 /**
  * Disables checksums for s3:UploadPart requests that use S3 express.

services/s3/common/src/aws/sdk/kotlin/services/s3/express/S3ExpressDisableChecksumInterceptor.kt

@@ -8,7 +8,7 @@ import aws.sdk.kotlin.e2etest.S3TestUtils.createMultiRegionAccessPoint
 import aws.sdk.kotlin.e2etest.S3TestUtils.deleteBucketAndAllContents
 import aws.sdk.kotlin.e2etest.S3TestUtils.deleteMultiRegionAccessPoint
 import aws.sdk.kotlin.e2etest.S3TestUtils.getAccountId
-import aws.sdk.kotlin.e2etest.S3TestUtils.getBucket
+import aws.sdk.kotlin.e2etest.S3TestUtils.getBucketWithPrefix
 import aws.sdk.kotlin.e2etest.S3TestUtils.getMultiRegionAccessPointArn
 import aws.sdk.kotlin.e2etest.S3TestUtils.multiRegionAccessPointWasCreated
 import aws.sdk.kotlin.services.s3.S3Client
@@ -47,8 +47,8 @@ class MutliRegionAccessPointTest {
     @BeforeAll
     private fun setUp(): Unit = runBlocking {
         accountId = getAccountId()
-        usWestBucket = getBucket(s3West, MRAP_BUCKET_PREFIX, "us-west-2", accountId)
-        usEastBucket = getBucket(s3East, MRAP_BUCKET_PREFIX, "us-east-2", accountId)
+        usWestBucket = getBucketWithPrefix(s3West, MRAP_BUCKET_PREFIX, "us-west-2", accountId)
+        usEastBucket = getBucketWithPrefix(s3East, MRAP_BUCKET_PREFIX, "us-east-2", accountId)
 
         createMultiRegionAccessPoint(
             s3Control,

services/s3/e2eTest/src/MutliRegionAccessPointTest.kt

@@ -46,9 +46,9 @@ object S3TestUtils {
         client: S3Client,
         region: String? = null,
         accountId: String? = null,
-    ): String = getBucket(client, TEST_BUCKET_PREFIX, region, accountId)
+    ): String = getBucketWithPrefix(client, TEST_BUCKET_PREFIX, region, accountId)
 
-    suspend fun getBucket(
+    suspend fun getBucketWithPrefix(
         client: S3Client,
         prefix: String,
         region: String? = null,