Server codegen integration test works

Author: david-perez

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

@@ -16,7 +16,7 @@ import software.amazon.smithy.rust.codegen.client.smithy.customize.NoOpEventStre
 import software.amazon.smithy.rust.codegen.client.smithy.customize.RequiredCustomizations
 import software.amazon.smithy.rust.codegen.client.smithy.endpoint.EndpointsDecorator
 import software.amazon.smithy.rust.codegen.client.smithy.generators.client.FluentClientDecorator
-import software.amazon.smithy.rust.codegen.client.testutil.DecoratableBuildPlugin
+import software.amazon.smithy.rust.codegen.client.testutil.ClientDecoratableBuildPlugin
 import software.amazon.smithy.rust.codegen.core.rustlang.Attribute.Companion.NonExhaustive
 import software.amazon.smithy.rust.codegen.core.rustlang.RustReservedWordSymbolProvider
 import software.amazon.smithy.rust.codegen.core.smithy.BaseSymbolMetadataProvider
@@ -36,7 +36,7 @@ import java.util.logging.Logger
  * `resources/META-INF.services/software.amazon.smithy.build.SmithyBuildPlugin` refers to this class by name which
  * enables the smithy-build plugin to invoke `execute` with all Smithy plugin context + models.
  */
-class RustClientCodegenPlugin : DecoratableBuildPlugin() {
+class RustClientCodegenPlugin : ClientDecoratableBuildPlugin() {
     override fun getName(): String = "rust-client-codegen"
 
     override fun executeWithDecorator(
@@ -66,10 +66,10 @@ class RustClientCodegenPlugin : DecoratableBuildPlugin() {
     }
 
     companion object {
-        /** SymbolProvider
+        /**
          * When generating code, smithy types need to be converted into Rust types—that is the core role of the symbol provider
          *
-         * The Symbol provider is composed of a base `SymbolVisitor` which handles the core functionality, then is layered
+         * The Symbol provider is composed of a base [SymbolVisitor] which handles the core functionality, then is layered
          * with other symbol providers, documented inline, to handle the full scope of Smithy types.
          */
         fun baseSymbolProvider(model: Model, serviceShape: ServiceShape, symbolVisitorConfig: SymbolVisitorConfig) =

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

@@ -44,7 +44,7 @@ fun clientIntegrationTest(
  * 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 class ClientDecoratableBuildPlugin : SmithyBuildPlugin {
     abstract fun executeWithDecorator(
         context: PluginContext,
         vararg decorator: ClientCodegenDecorator,

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

@@ -190,8 +190,7 @@ fun generatePluginContext(
         )
     }
 
-    val settings = settingsBuilder.merge(additionalSettings)
-        .build()
+    val settings = settingsBuilder.merge(additionalSettings).build()
     val pluginContext = PluginContext.builder().model(model).fileManifest(manifest).settings(settings).build()
     return pluginContext to testPath
 }

codegen-server/build.gradle.kts

@@ -26,6 +26,10 @@ dependencies {
     implementation(project(":codegen-core"))
     implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
     implementation("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
+
+    // `smithy.framework#ValidationException` is defined here, which is used in `constraints.smithy`, which is used
+    // in `CustomValidationExceptionWithReasonDecoratorTest`.
+    testImplementation("software.amazon.smithy:smithy-validation-model:$smithyVersion")
 }
 
 tasks.compileKotlin { kotlinOptions.jvmTarget = "1.8" }

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/RustCodegenServerPlugin.kt

@@ -6,7 +6,6 @@
 package software.amazon.smithy.rust.codegen.server.smithy
 
 import software.amazon.smithy.build.PluginContext
-import software.amazon.smithy.build.SmithyBuildPlugin
 import software.amazon.smithy.codegen.core.ReservedWordSymbolProvider
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.ServiceShape
@@ -22,6 +21,8 @@ import software.amazon.smithy.rust.codegen.server.smithy.customizations.CustomVa
 import software.amazon.smithy.rust.codegen.server.smithy.customizations.ServerRequiredCustomizations
 import software.amazon.smithy.rust.codegen.server.smithy.customizations.SmithyValidationExceptionDecorator
 import software.amazon.smithy.rust.codegen.server.smithy.customize.CombinedServerCodegenDecorator
+import software.amazon.smithy.rust.codegen.server.smithy.customize.ServerCodegenDecorator
+import software.amazon.smithy.rust.codegen.server.smithy.testutil.ServerDecoratableBuildPlugin
 import java.util.logging.Level
 import java.util.logging.Logger
 
@@ -32,38 +33,34 @@ import java.util.logging.Logger
  * `resources/META-INF.services/software.amazon.smithy.build.SmithyBuildPlugin` refers to this class by name which
  * enables the smithy-build plugin to invoke `execute` with all Smithy plugin context + models.
  */
-class RustCodegenServerPlugin : SmithyBuildPlugin {
+class RustCodegenServerPlugin : ServerDecoratableBuildPlugin() {
     private val logger = Logger.getLogger(javaClass.name)
 
     override fun getName(): String = "rust-server-codegen"
 
-    override fun execute(context: PluginContext) {
-        // Suppress extremely noisy logs about reserved words
+    /**
+     * See [software.amazon.smithy.rust.codegen.client.smithy.RustClientCodegenPlugin].
+     */
+    override fun executeWithDecorator(
+        context: PluginContext,
+        vararg decorator: ServerCodegenDecorator
+    ) {
         Logger.getLogger(ReservedWordSymbolProvider::class.java.name).level = Level.OFF
-        // Discover [RustCodegenDecorators] on the classpath. [RustCodegenDecorator] returns different types of
-        // customizations. A customization is a function of:
-        // - location (e.g. the mutate section of an operation)
-        // - context (e.g. the of the operation)
-        // - writer: The active RustWriter at the given location
-        val codegenDecorator: CombinedServerCodegenDecorator =
+        val codegenDecorator =
             CombinedServerCodegenDecorator.fromClasspath(
                 context,
                 ServerRequiredCustomizations(),
                 SmithyValidationExceptionDecorator(),
                 CustomValidationExceptionWithReasonDecorator(),
+                *decorator,
             )
-
-        // ServerCodegenVisitor is the main driver of code generation that traverses the model and generates code
         logger.info("Loaded plugin to generate pure Rust bindings for the server SDK")
         ServerCodegenVisitor(context, codegenDecorator).execute()
     }
 
     companion object {
         /**
-         * When generating code, smithy types need to be converted into Rust types—that is the core role of the symbol provider.
-         *
-         * The Symbol provider is composed of a base [SymbolVisitor] which handles the core functionality, then is layered
-         * with other symbol providers, documented inline, to handle the full scope of Smithy types.
+         * See [software.amazon.smithy.rust.codegen.client.smithy.RustClientCodegenPlugin].
          */
         fun baseSymbolProvider(
             model: Model,

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ServerCodegenVisitor.kt

@@ -16,11 +16,11 @@ import software.amazon.smithy.model.shapes.IntegerShape
 import software.amazon.smithy.model.shapes.ListShape
 import software.amazon.smithy.model.shapes.LongShape
 import software.amazon.smithy.model.shapes.MapShape
+import software.amazon.smithy.model.shapes.NumberShape
 import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.model.shapes.SetShape
 import software.amazon.smithy.model.shapes.Shape
-import software.amazon.smithy.model.shapes.ShapeId
 import software.amazon.smithy.model.shapes.ShapeVisitor
 import software.amazon.smithy.model.shapes.ShortShape
 import software.amazon.smithy.model.shapes.StringShape
@@ -63,7 +63,6 @@ import software.amazon.smithy.rust.codegen.server.smithy.generators.ConstrainedM
 import software.amazon.smithy.rust.codegen.server.smithy.generators.ConstrainedNumberGenerator
 import software.amazon.smithy.rust.codegen.server.smithy.generators.ConstrainedStringGenerator
 import software.amazon.smithy.rust.codegen.server.smithy.generators.ConstrainedTraitForEnumGenerator
-import software.amazon.smithy.rust.codegen.server.smithy.generators.ValidationExceptionConversionGenerator
 import software.amazon.smithy.rust.codegen.server.smithy.generators.MapConstraintViolationGenerator
 import software.amazon.smithy.rust.codegen.server.smithy.generators.PubCrateConstrainedCollectionGenerator
 import software.amazon.smithy.rust.codegen.server.smithy.generators.PubCrateConstrainedMapGenerator
@@ -76,6 +75,7 @@ import software.amazon.smithy.rust.codegen.server.smithy.generators.ServerStruct
 import software.amazon.smithy.rust.codegen.server.smithy.generators.UnconstrainedCollectionGenerator
 import software.amazon.smithy.rust.codegen.server.smithy.generators.UnconstrainedMapGenerator
 import software.amazon.smithy.rust.codegen.server.smithy.generators.UnconstrainedUnionGenerator
+import software.amazon.smithy.rust.codegen.server.smithy.generators.ValidationExceptionConversionGenerator
 import software.amazon.smithy.rust.codegen.server.smithy.generators.protocol.ServerProtocol
 import software.amazon.smithy.rust.codegen.server.smithy.generators.protocol.ServerProtocolGenerator
 import software.amazon.smithy.rust.codegen.server.smithy.protocols.ServerProtocolLoader
@@ -342,7 +342,13 @@ open class ServerCodegenVisitor(
 
         if (isDirectlyConstrained || renderUnconstrainedList) {
             rustCrate.withModule(ModelsModule) {
-                CollectionConstraintViolationGenerator(codegenContext, this, shape, constraintsInfo).render()
+                CollectionConstraintViolationGenerator(
+                    codegenContext,
+                    this,
+                    shape,
+                    constraintsInfo,
+                    validationExceptionConversionGenerator,
+                ).render()
             }
         }
     }
@@ -382,7 +388,12 @@ open class ServerCodegenVisitor(
 
         if (isDirectlyConstrained || renderUnconstrainedMap) {
             rustCrate.withModule(ModelsModule) {
-                MapConstraintViolationGenerator(codegenContext, this, shape).render()
+                MapConstraintViolationGenerator(
+                    codegenContext,
+                    this,
+                    shape,
+                    validationExceptionConversionGenerator,
+                ).render()
             }
         }
     }
@@ -394,42 +405,19 @@ open class ServerCodegenVisitor(
      */
     override fun stringShape(shape: StringShape) {
         fun serverEnumGeneratorFactory(codegenContext: ServerCodegenContext, writer: RustWriter, shape: StringShape) =
-            ServerEnumGenerator(codegenContext, writer, shape)
+            ServerEnumGenerator(codegenContext, writer, shape, validationExceptionConversionGenerator)
         stringShape(shape, ::serverEnumGeneratorFactory)
     }
 
-    override fun integerShape(shape: IntegerShape) {
-        if (shape.isDirectlyConstrained(codegenContext.symbolProvider)) {
-            logger.info("[rust-server-codegen] Generating a constrained integer $shape")
-            rustCrate.withModule(ModelsModule) {
-                ConstrainedNumberGenerator(codegenContext, this, shape).render()
-            }
-        }
-    }
-
-    override fun shortShape(shape: ShortShape) {
-        if (shape.isDirectlyConstrained(codegenContext.symbolProvider)) {
-            logger.info("[rust-server-codegen] Generating a constrained short $shape")
-            rustCrate.withModule(ModelsModule) {
-                ConstrainedNumberGenerator(codegenContext, this, shape).render()
-            }
-        }
-    }
-
-    override fun longShape(shape: LongShape) {
-        if (shape.isDirectlyConstrained(codegenContext.symbolProvider)) {
-            logger.info("[rust-server-codegen] Generating a constrained long $shape")
-            rustCrate.withModule(ModelsModule) {
-                ConstrainedNumberGenerator(codegenContext, this, shape).render()
-            }
-        }
-    }
-
-    override fun byteShape(shape: ByteShape) {
+    override fun integerShape(shape: IntegerShape) = integralShape(shape)
+    override fun shortShape(shape: ShortShape) = integralShape(shape)
+    override fun longShape(shape: LongShape) = integralShape(shape)
+    override fun byteShape(shape: ByteShape) = integralShape(shape)
+    private fun integralShape(shape: NumberShape) {
         if (shape.isDirectlyConstrained(codegenContext.symbolProvider)) {
-            logger.info("[rust-server-codegen] Generating a constrained byte $shape")
+            logger.info("[rust-server-codegen] Generating a constrained integral $shape")
             rustCrate.withModule(ModelsModule) {
-                ConstrainedNumberGenerator(codegenContext, this, shape).render()
+                ConstrainedNumberGenerator(codegenContext, this, shape, validationExceptionConversionGenerator).render()
             }
         }
     }
@@ -552,7 +540,7 @@ open class ServerCodegenVisitor(
 
         if (shape.isDirectlyConstrained(codegenContext.symbolProvider)) {
             rustCrate.withModule(ModelsModule) {
-                ConstrainedBlobGenerator(codegenContext, this, shape).render()
+                ConstrainedBlobGenerator(codegenContext, this, shape, validationExceptionConversionGenerator).render()
             }
         }
     }