Release merge

.changes/5a190de6-e9e5-4908-9bf9-62c34cf254f9.json

@@ -0,0 +1,8 @@
+{
+    "id": "5a190de6-e9e5-4908-9bf9-62c34cf254f9",
+    "type": "bugfix",
+    "description": "Bump the **smithy-kotlin** version to pick up a [bugfix for Endpoint Discovery](https://github.com/smithy-lang/smithy-kotlin/pull/1240)",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1413"
+    ]
+}

.changes/5fa3154d-1f42-4b98-9ad1-ef8ef1ad5fbc.json

@@ -0,0 +1,8 @@
+{
+    "id": "5fa3154d-1f42-4b98-9ad1-ef8ef1ad5fbc",
+    "type": "feature",
+    "description": "Improve the coding style of DynamoDB Mapper auto-generated schemas",
+    "issues": [
+        "https://github.com/awslabs/aws-sdk-kotlin/issues/1521"
+    ]
+}

.github/workflows/codebuild-ci.yml

@@ -85,6 +85,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Run Service Check Batch and Calculate Artifact Size Metrics
         id: svc-check-batch
         run: | 
@@ -212,6 +214,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Calculate Artifact Size Metrics
         id: svc-check-batch
         run: |

.github/workflows/continuous-integration.yml

@@ -33,6 +33,10 @@ jobs:
           path: 'aws-sdk-kotlin'
       - name: Setup Build
         uses: ./aws-sdk-kotlin/.github/actions/setup-build
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./aws-sdk-kotlin
       - name: Test
         working-directory: ./aws-sdk-kotlin
         shell: bash
@@ -60,6 +64,10 @@ jobs:
           path: 'aws-sdk-kotlin'
       - name: Setup Build
         uses: ./aws-sdk-kotlin/.github/actions/setup-build
+      - name: Configure Gradle - smithy-kotlin
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./smithy-kotlin
       - name: Build smithy-kotlin
         working-directory: ./smithy-kotlin
         shell: bash
@@ -68,6 +76,10 @@ jobs:
           pwd
           ./gradlew --parallel assemble 
           ./gradlew publishToMavenLocal
+      - name: Configure Gradle aws-sdk-kotlin
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./aws-sdk-kotlin
       - name: Test
         working-directory: ./aws-sdk-kotlin
         shell: bash

.github/workflows/kat-transform.yml

@@ -38,6 +38,11 @@ jobs:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
 
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./aws-sdk-kotlin
+
       - name: Setup kat
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
 

.github/workflows/lint.yml

@@ -21,6 +21,8 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
+    - name: Configure Gradle
+      uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
     - name: Lint ${{ env.PACKAGE_NAME }}
       run: |
         ./gradlew ktlint

.github/workflows/update-release-branch.yml

@@ -43,6 +43,8 @@ jobs:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Check merge base
         shell: bash
         run: |

examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+# Keep gradle version in sync with aws-sdk-kotlin/gradle/wrapper/gradle-wrapper.properties
+distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/libs.versions.toml

@@ -4,16 +4,16 @@ ksp-version = "2.1.0-1.0.29" # Keep in sync with kotlin-version
 
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.18"
+aws-kotlin-repo-tools-version = "0.4.20"
 
 # libs
 coroutines-version = "1.9.0"
 atomicfu-version = "0.25.0"
 binary-compatibility-validator-version = "0.16.3"
 
 # smithy-kotlin codegen and runtime are versioned separately
-smithy-kotlin-runtime-version = "1.4.2"
-smithy-kotlin-codegen-version = "0.34.2"
+smithy-kotlin-runtime-version = "1.4.3"
+smithy-kotlin-codegen-version = "0.34.3"
 
 # codegen
 smithy-version = "1.53.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

hll/dynamodb-mapper/dynamodb-mapper-schema-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/rendering/SchemaRenderer.kt

@@ -161,7 +161,7 @@ internal class SchemaRenderer(
 
             // converter
             renderValueConverter(prop.type.resolve())
-            write("")
+            write(",")
         }
     }
 
@@ -291,7 +291,7 @@ internal class SchemaRenderer(
 
         write("@#T", Types.Smithy.ExperimentalApi)
         withBlock("#Lobject #L : #T {", "}", ctx.attributes.visibility, schemaName, schemaType) {
-            write("override val converter : #1T = #1T", itemConverter)
+            write("override val converter: #1T = #1T", itemConverter)
             write("override val partitionKey: #T = #T(#S)", MapperTypes.Items.keySpec(partitionKeyProp.keySpec), partitionKeyProp.keySpecType, partitionKeyName)
             if (sortKeyProp != null) {
                 write("override val sortKey: #T = #T(#S)", MapperTypes.Items.keySpec(sortKeyProp.keySpec), sortKeyProp.keySpecType, sortKeyName!!)

hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/src/test/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginTest.kt

@@ -106,25 +106,25 @@ class SchemaGeneratorPluginTest {
                     "id",
                     User::id,
                     UserBuilder::id::set,
-                    IntConverter
+                    IntConverter,
                 ),
                 AttributeDescriptor(
                     "fName",
                     User::givenName,
                     UserBuilder::givenName::set,
-                    StringConverter
+                    StringConverter,
                 ),
                 AttributeDescriptor(
                     "lName",
                     User::surname,
                     UserBuilder::surname::set,
-                    StringConverter
+                    StringConverter,
                 ),
                 AttributeDescriptor(
                     "age",
                     User::age,
                     UserBuilder::age::set,
-                    IntConverter
+                    IntConverter,
                 ),
             ),
         )
@@ -136,7 +136,7 @@ class SchemaGeneratorPluginTest {
             schemaContents,
             """
         object UserSchema : ItemSchema.PartitionKey<User, Int> {
-            override val converter : UserConverter = UserConverter
+            override val converter: UserConverter = UserConverter
             override val partitionKey: KeySpec<Number> = aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec.Number("id")
         }
             """.trimIndent(),
@@ -173,25 +173,25 @@ class SchemaGeneratorPluginTest {
                     "id",
                     BuilderNotRequired::id,
                     BuilderNotRequired::id::set,
-                    IntConverter
+                    IntConverter,
                 ),
                 AttributeDescriptor(
                     "fName",
                     BuilderNotRequired::givenName,
                     BuilderNotRequired::givenName::set,
-                    StringConverter
+                    StringConverter,
                 ),
                 AttributeDescriptor(
                     "lName",
                     BuilderNotRequired::surname,
                     BuilderNotRequired::surname::set,
-                    StringConverter
+                    StringConverter,
                 ),
                 AttributeDescriptor(
                     "age",
                     BuilderNotRequired::age,
                     BuilderNotRequired::age::set,
-                    IntConverter
+                    IntConverter,
                 ),
             ),
         )
@@ -414,7 +414,7 @@ class SchemaGeneratorPluginTest {
             schemaContents,
             """
             public object CustomUserSchema : ItemSchema.PartitionKey<CustomUser, Int> {
-                override val converter : MyCustomUserConverter = MyCustomUserConverter
+                override val converter: MyCustomUserConverter = MyCustomUserConverter
                 override val partitionKey: KeySpec<Number> = aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec.Number("id")
             }
             """.trimIndent(),
@@ -570,7 +570,7 @@ class SchemaGeneratorPluginTest {
             schemaContents,
             """
         object RenamedPartitionKeySchema : ItemSchema.PartitionKey<RenamedPartitionKey, Int> {
-            override val converter : RenamedPartitionKeyConverter = RenamedPartitionKeyConverter
+            override val converter: RenamedPartitionKeyConverter = RenamedPartitionKeyConverter
             override val partitionKey: KeySpec<Number> = aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec.Number("user_id")
         }
             """.trimIndent(),

tests/codegen/smoke-tests/src/test/kotlin/aws/sdk/kotlin/test/codegen/smoketest/SmokeTestE2ETest.kt

@@ -34,8 +34,6 @@ class SmokeTestE2ETest {
 
         assertContains(smokeTestRunnerOutput, "not ok ExceptionService ExceptionTest - no error expected from service")
         assertContains(smokeTestRunnerOutput, "#aws.smithy.kotlin.runtime.http.interceptors.SmokeTestsFailureException: Smoke test failed with HTTP status code: 400")
-        assertContains(smokeTestRunnerOutput, "#\tat aws.smithy.kotlin.runtime.http.interceptors.SmokeTestsInterceptor.readBeforeDeserialization(SmokeTestsInterceptor.kt:19)")
-        assertContains(smokeTestRunnerOutput, "#\tat aws.smithy.kotlin.runtime.http.interceptors.InterceptorExecutor.readBeforeDeserialization(InterceptorExecutor.kt:252)")
     }
 
     @Test
@@ -72,6 +70,7 @@ private fun runSmokeTests(
             ":tests:codegen:smoke-tests:services:$service:smokeTest",
         )
         .withEnvironment(envVars)
+        .forwardOutput()
 
     val buildResult = if (expectingFailure) task.buildAndFail() else task.build()