feat: smoke tests

.github/workflows/continuous-integration.yml

@@ -70,6 +70,7 @@ jobs:
           ./gradlew :build-support:test
           ./gradlew publishToMavenLocal
           ./gradlew apiCheck
+          ./gradlew build
           ./gradlew test jvmTest
           ./gradlew testAllProtocols
       - name: Save Test Reports

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

@@ -11,7 +11,6 @@ import software.amazon.smithy.kotlin.codegen.model.hasTrait
 import software.amazon.smithy.kotlin.codegen.model.traits.FailedResponseTrait
 import software.amazon.smithy.kotlin.codegen.model.traits.SuccessResponseTrait
 import software.amazon.smithy.kotlin.codegen.rendering.GradleWriter
-import software.amazon.smithy.kotlin.codegen.utils.dq
 import software.amazon.smithy.kotlin.codegen.utils.operations
 import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.smoketests.traits.SmokeTestsTrait
@@ -83,10 +82,9 @@ class GradleGenerator : KotlinIntegration {
     }
 
     private fun generateSmokeTestConfig(writer: GradleWriter, sdkId: String, ctx: CodegenContext) {
-        val formattedDenyList = smokeTestDenyList.joinToString(",", "setOf(", ")") { it.dq() }
-        writer.withBlock("if (#S !in #L) {", "}", sdkId, formattedDenyList) {
+        if (sdkId !in smokeTestDenyList) {
             generateSmokeTestJarTask(writer, ctx)
-            emptyLine()
+            writer.emptyLine()
             generateSmokeTestTask(writer, ctx)
         }
     }
@@ -97,17 +95,18 @@ class GradleGenerator : KotlinIntegration {
     private fun generateSmokeTestJarTask(writer: GradleWriter, ctx: CodegenContext) {
         writer.withBlock("jvm {", "}") {
             withBlock("compilations {", "}") {
-                write("val runtimePath = configurations.getByName(#S).map { if (it.isDirectory) it else zipTree(it) }", "jvmRuntimeClasspath")
                 write("val mainPath = getByName(#S).output.classesDirs", "main")
                 write("val testPath = getByName(#S).output.classesDirs", "test")
                 withBlock("tasks {", "}") {
                     withBlock("register<Jar>(#S) {", "}", "smokeTestJar") {
                         write("description = #S", "Creates smoke tests jar")
                         write("group = #S", "application")
                         write("dependsOn(build)")
+                        write("mustRunAfter(build)")
                         withBlock("manifest {", "}") {
                             write("attributes[#S] = #S", "Main-Class", "${ctx.settings.pkg.name}.smoketests.SmokeTestsKt")
                         }
+                        write("val runtimePath = configurations.getByName(#S).map { if (it.isDirectory) it else zipTree(it) }", "jvmRuntimeClasspath")
                         write("duplicatesStrategy = DuplicatesStrategy.EXCLUDE")
                         write("from(runtimePath, mainPath, testPath)")
                         write("archiveBaseName.set(#S)", "\${project.name}-smoketests")
@@ -123,15 +122,19 @@ class GradleGenerator : KotlinIntegration {
     private fun generateSmokeTestTask(writer: GradleWriter, ctx: CodegenContext) {
         val hasSuccessResponseTrait = ctx.model.expectShape<ServiceShape>(ctx.settings.service).hasTrait(SuccessResponseTrait.ID)
         val hasFailedResponseTrait = ctx.model.expectShape<ServiceShape>(ctx.settings.service).hasTrait(FailedResponseTrait.ID)
-
-        // E2E tests don't have sdkVersion in jar names
         val inTestingEnvironment = hasFailedResponseTrait || hasSuccessResponseTrait
+
+        /**
+         * E2E tests don't have sdkVersion in jar names. They're added later for publishing.
+         * @see SmokeTestE2ETest
+         */
         val jarName = if (inTestingEnvironment) "\${project.name}-smoketests.jar" else "\${project.name}-smoketests-\$sdkVersion.jar"
 
         writer.withBlock("tasks.register<JavaExec>(#S) {", "}", "smokeTest") {
             write("description = #S", "Runs smoke tests jar")
             write("group = #S", "verification")
             write("dependsOn(tasks.getByName(#S))", "smokeTestJar")
+            write("mustRunAfter(tasks.getByName(#S))", "smokeTestJar")
             emptyLine()
             write("val sdkVersion: String by project")
             write("val jarFile = file(#S)", "build/libs/$jarName")

tests/codegen/smoke-tests/build.gradle.kts

@@ -7,35 +7,38 @@ import aws.sdk.kotlin.gradle.codegen.dsl.generateSmithyProjections
 import aws.sdk.kotlin.gradle.codegen.dsl.smithyKotlinPlugin
 import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionPath
 
-description = "Tests for smoke tests runner"
+description = "Tests for smoke tests runners"
+
 plugins {
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
     alias(libs.plugins.kotlin.jvm)
 }
 
 val projections = listOf(
-    ProjectionMetadata("successService", "smoke-tests-success.smithy", "com.test#SuccessService"),
-    ProjectionMetadata("failureService", "smoke-tests-failure.smithy", "com.test#FailureService"),
+    Projection("successService", "smoke-tests-success.smithy", "smithy.kotlin.traits#SuccessService"),
+    Projection("failureService", "smoke-tests-failure.smithy", "smithy.kotlin.traits#FailureService"),
 )
 
 configureProject()
-configureSmithyProjections()
+configureProjections()
 configureTasks()
 
 fun configureProject() {
     val codegen by configurations.getting
 
     dependencies {
         codegen(project(":codegen:aws-sdk-codegen"))
-        implementation(libs.smithy.kotlin.codegen)
         codegen(libs.smithy.cli)
         codegen(libs.smithy.model)
 
+        implementation(libs.smithy.kotlin.codegen)
+
         testImplementation(libs.kotlin.test)
+        testImplementation(gradleTestKit())
     }
 }
 
-fun configureSmithyProjections() {
+fun configureProjections() {
     smithyBuild {
         val pathToSmithyModels = "src/test/resources/"
 
@@ -94,19 +97,28 @@ fun configureTasks() {
         dependsOn(tasks.getByName("stageServices"))
     }
 
-    tasks.register<Exec>("unstageServices") {
-        commandLine("git", "clean", "-fdx", "services")
+    tasks.clean {
+        this@Build_gradle.projections.forEach { projection ->
+            delete("services/${projection.name}")
+        }
     }
 
-    tasks.clean {
-        dependsOn(tasks.getByName("unstageServices"))
+    tasks.withType<Test> {
+        testLogging {
+            events("passed", "skipped", "failed")
+            exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+            showExceptions = true
+            showCauses = true
+            showStackTraces = true
+        }
+        mustRunAfter(tasks.getByName("stageServices"))
     }
 }
 
 /**
  * Holds metadata about a smithy projection
  */
-data class ProjectionMetadata(
+data class Projection(
     val name: String,
     val modelFile: String,
     val serviceShapeId: String,

tests/codegen/smoke-tests/src/test/kotlin/SmokeTestE2ETest.kt

@@ -1,3 +1,4 @@
+import org.gradle.testkit.runner.GradleRunner
 import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SERVICE_FILTER
 import software.amazon.smithy.kotlin.codegen.rendering.smoketests.SKIP_TAGS
 import java.io.File
@@ -40,24 +41,11 @@ class SmokeTestE2ETest {
 
 private fun runSmokeTests(service: String, envVars: Map<String, String> = emptyMap()): String {
     val sdkRootDir = System.getProperty("user.dir") + "/../../../"
+    val runner = GradleRunner.create()
+        .withProjectDir(File(sdkRootDir))
+        .withArguments(":tests:codegen:smoke-tests:services:$service:smokeTest")
+        .withEnvironment(envVars)
+        .build()
 
-    val output = StringBuilder()
-    val smokeTests = ProcessBuilder()
-        .command("./gradlew", ":tests:codegen:smoke-tests:services:$service:smokeTest")
-        .directory(File(sdkRootDir))
-        .redirectErrorStream(true)
-
-    envVars.forEach { (key, value) ->
-        smokeTests
-            .environment()
-            .put(key, value)
-    }
-
-    smokeTests
-        .start()
-        .inputStream
-        .bufferedReader()
-        .forEachLine { output.append("$it\n") }
-
-    return output.toString()
+    return runner.output
 }

tests/codegen/smoke-tests/src/test/resources/smoke-tests-failure.smithy

@@ -1,5 +1,5 @@
 $version: "2"
-namespace com.test
+namespace smithy.kotlin.traits
 
 use aws.protocols#awsJson1_0
 use aws.api#service

tests/codegen/smoke-tests/src/test/resources/smoke-tests-success.smithy

@@ -1,5 +1,5 @@
 $version: "2"
-namespace com.test
+namespace smithy.kotlin.traits
 
 use aws.protocols#awsJson1_0
 use aws.api#service