Add server RPC v2 CBOR support

.cargo-deny-config.toml

@@ -25,6 +25,9 @@ exceptions = [
     { allow = ["OpenSSL"], name = "ring", version = "*" },
     { allow = ["OpenSSL"], name = "aws-lc-sys", version = "*" },
     { allow = ["OpenSSL"], name = "aws-lc-fips-sys", version = "*" },
+    { allow = ["BlueOak-1.0.0"], name = "minicbor", version = "<=0.24.2" },
+    # Safe to bump as long as license does not change -------------^
+    # See D105255799.
 ]
 
 [[licenses.clarify]]

build.gradle.kts

@@ -18,7 +18,7 @@ allprojects {
     val allowLocalDeps: String by project
     repositories {
         if (allowLocalDeps.toBoolean()) {
-         mavenLocal()
+            mavenLocal()
         }
         mavenCentral()
         google()

buildSrc/src/main/kotlin/CodegenTestCommon.kt

@@ -26,9 +26,84 @@ fun generateImports(imports: List<String>): String =
     if (imports.isEmpty()) {
         ""
     } else {
-        "\"imports\": [${imports.map { "\"$it\"" }.joinToString(", ")}],"
+        "\"imports\": [${imports.joinToString(", ") { "\"$it\"" }}],"
     }
 
+val RustKeywords =
+    setOf(
+        "as",
+        "break",
+        "const",
+        "continue",
+        "crate",
+        "else",
+        "enum",
+        "extern",
+        "false",
+        "fn",
+        "for",
+        "if",
+        "impl",
+        "in",
+        "let",
+        "loop",
+        "match",
+        "mod",
+        "move",
+        "mut",
+        "pub",
+        "ref",
+        "return",
+        "self",
+        "Self",
+        "static",
+        "struct",
+        "super",
+        "trait",
+        "true",
+        "type",
+        "unsafe",
+        "use",
+        "where",
+        "while",
+        "async",
+        "await",
+        "dyn",
+        "abstract",
+        "become",
+        "box",
+        "do",
+        "final",
+        "macro",
+        "override",
+        "priv",
+        "typeof",
+        "unsized",
+        "virtual",
+        "yield",
+        "try",
+    )
+
+fun toRustCrateName(input: String): String {
+    if (input.isBlank()) {
+        throw IllegalArgumentException("Rust crate name cannot be empty")
+    }
+    val lowerCased = input.lowercase()
+    // Replace any sequence of characters that are not lowercase letters, numbers, dashes, or underscores with a single underscore.
+    val sanitized = lowerCased.replace(Regex("[^a-z0-9_-]+"), "_")
+    // Trim leading or trailing underscores.
+    val trimmed = sanitized.trim('_')
+    // Check if the resulting string is empty, purely numeric, or a reserved name
+    val finalName =
+        when {
+            trimmed.isEmpty() -> throw IllegalArgumentException("Rust crate name after sanitizing cannot be empty.")
+            trimmed.matches(Regex("\\d+")) -> "n$trimmed" // Prepend 'n' if the name is purely numeric.
+            trimmed in RustKeywords -> "${trimmed}_" // Append an underscore if the name is reserved.
+            else -> trimmed
+        }
+    return finalName
+}
+
 private fun generateSmithyBuild(
     projectDir: String,
     pluginName: String,
@@ -48,7 +123,7 @@ private fun generateSmithyBuild(
                             ${it.extraCodegenConfig ?: ""}
                         },
                         "service": "${it.service}",
-                        "module": "${it.module}",
+                        "module": "${toRustCrateName(it.module)}",
                         "moduleVersion": "0.0.1",
                         "moduleDescription": "test",
                         "moduleAuthors": ["[email protected]"]

buildSrc/src/main/kotlin/CrateSet.kt

@@ -56,6 +56,7 @@ object CrateSet {
     val SMITHY_RUNTIME_COMMON =
         listOf(
             "aws-smithy-async",
+            "aws-smithy-cbor",
             "aws-smithy-checksums",
             "aws-smithy-compression",
             "aws-smithy-client",

codegen-client/build.gradle.kts

@@ -27,9 +27,10 @@ dependencies {
     implementation("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
     implementation("software.amazon.smithy:smithy-waiters:$smithyVersion")
     implementation("software.amazon.smithy:smithy-rules-engine:$smithyVersion")
+    implementation("software.amazon.smithy:smithy-protocol-traits:$smithyVersion")
 
     // `smithy.framework#ValidationException` is defined here, which is used in event stream
-// marshalling/unmarshalling tests.
+    // marshalling/unmarshalling tests.
     testImplementation("software.amazon.smithy:smithy-validation-model:$smithyVersion")
 }
 

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

@@ -19,7 +19,6 @@ import software.amazon.smithy.rust.codegen.client.smithy.generators.error.ErrorC
 import software.amazon.smithy.rust.codegen.core.rustlang.Writable
 import software.amazon.smithy.rust.codegen.core.smithy.customize.CombinedCoreCodegenDecorator
 import software.amazon.smithy.rust.codegen.core.smithy.customize.CoreCodegenDecorator
-import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.ProtocolTestGenerator
 import software.amazon.smithy.rust.codegen.core.smithy.protocols.ProtocolMap
 import java.util.ServiceLoader
 import java.util.logging.Logger
@@ -93,14 +92,6 @@ interface ClientCodegenDecorator : CoreCodegenDecorator<ClientCodegenContext, Cl
         codegenContext: ClientCodegenContext,
         baseCustomizations: List<ServiceRuntimePluginCustomization>,
     ): List<ServiceRuntimePluginCustomization> = baseCustomizations
-
-    /**
-     * Hook to override the protocol test generator
-     */
-    fun protocolTestGenerator(
-        codegenContext: ClientCodegenContext,
-        baseGenerator: ProtocolTestGenerator,
-    ): ProtocolTestGenerator = baseGenerator
 }
 
 /**
@@ -176,14 +167,6 @@ open class CombinedClientCodegenDecorator(decorators: List<ClientCodegenDecorato
             decorator.serviceRuntimePluginCustomizations(codegenContext, customizations)
         }
 
-    override fun protocolTestGenerator(
-        codegenContext: ClientCodegenContext,
-        baseGenerator: ProtocolTestGenerator,
-    ): ProtocolTestGenerator =
-        combineCustomizations(baseGenerator) { decorator, gen ->
-            decorator.protocolTestGenerator(codegenContext, gen)
-        }
-
     companion object {
         fun fromClasspath(
             context: PluginContext,

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

@@ -28,11 +28,12 @@ class ClientBuilderKindBehavior(val codegenContext: CodegenContext) : Instantiat
     override fun doesSetterTakeInOption(memberShape: MemberShape): Boolean = true
 }
 
-class ClientInstantiator(private val codegenContext: ClientCodegenContext) : Instantiator(
+class ClientInstantiator(private val codegenContext: ClientCodegenContext, withinTest: Boolean = false) : Instantiator(
     codegenContext.symbolProvider,
     codegenContext.model,
     codegenContext.runtimeConfig,
     ClientBuilderKindBehavior(codegenContext),
+    withinTest = false,
 ) {
     fun renderFluentCall(
         writer: RustWriter,

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/protocol/ClientProtocolTestGenerator.kt

@@ -114,7 +114,7 @@ class ClientProtocolTestGenerator(
         get() = AppliesTo.CLIENT
     override val expectFail: Set<FailingTest>
         get() = ExpectFail
-    override val runOnly: Set<String>
+    override val generateOnly: Set<String>
         get() = emptySet()
     override val disabledTests: Set<String>
         get() = emptySet()
@@ -128,7 +128,7 @@ class ClientProtocolTestGenerator(
     private val inputShape = operationShape.inputShape(codegenContext.model)
     private val outputShape = operationShape.outputShape(codegenContext.model)
 
-    private val instantiator = ClientInstantiator(codegenContext)
+    private val instantiator = ClientInstantiator(codegenContext, withinTest = true)
 
     private val codegenScope =
         arrayOf(
@@ -149,6 +149,8 @@ class ClientProtocolTestGenerator(
     }
 
     private fun RustWriter.renderHttpRequestTestCase(httpRequestTestCase: HttpRequestTestCase) {
+        logger.info("Generating request test: ${httpRequestTestCase.id}")
+
         if (!protocolSupport.requestSerialization) {
             rust("/* test case disabled for this protocol (not yet supported) */")
             return
@@ -234,6 +236,8 @@ class ClientProtocolTestGenerator(
         testCase: HttpResponseTestCase,
         expectedShape: StructureShape,
     ) {
+        logger.info("Generating response test: ${testCase.id}")
+
         if (!protocolSupport.responseDeserialization || (
                 !protocolSupport.errorDeserialization &&
                     expectedShape.hasTrait(
@@ -357,8 +361,8 @@ class ClientProtocolTestGenerator(
         if (body == "") {
             rustWriter.rustTemplate(
                 """
-                // No body
-                #{AssertEq}(::std::str::from_utf8(body).unwrap(), "");
+                // No body.
+                #{AssertEq}(&body, &bytes::Bytes::new());
                 """,
                 *codegenScope,
             )

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

@@ -13,6 +13,7 @@ import software.amazon.smithy.aws.traits.protocols.Ec2QueryTrait
 import software.amazon.smithy.aws.traits.protocols.RestJson1Trait
 import software.amazon.smithy.aws.traits.protocols.RestXmlTrait
 import software.amazon.smithy.model.shapes.ServiceShape
+import software.amazon.smithy.protocol.traits.Rpcv2CborTrait
 import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext
 import software.amazon.smithy.rust.codegen.client.smithy.generators.OperationGenerator
 import software.amazon.smithy.rust.codegen.core.smithy.CodegenContext
@@ -28,6 +29,7 @@ import software.amazon.smithy.rust.codegen.core.smithy.protocols.ProtocolLoader
 import software.amazon.smithy.rust.codegen.core.smithy.protocols.ProtocolMap
 import software.amazon.smithy.rust.codegen.core.smithy.protocols.RestJson
 import software.amazon.smithy.rust.codegen.core.smithy.protocols.RestXml
+import software.amazon.smithy.rust.codegen.core.smithy.protocols.RpcV2Cbor
 import software.amazon.smithy.rust.codegen.core.util.hasTrait
 
 class ClientProtocolLoader(supportedProtocols: ProtocolMap<OperationGenerator, ClientCodegenContext>) :
@@ -41,6 +43,7 @@ class ClientProtocolLoader(supportedProtocols: ProtocolMap<OperationGenerator, C
                 Ec2QueryTrait.ID to ClientEc2QueryFactory(),
                 RestJson1Trait.ID to ClientRestJsonFactory(),
                 RestXmlTrait.ID to ClientRestXmlFactory(),
+                Rpcv2CborTrait.ID to ClientRpcV2CborFactory(),
             )
         val Default = ClientProtocolLoader(DefaultProtocols)
     }
@@ -117,3 +120,12 @@ class ClientRestXmlFactory(
 
     override fun support(): ProtocolSupport = CLIENT_PROTOCOL_SUPPORT
 }
+
+class ClientRpcV2CborFactory : ProtocolGeneratorFactory<OperationGenerator, ClientCodegenContext> {
+    override fun protocol(codegenContext: ClientCodegenContext): Protocol = RpcV2Cbor(codegenContext)
+
+    override fun buildProtocolGenerator(codegenContext: ClientCodegenContext): OperationGenerator =
+        OperationGenerator(codegenContext, protocol(codegenContext))
+
+    override fun support(): ProtocolSupport = CLIENT_PROTOCOL_SUPPORT
+}

codegen-core/build.gradle.kts

@@ -28,6 +28,7 @@ dependencies {
     implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
     implementation("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
     implementation("software.amazon.smithy:smithy-waiters:$smithyVersion")
+    implementation("software.amazon.smithy:smithy-protocol-traits:$smithyVersion")
 }
 
 fun gitCommitHash(): String {