Merge branch 'main' of github.com:smithy-lang/smithy-kotlin into configure-executorService

Author: lauzadis

.changes/08deb04f-bc93-4d3c-aa2f-d46b2dcce775.json

@@ -0,0 +1,5 @@
+{
+    "id": "08deb04f-bc93-4d3c-aa2f-d46b2dcce775",
+    "type": "feature",
+    "description": "Support enums and int enums as event headers"
+}

.github/workflows/artifact-size-metrics.yml

@@ -90,13 +90,15 @@ jobs:
             WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
             WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
 
-  # macos-14 build and test for targets: jvm, macoArm64, iosSimulatorArm64, watchosSimulatorArm65, tvosSimulatorArm64
-  # macos-13 build and test for targets: jvm, macoX64, iosX64, tvosX64, watchosX64
+  # macOS ARM images build and test for targets: jvm, macosArm64, iosSimulatorArm64, watchosSimulatorArm65, tvosSimulatorArm64
+  # macos x64 images build and test for targets: jvm, macosX64, iosX64, tvosX64, watchosX64
   macos:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14, macos-13]
+        os:
+          - macos-15-large  # x64
+          - macos-15-xlarge # ARM
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
@@ -111,6 +113,17 @@ jobs:
         working-directory: ./smithy-kotlin
         shell: bash
         run: |
+          # Bump memory profile for Kotlin daemon
+          cat gradle.properties \
+              | sed -r 's/-Xmx[0-9]+G/-Xmx6G/g' \
+              | sed -r 's/-XX:MaxMetaspaceSize=[0-9]+G/-XX:MaxMetaspaceSize=2G/g' \
+              > gradle.properties2
+          mv gradle.properties2 gradle.properties
+
+          echo "Modified gradle.properties:"
+          cat gradle.properties
+          echo ""
+
           # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
           # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties              
           ./gradlew apiCheck
@@ -369,7 +382,7 @@ jobs:
       run: |
         # TODO - JVM only
         cd $GITHUB_WORKSPACE/smithy-kotlin
-        ./gradlew --parallel -Paws.kotlin.native=false publishToMavenLocal
+        ./gradlew -Paws.kotlin.native=false publishToMavenLocal
         SMITHY_KOTLIN_RUNTIME_VERSION=$(grep sdkVersion= gradle.properties | cut -d = -f 2)
         SMITHY_KOTLIN_CODEGEN_VERSION=$(grep codegenVersion= gradle.properties | cut -d = -f 2)
         cd $GITHUB_WORKSPACE/aws-sdk-kotlin
@@ -380,7 +393,7 @@ jobs:
         # smithy-kotlin should be
         sed -i "s/smithy-kotlin-runtime-version = .*$/smithy-kotlin-runtime-version = \"$SMITHY_KOTLIN_RUNTIME_VERSION\"/" gradle/libs.versions.toml
         sed -i "s/smithy-kotlin-codegen-version = .*$/smithy-kotlin-codegen-version = \"$SMITHY_KOTLIN_CODEGEN_VERSION\"/" gradle/libs.versions.toml
-        ./gradlew --parallel -Paws.kotlin.native=false publishToMavenLocal
+        ./gradlew -Paws.kotlin.native=false publishToMavenLocal
         ./gradlew -Paws.kotlin.native=false test jvmTest
         ./gradlew -Paws.kotlin.native=false testAllProtocols
     - name: Calculate duration

.github/workflows/continuous-integration.yml

@@ -0,0 +1,40 @@
+name: Pull request metrics
+on:
+  pull_request:
+
+jobs:
+  artifact-size-metrics:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+
+      - name: Build
+        shell: bash
+        run: |
+          ./gradlew build --parallel
+          ./gradlew publishAllPublicationsToTestLocalRepository --parallel
+
+      - name: Calculate metrics
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/calculate-and-upload@main
+        with:
+          upload: 'false'
+          release_metrics: 'false'
+
+      - name: Configure credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
+          aws-region: us-west-2
+
+      - name: Process metrics
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/download-and-process@main
+        with:
+          download: 'false'
+
+permissions:
+  id-token: write
+  contents: read

.github/workflows/pull-request-metrics.yml

@@ -0,0 +1,37 @@
+name: Release metrics
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  artifact-size-metrics:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+
+      - name: Build
+        shell: bash
+        run: |
+          ./gradlew build --parallel
+          ./gradlew publishAllPublicationsToTestLocalRepository --parallel
+
+      - name: Configure credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
+          aws-region: us-west-2
+
+      - name: Calculate and upload metrics
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/calculate-and-upload@main
+        with:
+          upload: 'true'
+          release_metrics: 'true'
+
+permissions:
+  id-token: write
+  contents: read

.github/workflows/release-metrics.yml

@@ -11,6 +11,7 @@ jobs:
   cleanup:
     name: Stale issue job
     runs-on: ubuntu-latest
+    if: github.repository == 'smithy-lang/smithy-kotlin'
     steps:
     - uses: aws-actions/stale-issue-cleanup@v4
       with:
@@ -54,4 +55,4 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         loglevel: DEBUG
         # Set dry-run to true to not perform label or close actions.
-        #dry-run: true
+        #dry-run: true

.github/workflows/stale_issue.yaml

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.5.15] - 10/17/2025
+
+### Fixes
+* fix: code-generate structure members more safely to avoid conflicts with package names
+
 ## [1.5.14] - 10/03/2025
 
 ### Features

CHANGELOG.md

@@ -41,19 +41,12 @@ buildscript {
 plugins {
     `dokka-convention`
     alias(libs.plugins.kotlinx.binary.compatibility.validator)
-    alias(libs.plugins.aws.kotlin.repo.tools.artifactsizemetrics)
     // ensure the correct version of KGP ends up on our buildscript classpath
     // since build-plugins also has <some> version in its dependency closure
     id(libs.plugins.kotlin.multiplatform.get().pluginId) apply false
     id(libs.plugins.kotlin.jvm.get().pluginId) apply false
 }
 
-artifactSizeMetrics {
-    artifactPrefixes = setOf(":runtime")
-    significantChangeThresholdPercentage = 5.0
-    projectRepositoryName = "smithy-kotlin"
-}
-
 val testJavaVersion = typedProp<String>("test.java.version")?.let {
     JavaLanguageVersion.of(it)
 }?.also {

build.gradle.kts

@@ -13,7 +13,7 @@
     ],
     "build_dir": "target/build",
     "build_steps": [
-        "{gradlew} assemble --parallel" 
+        "{gradlew} assemble"
     ],
     "post_build_steps": [
         "{gradlew} publishToMavenLocal" 

builder.json

@@ -147,7 +147,7 @@ class EventStreamParserGenerator(
                 val target = ctx.model.expectShape(hdrBinding.target)
                 val targetSymbol = ctx.symbolProvider.toSymbol(target)
 
-                // :test(boolean, byte, short, integer, long, blob, string, timestamp))
+                // :test(boolean, byte, short, integer, long, blob, string, timestamp, enum, int enum))
                 val conversionFn = when (target.type) {
                     ShapeType.BOOLEAN -> RuntimeTypes.AwsEventStream.expectBool
                     ShapeType.BYTE -> RuntimeTypes.AwsEventStream.expectByte
@@ -157,6 +157,8 @@ class EventStreamParserGenerator(
                     ShapeType.BLOB -> RuntimeTypes.AwsEventStream.expectByteArray
                     ShapeType.STRING -> RuntimeTypes.AwsEventStream.expectString
                     ShapeType.TIMESTAMP -> RuntimeTypes.AwsEventStream.expectTimestamp
+                    ShapeType.ENUM -> RuntimeTypes.AwsEventStream.expectEnumValue
+                    ShapeType.INT_ENUM -> RuntimeTypes.AwsEventStream.expectIntEnumValue
                     else -> throw CodegenException("unsupported eventHeader shape: member=$hdrBinding; targetShape=$target")
                 }
 
@@ -165,7 +167,24 @@ class EventStreamParserGenerator(
                 } else {
                     ""
                 }
-                writer.write("eb.#L = message.headers.find { it.name == #S }?.value?.#T()$defaultValuePostfix", hdrBinding.defaultName(), hdrBinding.memberName, conversionFn)
+
+                when (target.type) {
+                    ShapeType.ENUM, ShapeType.INT_ENUM ->
+                        writer.write(
+                            "eb.#L = message.headers.find { it.name == #S }?.value?.#T(#T::fromValue)$defaultValuePostfix",
+                            hdrBinding.defaultName(),
+                            hdrBinding.memberName,
+                            conversionFn,
+                            targetSymbol,
+                        )
+                    else ->
+                        writer.write(
+                            "eb.#L = message.headers.find { it.name == #S }?.value?.#T()$defaultValuePostfix",
+                            hdrBinding.defaultName(),
+                            hdrBinding.memberName,
+                            conversionFn,
+                        )
+                }
             }
 
             if (eventPayloadBinding != null) {