kn: merge from main

.brazil.json

@@ -11,27 +11,40 @@
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
     "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",
-    "org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.*": "KotlinxDatetimeJvm-0.x"
+    "org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.*": "KotlinxDatetimeJvm-0.x",
+
+    "software.amazon.smithy:smithy-aws-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-traits-1.x",
+    "software.amazon.smithy:smithy-aws-iam-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-iam-traits-1.x",
+    "software.amazon.smithy:smithy-aws-cloudformation-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-cloudformation-traits-1.x",
+    "software.amazon.smithy:smithy-protocol-test-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-test-traits-1.x",
+    "software.amazon.smithy:smithy-protocol-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-traits-1.x",
+    "software.amazon.smithy:smithy-aws-endpoints:1.*": "Maven-software-amazon-smithy_smithy-aws-endpoints-1.x",
+    "software.amazon.smithy:smithy-codegen-core:1.*": "Maven-software-amazon-smithy_smithy-codegen-core-1.x",
+    "software.amazon.smithy:smithy-waiters:1.*": "Maven-software-amazon-smithy_smithy-waiters-1.x",
+    "software.amazon.smithy:smithy-rules-engine:1.*": "Maven-software-amazon-smithy_smithy-rules-engine-1.x",
+    "software.amazon.smithy:smithy-smoke-test-traits:1.*": "Maven-software-amazon-smithy_smithy-smoke-test-traits-1.x",
+    "org.jsoup:jsoup:1.19.*": "Maven-jsoup-1.19.x"
   },
   "packageHandlingRules": {
     "versioning": {
       "defaultVersionLayout": "{MAJOR}.0.x",
       "overrides": {
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.{MINOR}.x",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils": "{MAJOR}.{MINOR}.x"
+        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "{MAJOR}.x",
+        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.x"
       }
     },
     "rename": {
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "SmithyKotlinCodegen",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils": "SmithyKotlinCodegenTestUtils"
+        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "AwsSmithyAwsKotlinCodegen",
+        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "AwsSmithyKotlinCodegen"
     },
     "ignore": [
       "aws.smithy.kotlin:http-test",
       "aws.smithy.kotlin:smithy-test",
       "aws.smithy.kotlin:telemetry-provider-micrometer",
       "aws.smithy.kotlin:testing",
       "aws.smithy.kotlin:bom",
-      "aws.smithy.kotlin:version-catalog"
+      "aws.smithy.kotlin:version-catalog",
+      "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
     ],
     "resolvesConflictDependencies": {
       "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [

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

@@ -65,55 +65,7 @@ jobs:
         run: ./gradlew analyzeArtifactSizeMetrics
 
       - name: Show Results
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const getComments = 
-              `query { 
-                repository(owner:"${context.repo.owner}", name:"${context.repo.repo}"){
-                  pullRequest(number: ${context.issue.number}) {
-                    id
-                    comments(last:100) {
-                      nodes {
-                        id
-                        body
-                        author {
-                          login
-                        }
-                        isMinimized
-                      }
-                    }
-                  }
-                } 
-              }`
-
-            const response = await github.graphql(getComments)
-            const comments = response.repository.pullRequest.comments.nodes
-
-            const mutations = comments
-              .filter(comment => comment.author.login == 'github-actions' && !comment.isMinimized && comment.body.startsWith('Affected Artifacts'))
-              .map(comment =>
-                github.graphql(
-                  `mutation {
-                    minimizeComment(input:{subjectId:"${comment.id}", classifier:OUTDATED}){
-                      clientMutationId
-                    }
-                  }`
-                )
-              )
-            await Promise.all(mutations)
-
-            const fs = require('node:fs')
-            const comment = fs.readFileSync('build/reports/metrics/artifact-analysis.md', 'utf8')
-
-            const writeComment = 
-              `mutation {
-                addComment(input:{body:"""${comment}""", subjectId:"${response.repository.pullRequest.id}"}){
-                  clientMutationId
-                }
-              }`
-
-            await github.graphql(writeComment)
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/show-results@main
 
       - name: Evaluate
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }}

.github/workflows/merge-main.yml

@@ -1,11 +1,11 @@
 name: Merge main
 on:
-  schedule:
-    - cron: "0 7 * * 1-5"  # At 07:00 UTC (00:00 PST, 03:00 EST), Monday through Friday
+  push:
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:
-  test:
+  merge:
     runs-on: ubuntu-latest
     steps:
       - name: Merge main

.github/workflows/sync-mirror.yml

@@ -0,0 +1,20 @@
+name: Sync Mirror
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  git-sync:
+    # Only sync when pushing to source repo
+    if: github.repository == 'smithy-lang/smithy-kotlin'
+    runs-on: ubuntu-latest
+    steps:
+      - name: git-sync
+        uses: wei/git-sync@v3
+        with:
+          source_repo: "https://aws-sdk-kotlin-ci:${{ secrets.CI_USER_PAT }}@github.com/smithy-lang/smithy-kotlin.git"
+          source_branch: "main"
+          destination_repo: "https://aws-sdk-kotlin-ci:${{ secrets.CI_USER_PAT }}@github.com/smithy-lang/private-smithy-kotlin-staging.git"
+          destination_branch: "main"

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.4.13] - 04/10/2025
+
+## [1.4.12] - 04/04/2025
+
 ## [1.4.11] - 03/14/2025
 
 ## [1.4.10] - 03/06/2025

codegen/smithy-aws-kotlin-codegen/build.gradle.kts

@@ -13,15 +13,11 @@ plugins {
 }
 
 val codegenVersion: String by project
-description = "Codegen support for AWS protocols"
+description = "Smithy codegen support for AWS protocols"
 group = "software.amazon.smithy.kotlin"
 version = codegenVersion
 
-val sdkVersion: String by project
-
 dependencies {
-
-    implementation(libs.kotlin.stdlib.jdk8)
     api(project(":codegen:smithy-kotlin-codegen"))
 
     api(libs.smithy.aws.traits)

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt

@@ -115,6 +115,7 @@ object RuntimeTypes {
         }
 
         object SmokeTests : RuntimeTypePackage(KotlinDependency.CORE, "smoketests") {
+            val DefaultPrinter = symbol("DefaultPrinter")
             val exitProcess = symbol("exitProcess")
             val printExceptionStackTrace = symbol("printExceptionStackTrace")
             val SmokeTestsException = symbol("SmokeTestsException")

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/KotlinTypes.kt

@@ -109,6 +109,7 @@ object KotlinTypes {
     }
 
     object Text : RuntimeTypePackage(KotlinDependency.KOTLIN_STDLIB, "text") {
+        val Appendable = stdlibSymbol("Appendable")
         val encodeToByteArray = stdlibSymbol("encodeToByteArray")
     }
 

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt

@@ -4,6 +4,7 @@ import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.integration.SectionId
 import software.amazon.smithy.kotlin.codegen.integration.SectionKey
+import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
 import software.amazon.smithy.kotlin.codegen.model.getTrait
 import software.amazon.smithy.kotlin.codegen.model.hasTrait
 import software.amazon.smithy.kotlin.codegen.rendering.ShapeValueGenerator
@@ -17,8 +18,8 @@ import software.amazon.smithy.kotlin.codegen.rendering.util.format
 import software.amazon.smithy.kotlin.codegen.utils.dq
 import software.amazon.smithy.kotlin.codegen.utils.toCamelCase
 import software.amazon.smithy.kotlin.codegen.utils.topDownOperations
-import software.amazon.smithy.model.node.*
-import software.amazon.smithy.model.shapes.*
+import software.amazon.smithy.model.node.Node
+import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.smoketests.traits.SmokeTestCase
 import software.amazon.smithy.smoketests.traits.SmokeTestsTrait
 import kotlin.jvm.optionals.getOrNull
@@ -61,25 +62,47 @@ class SmokeTestsRunnerGenerator(
 ) {
     internal fun render() {
         writer.declareSection(SmokeTestSectionIds.SmokeTestsFile) {
-            writer.write("private var exitCode = 0")
+            write("")
+
+            withBlock("public suspend fun main() {", "}") {
+                write("val success = SmokeTestRunner().runAllTests()")
+                withBlock("if (!success) {", "}") {
+                    write("#T(1)", RuntimeTypes.Core.SmokeTests.exitProcess)
+                }
+            }
+            write("")
+            renderRunnerClass()
+        }
+    }
+
+    private fun renderRunnerClass() {
+        writer.withBlock(
+            "public class SmokeTestRunner(private val platform: #1T = #1T.System, private val printer: #2T = #3T) {",
+            "}",
+            RuntimeTypes.Core.Utils.PlatformProvider,
+            KotlinTypes.Text.Appendable,
+            RuntimeTypes.Core.SmokeTests.DefaultPrinter,
+        ) {
             renderEnvironmentVariables()
-            writer.declareSection(SmokeTestSectionIds.AdditionalEnvironmentVariables)
-            writer.write("")
-            writer.withBlock("public suspend fun main() {", "}") {
-                renderFunctionCalls()
-                write("#T(exitCode)", RuntimeTypes.Core.SmokeTests.exitProcess)
+            declareSection(SmokeTestSectionIds.AdditionalEnvironmentVariables)
+            write("")
+
+            withBlock("public suspend fun runAllTests(): Boolean =", "") {
+                withBlock("listOf<suspend () -> Boolean>(", ")") {
+                    renderFunctionReferences()
+                }
+                indent()
+                write(".map { it() }")
+                write(".all { it }")
+                dedent()
             }
-            writer.write("")
             renderFunctions()
         }
     }
 
     private fun renderEnvironmentVariables() {
         // Skip tags
-        writer.writeInline(
-            "private val skipTags = #T.System.getenv(",
-            RuntimeTypes.Core.Utils.PlatformProvider,
-        )
+        writer.writeInline("private val skipTags = platform.getenv(")
         writer.declareSection(SmokeTestSectionIds.SkipTags) {
             writer.writeInline("#S", SKIP_TAGS)
         }
@@ -89,10 +112,7 @@ class SmokeTestsRunnerGenerator(
         )
 
         // Service filter
-        writer.writeInline(
-            "private val serviceFilter = #T.System.getenv(",
-            RuntimeTypes.Core.Utils.PlatformProvider,
-        )
+        writer.writeInline("private val serviceFilter = platform.getenv(")
         writer.declareSection(SmokeTestSectionIds.ServiceFilter) {
             writer.writeInline("#S", SERVICE_FILTER)
         }
@@ -102,10 +122,10 @@ class SmokeTestsRunnerGenerator(
         )
     }
 
-    private fun renderFunctionCalls() {
+    private fun renderFunctionReferences() {
         operations.forEach { operation ->
             operation.getTrait<SmokeTestsTrait>()?.testCases?.forEach { testCase ->
-                writer.write("${testCase.functionName}()")
+                writer.write("::${testCase.functionName},")
             }
         }
     }
@@ -120,7 +140,7 @@ class SmokeTestsRunnerGenerator(
     }
 
     private fun renderFunction(operation: OperationShape, testCase: SmokeTestCase) {
-        writer.withBlock("private suspend fun ${testCase.functionName}() {", "}") {
+        writer.withBlock("private suspend fun ${testCase.functionName}(): Boolean {", "}") {
             write("val tags = setOf<String>(${testCase.tags.joinToString(",") { it.dq()} })")
             writer.withBlock("if ((serviceFilter.isNotEmpty() && #S !in serviceFilter) || tags.any { it in skipTags }) {", "}", sdkId) {
                 printTestResult(
@@ -131,10 +151,10 @@ class SmokeTestsRunnerGenerator(
                     "ok",
                     "# skip",
                 )
-                writer.write("return")
+                writer.write("return true")
             }
             write("")
-            withInlineBlock("try {", "} ") {
+            withInlineBlock("return try {", "} ") {
                 renderTestCase(operation, testCase)
             }
             withBlock("catch (exception: Exception) {", "}") {
@@ -149,6 +169,8 @@ class SmokeTestsRunnerGenerator(
             closeAndOpenBlock("}.#T { client ->", RuntimeTypes.Core.IO.use)
             renderOperation(operation, testCase)
         }
+        writer.write("")
+        writer.write("error(#S)", "Unexpectedly completed smoke test operation without throwing exception")
     }
 
     private fun renderClientConfig(testCase: SmokeTestCase) {
@@ -212,9 +234,11 @@ class SmokeTestsRunnerGenerator(
         )
 
         writer.withBlock("if (!success) {", "}") {
-            write("#T(exception)", RuntimeTypes.Core.SmokeTests.printExceptionStackTrace)
-            write("exitCode = 1")
+            write("printer.appendLine(exception.stackTraceToString().prependIndent(#S))", "# ")
         }
+
+        writer.write("")
+        writer.write("success")
     }
 
     // Helpers
@@ -241,7 +265,7 @@ class SmokeTestsRunnerGenerator(
         val expectation = if (errorExpected) "error expected from service" else "no error expected from service"
         val status = statusOverride ?: "\$status"
         val testResult = "$status $service $testCase - $expectation $directive"
-        writer.write("println(#S)", testResult)
+        writer.write("printer.appendLine(#S)", testResult)
     }
 
     /**
@@ -250,18 +274,6 @@ class SmokeTestsRunnerGenerator(
     private val SmokeTestCase.functionName: String
         get() = this.id.toCamelCase()
 
-    /**
-     * Get the operation parameters for a [SmokeTestCase]
-     */
-    private val SmokeTestCase.operationParameters: Map<StringNode, Node>
-        get() = this.params.get().members
-
-    /**
-     * Checks if there are operation parameters for a [SmokeTestCase]
-     */
-    private val SmokeTestCase.hasOperationParameters: Boolean
-        get() = this.params.isPresent
-
     /**
      * Check if a [SmokeTestCase] is expecting a specific error
      */