Run smoke tests in common

Author: 0marperez

.gitignore

@@ -17,8 +17,6 @@ local.properties
 
 # ignore generated files
 services/*/generated-src
-services/*/generated-src-jvm
 services/*/build.gradle.kts
 tests/codegen/smoke-tests/services/*/generated-src
-tests/codegen/smoke-tests/services/*/generated-src-jvm
 tests/codegen/smoke-tests/services/*/build.gradle.kts

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

@@ -4,13 +4,13 @@
  */
 package aws.sdk.kotlin.codegen
 
+import aws.sdk.kotlin.codegen.model.traits.FailedResponseTrait
+import aws.sdk.kotlin.codegen.model.traits.SuccessResponseTrait
 import aws.sdk.kotlin.codegen.smoketests.smokeTestDenyList
 import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.model.expectShape
 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.topDownOperations
 import software.amazon.smithy.model.shapes.ServiceShape

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/model/traits/SmokeTestTraits.kt

@@ -0,0 +1,23 @@
+package aws.sdk.kotlin.codegen.model.traits
+
+import software.amazon.smithy.model.node.ObjectNode
+import software.amazon.smithy.model.shapes.ShapeId
+import software.amazon.smithy.model.traits.AnnotationTrait
+
+/**
+ * Indicates the annotated service should always return a failed response.
+ */
+class FailedResponseTrait(node: ObjectNode) : AnnotationTrait(ID, node) {
+    companion object {
+        val ID: ShapeId = ShapeId.from("smithy.kotlin.traits#failedResponseTrait")
+    }
+}
+
+/**
+ * Indicates the annotated service should always return a success response.
+ */
+class SuccessResponseTrait(node: ObjectNode) : AnnotationTrait(ID, node) {
+    companion object {
+        val ID: ShapeId = ShapeId.from("smithy.kotlin.traits#successResponseTrait")
+    }
+}

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestFailHttpEngineIntegration.kt

@@ -1,5 +1,7 @@
 package aws.sdk.kotlin.codegen.smoketests
 
+import aws.sdk.kotlin.codegen.model.traits.FailedResponseTrait
+import aws.sdk.kotlin.codegen.model.traits.SuccessResponseTrait
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
 import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
 import software.amazon.smithy.kotlin.codegen.core.withBlock
@@ -8,8 +10,6 @@ import software.amazon.smithy.kotlin.codegen.integration.SectionWriter
 import software.amazon.smithy.kotlin.codegen.integration.SectionWriterBinding
 import software.amazon.smithy.kotlin.codegen.model.expectShape
 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.smoketests.SmokeTestHttpEngineOverride
 import software.amazon.smithy.kotlin.codegen.utils.topDownOperations
 import software.amazon.smithy.model.Model

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/smoketests/SmokeTestSuccessHttpEngineIntegration.kt

@@ -1,14 +1,14 @@
 package aws.sdk.kotlin.codegen.smoketests
 
+import aws.sdk.kotlin.codegen.model.traits.FailedResponseTrait
+import aws.sdk.kotlin.codegen.model.traits.SuccessResponseTrait
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
 import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.integration.SectionWriter
 import software.amazon.smithy.kotlin.codegen.integration.SectionWriterBinding
 import software.amazon.smithy.kotlin.codegen.model.expectShape
 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.smoketests.SmokeTestHttpEngineOverride
 import software.amazon.smithy.kotlin.codegen.utils.topDownOperations
 import software.amazon.smithy.model.Model

codegen/sdk/build.gradle.kts

@@ -176,10 +176,6 @@ val stageSdks = tasks.register("stageSdks") {
                 from("$projectionOutputDir/src")
                 into("${it.destinationDir}/generated-src")
             }
-            copy {
-                from("$projectionOutputDir/jvm-src")
-                into("${it.destinationDir}/generated-src-jvm")
-            }
             copy {
                 from("$projectionOutputDir/build.gradle.kts")
                 into(it.destinationDir)

services/build.gradle.kts

@@ -50,10 +50,6 @@ subprojects {
                 kotlin.srcDir("generated-src/main/kotlin")
             }
 
-            getByName("jvmTest") {
-                kotlin.srcDir("generated-src-jvm/test/java")
-            }
-
             getByName("commonTest") {
                 kotlin.srcDir("generated-src/test")
 

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

@@ -47,7 +47,7 @@ fun configureProjections() {
                 imports = listOf(layout.projectDirectory.file(pathToSmithyModels + projection.modelFile).asFile.absolutePath)
                 smithyKotlinPlugin {
                     serviceShapeId = projection.serviceShapeId
-                    packageName = "aws.sdk.kotlin.test.smoketests"
+                    packageName = "aws.sdk.kotlin.test"
                     packageVersion = "1.0"
                     buildSettings {
                         generateFullProject = false
@@ -81,10 +81,6 @@ fun configureTasks() {
                     from("$projectionPath/src")
                     into("$destinationPath/generated-src")
                 }
-                copy {
-                    from("$projectionPath/jvm-src")
-                    into("$destinationPath/generated-src-jvm")
-                }
                 copy {
                     from("$projectionPath/build.gradle.kts")
                     into(destinationPath)

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

@@ -28,8 +28,8 @@ subprojects {
                 kotlin.srcDir("generated-src/main/kotlin")
             }
 
-            jvmTest {
-                kotlin.srcDir("generated-src-jvm/test/java")
+            commonTest {
+                kotlin.srcDir("generated-src/test/kotlin")
             }
         }
     }