feat: consume smithy-kotlin SigV4a implementation

.changes/9636f12b-5612-41ec-a9ae-9434724e97a5.json

@@ -0,0 +1,5 @@
+{
+    "id": "9636f12b-5612-41ec-a9ae-9434724e97a5",
+    "type": "feature",
+    "description": "Add SigV4a support to the default AWS signer"
+}

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/UnsupportedSigningAlgorithmInterceptor.kt

@@ -18,6 +18,7 @@ import aws.smithy.kotlin.runtime.http.response.HttpResponse
  * If so it sends users to a section in the AWS SDK for Kotlin documentation on how to fix it.
  */
 @InternalSdkApi
+@Deprecated("This interceptor is no longer used. It will be removed in the next minor version, v1.5.x.")
 public class UnsupportedSigningAlgorithmInterceptor : HttpInterceptor {
     override suspend fun modifyBeforeCompletion(context: ResponseInterceptorContext<Any, Any, HttpRequest?, HttpResponse?>): Result<Any> {
         context.response.exceptionOrNull()?.let {

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsRuntimeTypes.kt

@@ -59,7 +59,6 @@ object AwsRuntimeTypes {
     object Http : RuntimeTypePackage(AwsKotlinDependency.AWS_HTTP) {
         object Interceptors : RuntimeTypePackage(AwsKotlinDependency.AWS_HTTP, "interceptors") {
             val AddUserAgentMetadataInterceptor = symbol("AddUserAgentMetadataInterceptor")
-            val UnsupportedSigningAlgorithmInterceptor = symbol("UnsupportedSigningAlgorithmInterceptor")
             val IgnoreCompositeFlexibleChecksumResponseInterceptor = symbol("IgnoreCompositeFlexibleChecksumResponseInterceptor")
 
             object BusinessMetrics : RuntimeTypePackage(AwsKotlinDependency.AWS_HTTP, "interceptors.businessmetrics") {

codegen/aws-sdk-codegen/src/main/resources/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration

@@ -35,7 +35,6 @@ aws.sdk.kotlin.codegen.customization.machinelearning.MachineLearningEndpointCust
 aws.sdk.kotlin.codegen.customization.route53.TrimResourcePrefix
 aws.sdk.kotlin.codegen.customization.ec2.EC2MakePrimitivesOptional
 aws.sdk.kotlin.codegen.customization.RemoveDefaults
-aws.sdk.kotlin.codegen.customization.s3.UnsupportedSigningAlgorithmIntegration
 aws.sdk.kotlin.codegen.customization.SigV4AsymmetricTraitCustomization
 aws.sdk.kotlin.codegen.customization.cloudfrontkeyvaluestore.BackfillSigV4ACustomization
 aws.sdk.kotlin.codegen.customization.s3.express.SigV4S3ExpressAuthSchemeIntegration

services/s3/e2eTest/src/MultiRegionAccessPointTest.kt

@@ -0,0 +1,195 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.sdk.kotlin.e2etest
+
+import aws.sdk.kotlin.e2etest.S3TestUtils.deleteBucketAndAllContents
+import aws.sdk.kotlin.e2etest.S3TestUtils.getAccountId
+import aws.sdk.kotlin.e2etest.S3TestUtils.getBucketWithPrefix
+import aws.sdk.kotlin.services.s3.S3Client
+import aws.sdk.kotlin.services.s3.deleteObject
+import aws.sdk.kotlin.services.s3.putObject
+import aws.sdk.kotlin.services.s3.withConfig
+import aws.sdk.kotlin.services.s3control.S3ControlClient
+import aws.sdk.kotlin.services.s3control.createMultiRegionAccessPoint
+import aws.sdk.kotlin.services.s3control.deleteMultiRegionAccessPoint
+import aws.sdk.kotlin.services.s3control.describeMultiRegionAccessPointOperation
+import aws.sdk.kotlin.services.s3control.getMultiRegionAccessPoint
+import aws.sdk.kotlin.services.s3control.model.Region
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigner
+import aws.smithy.kotlin.runtime.auth.awssigning.DefaultAwsSigner
+import aws.smithy.kotlin.runtime.auth.awssigning.crt.CrtAwsSigner
+import aws.smithy.kotlin.runtime.http.auth.SigV4AsymmetricAuthScheme
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.Arguments
+import org.junit.jupiter.params.provider.MethodSource
+import java.util.stream.Stream
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+
+private const val MRAP_BUCKET_PREFIX = "s3-mrap-test-bucket-"
+private const val MULTI_REGION_ACCESS_POINT_NAME = "aws-sdk-for-kotlin-test-multi-region-access-point"
+private const val TEST_OBJECT_KEY = "test.txt"
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class MutliRegionAccessPointTest {
+    private lateinit var s3West: S3Client
+    private lateinit var s3East: S3Client
+    private lateinit var s3Control: S3ControlClient
+
+    private lateinit var accountId: String
+    private lateinit var multiRegionAccessPointArn: String
+    private lateinit var usWestBucket: String
+    private lateinit var usEastBucket: String
+
+    @BeforeAll
+    fun setup(): Unit = runBlocking {
+        s3West = S3Client { region = "us-west-2" }
+        s3East = S3Client { region = "us-east-2" }
+        s3Control = S3ControlClient { region = "us-west-2" }
+
+        accountId = getAccountId()
+        usWestBucket = getBucketWithPrefix(s3West, MRAP_BUCKET_PREFIX, "us-west-2", accountId)
+        usEastBucket = getBucketWithPrefix(s3East, MRAP_BUCKET_PREFIX, "us-east-2", accountId)
+
+        multiRegionAccessPointArn = s3Control.createMultiRegionAccessPoint(
+            MULTI_REGION_ACCESS_POINT_NAME,
+            accountId,
+            listOf(usWestBucket, usEastBucket),
+        )
+    }
+
+    @AfterAll
+    fun cleanup(): Unit = runBlocking {
+        s3Control.deleteMultiRegionAccessPoint(MULTI_REGION_ACCESS_POINT_NAME, accountId)
+
+        deleteBucketAndAllContents(s3West, usWestBucket)
+        deleteBucketAndAllContents(s3East, usEastBucket)
+
+        s3West.close()
+        s3East.close()
+        s3Control.close()
+    }
+
+    @ParameterizedTest
+    @MethodSource("signerProvider")
+    fun testMultiRegionAccessPointOperation(signer: AwsSigner): Unit = runBlocking {
+        println("Testing multi-region access point operations with $signer")
+
+        val s3SigV4a = s3West.withConfig {
+            authSchemes = listOf(SigV4AsymmetricAuthScheme(signer))
+        }
+
+        s3SigV4a.putObject {
+            bucket = multiRegionAccessPointArn
+            key = TEST_OBJECT_KEY
+        }
+
+        s3SigV4a.deleteObject {
+            bucket = multiRegionAccessPointArn
+            key = TEST_OBJECT_KEY
+        }
+    }
+
+    fun signerProvider(): Stream<Arguments> = Stream.of(
+        Arguments.of(DefaultAwsSigner),
+        Arguments.of(CrtAwsSigner),
+    )
+}
+
+/**
+ * Create a multi-region access point named [name] in account [accountId] with [buckets] buckets.
+ * @return the ARN of the multi-region access point that was created
+ */
+private suspend fun S3ControlClient.createMultiRegionAccessPoint(
+    name: String,
+    accountId: String,
+    buckets: List<String>,
+): String {
+    println("Creating multi-region access point: $name")
+
+    val requestTokenArn = checkNotNull(
+        createMultiRegionAccessPoint {
+            this.accountId = accountId
+            details {
+                this.name = name
+                this.regions = buckets.map { Region { bucket = it } }
+            }
+        }.requestTokenArn,
+    ) { "createMultiRegionAccessPoint requestTokenArn was unexpectedly null" }
+
+    waitUntilOperationCompletes("createMultiRegionAccessPoint", accountId, requestTokenArn, 10.minutes)
+
+    return getMultiRegionAccessPointArn(name, accountId)
+}
+
+private suspend fun S3ControlClient.getMultiRegionAccessPointArn(
+    name: String,
+    accountId: String,
+): String = getMultiRegionAccessPoint {
+    this.name = name
+    this.accountId = accountId
+}.accessPoint?.alias?.let {
+    "arn:aws:s3::$accountId:accesspoint/$it"
+} ?: throw IllegalStateException("Failed to get ARN for multi-region access point $name")
+
+private suspend fun S3ControlClient.deleteMultiRegionAccessPoint(
+    name: String,
+    accountId: String,
+) {
+    println("Deleting multi-region access point $name")
+
+    val requestTokenArn = checkNotNull(
+        deleteMultiRegionAccessPoint {
+            this.accountId = accountId
+            details {
+                this.name = name
+            }
+        }.requestTokenArn,
+    ) { "deleteMultiRegionAccessPoint requestTokenArn was unexpectedly null" }
+
+    waitUntilOperationCompletes("deleteMultiRegionAccessPoint", accountId, requestTokenArn, 5.minutes)
+}
+
+/**
+ * Continuously poll the status of [requestTokenArn] until its status is "SUCCEEDED" or [timeout] duration has passed.
+ */
+private suspend fun S3ControlClient.waitUntilOperationCompletes(
+    operation: String,
+    accountId: String,
+    requestTokenArn: String,
+    timeout: Duration,
+) = withTimeout(timeout) {
+    var status: String? = null
+
+    while (true) {
+        val latestStatus = describeMultiRegionAccessPointOperation {
+            this.accountId = accountId
+            this.requestTokenArn = requestTokenArn
+        }.asyncOperation?.requestStatus
+
+        when (latestStatus) {
+            "SUCCEEDED" -> {
+                println("$operation operation succeeded.")
+                return@withTimeout
+            }
+            "FAILED" -> throw IllegalStateException("$operation operation failed")
+            else -> {
+                if (status == null || latestStatus != status) {
+                    println("Waiting for $operation to complete. Status: $latestStatus ")
+                    status = latestStatus
+                }
+            }
+        }
+
+        delay(10.seconds) // Avoid constant status checks
+    }
+}