client-tests work

Author: david-perez

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/testutil/ClientCodegenIntegrationTest.kt

@@ -0,0 +1,56 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.rust.codegen.client.testutil
+
+import software.amazon.smithy.build.PluginContext
+import software.amazon.smithy.build.SmithyBuildPlugin
+import software.amazon.smithy.model.Model
+import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext
+import software.amazon.smithy.rust.codegen.client.smithy.RustClientCodegenPlugin
+import software.amazon.smithy.rust.codegen.client.smithy.customize.ClientCodegenDecorator
+import software.amazon.smithy.rust.codegen.core.smithy.RustCrate
+import software.amazon.smithy.rust.codegen.core.testutil.IntegrationTestParams
+import software.amazon.smithy.rust.codegen.core.testutil.codegenIntegrationTest
+import java.nio.file.Path
+
+fun clientIntegrationTest(
+    model: Model,
+    params: IntegrationTestParams = IntegrationTestParams(),
+    additionalDecorators: List<ClientCodegenDecorator> = listOf(),
+    test: (ClientCodegenContext, RustCrate) -> Unit = { _, _ -> },
+): Path {
+    fun invokeRustCodegenPlugin(ctx: PluginContext) {
+        val codegenDecorator = object : ClientCodegenDecorator {
+            override val name: String = "Add tests"
+            override val order: Byte = 0
+
+            override fun classpathDiscoverable(): Boolean = false
+
+            override fun extras(codegenContext: ClientCodegenContext, rustCrate: RustCrate) {
+                test(codegenContext, rustCrate)
+            }
+        }
+        RustClientCodegenPlugin().executeWithDecorator(ctx, codegenDecorator, *additionalDecorators.toTypedArray())
+    }
+    return codegenIntegrationTest(model, params, invokePlugin = ::invokeRustCodegenPlugin)
+}
+
+/**
+ * A `SmithyBuildPlugin` that accepts an additional decorator.
+ *
+ * This exists to allow tests to easily customize the _real_ build without needing to list out customizations
+ * or attempt to manually discover them from the path.
+ */
+abstract class DecoratableBuildPlugin : SmithyBuildPlugin {
+    abstract fun executeWithDecorator(
+        context: PluginContext,
+        vararg decorator: ClientCodegenDecorator,
+    )
+
+    override fun execute(context: PluginContext) {
+        executeWithDecorator(context)
+    }
+}

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/testutil/CodegenIntegrationTest.kt

@@ -19,6 +19,7 @@ import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
 import software.amazon.smithy.rust.codegen.core.rustlang.writable
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType
+import software.amazon.smithy.rust.codegen.core.testutil.IntegrationTestParams
 import software.amazon.smithy.rust.codegen.core.testutil.asSmithyModel
 import software.amazon.smithy.rust.codegen.core.testutil.integrationTest
 
@@ -170,8 +171,8 @@ internal class HttpVersionListGeneratorTest {
 
         clientIntegrationTest(
             model,
-            listOf(FakeSigningDecorator()),
-            addModuleToEventStreamAllowList = true,
+            IntegrationTestParams(addModuleToEventStreamAllowList = true),
+            additionalDecorators = listOf(FakeSigningDecorator()),
         ) { clientCodegenContext, rustCrate ->
             val moduleName = clientCodegenContext.moduleUseName()
             rustCrate.integrationTest("validate_eventstream_http") {

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/customizations/HttpVersionListGeneratorTest.kt

@@ -11,6 +11,7 @@ import org.junit.jupiter.api.Test
 import software.amazon.smithy.rust.codegen.client.testutil.clientIntegrationTest
 import software.amazon.smithy.rust.codegen.core.rustlang.Attribute
 import software.amazon.smithy.rust.codegen.core.rustlang.rust
+import software.amazon.smithy.rust.codegen.core.testutil.IntegrationTestParams
 import software.amazon.smithy.rust.codegen.core.testutil.asSmithyModel
 import software.amazon.smithy.rust.codegen.core.testutil.integrationTest
 import software.amazon.smithy.rust.codegen.core.testutil.runWithWarnings
@@ -123,8 +124,8 @@ class EndpointsDecoratorTest {
     fun `set an endpoint in the property bag`() {
         val testDir = clientIntegrationTest(
             model,
-            // just run integration tests
-            command = { "cargo test --test *".runWithWarnings(it) },
+            // Just run integration tests.
+            IntegrationTestParams(command = { "cargo test --test *".runWithWarnings(it) }),
         ) { clientCodegenContext, rustCrate ->
             rustCrate.integrationTest("endpoint_params_test") {
                 val moduleName = clientCodegenContext.moduleUseName()

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/endpoint/EndpointsDecoratorTest.kt

@@ -481,7 +481,7 @@ class RustWriter private constructor(
      * Callers must take care to use [this] when writing to ensure code is written to the right place:
      * ```kotlin
      * val writer = RustWriter.forModule("model")
-     * writer.withModule(RustModule.public("nested")) {
+     * writer.withInlineModule(RustModule.public("nested")) {
      *   Generator(...).render(this) // GOOD
      *   Generator(...).render(writer) // WRONG!
      * }

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/rustlang/RustWriter.kt

@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.rust.codegen.core.testutil
+
+import software.amazon.smithy.build.PluginContext
+import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.node.ObjectNode
+import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
+import software.amazon.smithy.rust.codegen.core.util.runCommand
+import java.io.File
+import java.nio.file.Path
+
+/**
+ * A helper class holding common data with defaults that is threaded through several functions, to make their
+ * signatures shorter.
+ */
+data class IntegrationTestParams(
+    val addModuleToEventStreamAllowList: Boolean = false,
+    val service: String? = null,
+    val runtimeConfig: RuntimeConfig? = null,
+    val additionalSettings: ObjectNode = ObjectNode.builder().build(),
+    val overrideTestDir: File? = null,
+    val command: ((Path) -> Unit)? = null,
+)
+
+/**
+ * Run cargo test on a true, end-to-end, codegen product of a given model.
+ */
+fun codegenIntegrationTest(model: Model, params: IntegrationTestParams, invokePlugin: (PluginContext) -> Unit): Path {
+    val (ctx, testDir) = generatePluginContext(
+        model,
+        params.additionalSettings,
+        params.addModuleToEventStreamAllowList,
+        params.service,
+        params.runtimeConfig,
+        params.overrideTestDir,
+    )
+    invokePlugin(ctx)
+    ctx.fileManifest.printGeneratedFiles()
+    params.command?.invoke(testDir) ?: "cargo test".runCommand(testDir, environment = mapOf("RUSTFLAGS" to "-D warnings"))
+    return testDir
+}

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil/CodegenIntegrationTest.kt

@@ -0,0 +1,10 @@
+package software.amazon.smithy.rust.codegen.server.smithy.customizations
+
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+
+internal class CustomValidationExceptionWithReasonDecoratorTest {
+    @Test
+    fun `constrained model with the CustomValidationExceptionWithReasonDecorator applied compiles`() {
+    }
+}