Merge branch 'main' into v1.4

0marperez · web-flow · commit 2a41592882c9 · 2025-01-14T16:34:00.000-05:00
diff --git a/.github/workflows/api-compat-verification.yml b/.github/workflows/api-compat-verification.yml
@@ -3,7 +3,9 @@ name: API compatibility verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   api-compat-verification:
diff --git a/.github/workflows/artifact-size-metrics.yml b/.github/workflows/artifact-size-metrics.yml
@@ -2,7 +2,9 @@ name: Artifact Size Metrics
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   release:
     types: [published]
 
diff --git a/.github/workflows/changelog-verification.yml b/.github/workflows/changelog-verification.yml
@@ -3,7 +3,9 @@ name: Changelog verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   changelog-verification:
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -2,7 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   pull_request:
   workflow_dispatch:
 
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -2,7 +2,9 @@ name: Dependabot Dependency Submission
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 permissions:
   contents: write
diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml
@@ -3,7 +3,9 @@ name: Kat Transform
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
 concurrency:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -5,8 +5,11 @@ on:
     branches:
       - '**'
       - '!main'
+      - '!*-main'
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   workflow_dispatch:
 
 env:
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ out/
 # Compiled class file
 *.class
 *.klib
+.kotlin/
 
 # Log file
 *.log
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.3.34] - 01/10/2025
+
+## [1.3.33] - 01/10/2025
+
 ## [1.3.32] - 01/06/2025
 
 ### Fixes
diff --git a/codegen/protocol-tests/model/error-correction-tests.smithy b/codegen/protocol-tests/model/error-correction-tests.smithy
@@ -37,7 +37,12 @@ operation SayHello { output: TestOutputDocument, errors: [Error] }
 @http(method: "POST", uri: "/")
 operation SayHelloXml { output: TestOutput, errors: [Error] }
 
-structure TestOutputDocument with [TestStruct] { innerField: Nested, @required document: Document }
+structure TestOutputDocument with [TestStruct] {
+    innerField: Nested,
+    // FIXME: This trait fails smithy validator
+    // @required
+    document: Document
+}
 structure TestOutput with [TestStruct] { innerField: Nested }
 
 @mixin
@@ -60,7 +65,8 @@ structure TestStruct {
     @required
     nestedListValue: NestedList
 
-    @required
+    // FIXME: This trait fails smithy validator
+    // @required
     nested: Nested
 
     @required
@@ -91,7 +97,8 @@ union MyUnion {
 }
 
 structure Nested {
-    @required
+    // FIXME: This trait fails smithy validator
+    // @required
     a: String
 }
 
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
@@ -39,7 +39,15 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
         // The following can be used to generate only a specific test by name.
         // val targetedTest = TestMemberDelta(setOf("RestJsonComplexErrorWithNoMessage"), TestContainmentMode.RUN_TESTS)
 
-        val ignoredTests = TestMemberDelta(setOf())
+        val ignoredTests = TestMemberDelta(
+            setOf(
+                "AwsJson10ClientErrorCorrectsWithDefaultValuesWhenServerFailsToSerializeRequiredValues",
+                "RestJsonNullAndEmptyHeaders",
+                "NullAndEmptyHeaders",
+                "RpcV2CborClientPopulatesDefaultsValuesWhenMissingInResponse",
+                "RpcV2CborClientPopulatesDefaultValuesInInput",
+            ),
+        )
 
         val requestTestBuilder = HttpProtocolUnitTestRequestGenerator.Builder()
         val responseTestBuilder = HttpProtocolUnitTestResponseGenerator.Builder()
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.33-SNAPSHOT
+sdkVersion=1.3.35-SNAPSHOT
 
 # codegen
-codegenVersion=0.33.33-SNAPSHOT
+codegenVersion=0.33.35-SNAPSHOT
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,7 +18,8 @@ micrometer-version = "1.14.2"
 binary-compatibility-validator-version = "0.16.3"
 
 # codegen
-smithy-version = "1.51.0"
+smithy-version = "1.53.0"
+smithy-gradle-version = "0.9.0"
 
 # testing
 junit-version = "5.10.5"
diff --git a/runtime/auth/aws-signing-common/api/aws-signing-common.api b/runtime/auth/aws-signing-common/api/aws-signing-common.api
@@ -1,3 +1,13 @@
+public final class aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator {
+	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/time/Clock;)V
+	public synthetic fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/time/Clock;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun generateAuthToken-exY8QGI (Laws/smithy/kotlin/runtime/net/url/Url;Ljava/lang/String;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun getClock ()Laws/smithy/kotlin/runtime/time/Clock;
+	public final fun getCredentialsProvider ()Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;
+	public final fun getService ()Ljava/lang/String;
+	public final fun getSigner ()Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;
+}
+
 public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedByteReadChannel : aws/smithy/kotlin/runtime/io/SdkByteReadChannel {
 	public fun <init> (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;)V
 	public synthetic fun <init> (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt
@@ -0,0 +1,44 @@
+/*
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig.Companion.invoke
+import aws.smithy.kotlin.runtime.http.HttpMethod
+import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.net.url.Url
+import aws.smithy.kotlin.runtime.time.Clock
+import kotlin.time.Duration
+
+/**
+ * Generates an authentication token, which is a SigV4-signed URL with the HTTP scheme removed.
+ * @param service The name of the service the token is being generated for
+ * @param credentialsProvider The [CredentialsProvider] which will provide credentials to use when generating the auth token
+ * @param signer The [AwsSigner] implementation to use when creating the authentication token
+ * @param clock The [Clock] implementation to use
+ */
+public class AuthTokenGenerator(
+    public val service: String,
+    public val credentialsProvider: CredentialsProvider,
+    public val signer: AwsSigner,
+    public val clock: Clock = Clock.System,
+) {
+    private fun Url.trimScheme(): String = toString().removePrefix(scheme.protocolName).removePrefix("://")
+
+    public suspend fun generateAuthToken(endpoint: Url, region: String, expiration: Duration): String {
+        val req = HttpRequest(HttpMethod.GET, endpoint)
+
+        val config = AwsSigningConfig {
+            credentials = credentialsProvider.resolve()
+            this.region = region
+            service = this@AuthTokenGenerator.service
+            signingDate = clock.now()
+            expiresAfter = expiration
+            signatureType = AwsSignatureType.HTTP_REQUEST_VIA_QUERY_PARAMS
+        }
+
+        return signer.sign(req, config).output.url.trimScheme()
+    }
+}
diff --git a/runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt b/runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt
@@ -0,0 +1,71 @@
+/*
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
+import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
+import aws.smithy.kotlin.runtime.collections.Attributes
+import aws.smithy.kotlin.runtime.http.Headers
+import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.http.request.toBuilder
+import aws.smithy.kotlin.runtime.net.Host
+import aws.smithy.kotlin.runtime.net.url.Url
+import aws.smithy.kotlin.runtime.time.Instant
+import aws.smithy.kotlin.runtime.time.ManualClock
+import kotlinx.coroutines.test.runTest
+import kotlin.test.Test
+import kotlin.test.assertContains
+import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.DurationUnit
+
+class AuthTokenGeneratorTest {
+    @Test
+    fun testGenerateAuthToken() = runTest {
+        val credentials = Credentials("akid", "secret")
+
+        val credentialsProvider = object : CredentialsProvider {
+            var credentialsResolved = false
+            override suspend fun resolve(attributes: Attributes): Credentials {
+                credentialsResolved = true
+                return credentials
+            }
+        }
+
+        val clock = ManualClock(Instant.fromEpochSeconds(0))
+
+        val generator = AuthTokenGenerator("foo", credentialsProvider, TEST_SIGNER, clock = clock)
+
+        val endpoint = Url { host = Host.parse("foo.bar.us-east-1.baz") }
+        val token = generator.generateAuthToken(endpoint, "us-east-1", 333.seconds)
+
+        assertContains(token, "foo.bar.us-east-1.baz")
+        assertContains(token, "X-Amz-Credential=signature") // test custom signer was invoked
+        assertContains(token, "X-Amz-Expires=333") // expiration
+        assertContains(token, "X-Amz-SigningDate=0") // clock
+
+        assertTrue(credentialsProvider.credentialsResolved)
+    }
+}
+
+private val TEST_SIGNER = object : AwsSigner {
+    override suspend fun sign(
+        request: HttpRequest,
+        config: AwsSigningConfig,
+    ): AwsSigningResult<HttpRequest> {
+        val builder = request.toBuilder()
+        builder.url.parameters.decodedParameters.apply {
+            put("X-Amz-Credential", "signature")
+            put("X-Amz-Expires", (config.expiresAfter?.toLong(DurationUnit.SECONDS) ?: 900).toString())
+            put("X-Amz-SigningDate", config.signingDate.epochSeconds.toString())
+        }
+
+        return AwsSigningResult<HttpRequest>(builder.build(), "signature".encodeToByteArray())
+    }
+
+    override suspend fun signChunk(chunkBody: ByteArray, prevSignature: ByteArray, config: AwsSigningConfig): AwsSigningResult<Unit> = throw IllegalStateException("signChunk unexpectedly invoked")
+
+    override suspend fun signChunkTrailer(trailingHeaders: Headers, prevSignature: ByteArray, config: AwsSigningConfig): AwsSigningResult<Unit> = throw IllegalStateException("signChunkTrailer unexpectedly invoked")
+}
