Builders of builders

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsRuntimeDependency.kt

@@ -7,6 +7,7 @@ package software.amazon.smithy.rustsdk
 
 import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.rust.codegen.rustlang.CargoDependency
+import software.amazon.smithy.rust.codegen.rustlang.Visibility
 import software.amazon.smithy.rust.codegen.smithy.RuntimeConfig
 import software.amazon.smithy.rust.codegen.smithy.RuntimeCrateLocation
 import software.amazon.smithy.rust.codegen.smithy.RuntimeType
@@ -43,12 +44,12 @@ fun RuntimeConfig.awsRoot(): RuntimeCrateLocation {
 object AwsRuntimeType {
     val S3Errors by lazy { RuntimeType.forInlineDependency(InlineAwsDependency.forRustFile("s3_errors")) }
     val Presigning by lazy {
-        RuntimeType.forInlineDependency(InlineAwsDependency.forRustFile("presigning", public = true))
+        RuntimeType.forInlineDependency(InlineAwsDependency.forRustFile("presigning", visibility = Visibility.PUBLIC))
     }
 
     fun RuntimeConfig.defaultMiddleware() = RuntimeType.forInlineDependency(
         InlineAwsDependency.forRustFile(
-            "middleware", public = true,
+            "middleware", visibility = Visibility.PUBLIC,
             CargoDependency.SmithyHttp(this),
             CargoDependency.SmithyHttpTower(this),
             CargoDependency.SmithyClient(this),

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/InlineAwsDependency.kt

@@ -7,8 +7,9 @@ package software.amazon.smithy.rustsdk
 
 import software.amazon.smithy.rust.codegen.rustlang.InlineDependency
 import software.amazon.smithy.rust.codegen.rustlang.RustDependency
+import software.amazon.smithy.rust.codegen.rustlang.Visibility
 
 object InlineAwsDependency {
-    fun forRustFile(file: String, public: Boolean = false, vararg additionalDependency: RustDependency): InlineDependency =
-        InlineDependency.Companion.forRustFile(file, "aws-inlineable", public, *additionalDependency)
+    fun forRustFile(file: String, visibility: Visibility = Visibility.PRIVATE, vararg additionalDependency: RustDependency): InlineDependency =
+        InlineDependency.Companion.forRustFile(file, "aws-inlineable", visibility, *additionalDependency)
 }

codegen-server-test/model/simple.smithy

@@ -3,129 +3,106 @@ $version: "1.0"
 namespace com.amazonaws.simple
 
 use aws.protocols#restJson1
-use smithy.test#httpRequestTests
-use smithy.test#httpResponseTests
 
 @restJson1
 @title("SimpleService")
-@documentation("A simple service example, with a Service resource that can be registered and a readonly healthcheck")
 service SimpleService {
-    version: "2022-01-01",
-    resources: [
-        Service,
-    ],
     operations: [
-        Healthcheck,
-        StoreServiceBlob,
+        AnOperation,
     ],
 }
 
-@documentation("Id of the service that will be registered")
-string ServiceId
-
-@documentation("Name of the service that will be registered")
-string ServiceName
+@http(uri: "/operation", method: "GET")
+operation AnOperation {
+    // input: RecursiveShapesInputOutput,
+    // output: RecursiveShapesInputOutput,
+    input: AnOperationInput,
+    output: AnOperationOutput,
+}
 
-@error("client")
-@documentation(
-    """
-    Returned when a new resource cannot be created because one already exists.
-    """
-)
-structure ResourceAlreadyExists {
+structure AnOperationInput {
     @required
-    message: String
+    conA: ConA
 }
 
-@documentation("A resource that can register services")
-resource Service {
-    identifiers: { id: ServiceId },
-    put: RegisterService,
-}
+structure AnOperationOutput {
+    conA: ConA,
 
-@idempotent
-@http(method: "PUT", uri: "/service/{id}")
-@documentation("Service register operation")
-@httpRequestTests([
-    {
-        id: "RegisterServiceRequestTest",
-        protocol: "aws.protocols#restJson1",
-        uri: "/service/1",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        params: { id: "1", name: "TestService" },
-        body: "{\"name\":\"TestService\"}",
-        method: "PUT",
-    }
-])
-@httpResponseTests([
-    {
-        id: "RegisterServiceResponseTest",
-        protocol: "aws.protocols#restJson1",
-        params: { id: "1", name: "TestService" },
-        body: "{\"id\":\"1\",\"name\":\"TestService\"}",
-        code: 200,
-    }
-])
-operation RegisterService {
-    input: RegisterServiceInputRequest,
-    output: RegisterServiceOutputResponse,
-    errors: [ResourceAlreadyExists]
+    conCList: ConCList,
 }
 
-@documentation("Service register input structure")
-structure RegisterServiceInputRequest {
+structure ConA {
     @required
-    @httpLabel
-    id: ServiceId,
-    name: ServiceName,
+    conB: ConB,
+
+    optConB: ConB,
+
+    conBList: ConBList,
+
+    // conBSet: ConBSet,
+
+    conBMap: ConBMap
 }
 
-@documentation("Service register output structure")
-structure RegisterServiceOutputResponse {
+structure ConB {
     @required
-    id: ServiceId,
-    name: ServiceName,
-}
+    nice: String,
+    @required
+    int: Integer,
 
-@readonly
-@http(uri: "/healthcheck", method: "GET")
-@documentation("Read-only healthcheck operation")
-operation Healthcheck {
-    input: HealthcheckInputRequest,
-    output: HealthcheckOutputResponse
+    optNice: String,
+    optInt: Integer
 }
 
-@documentation("Service healthcheck output structure")
-structure HealthcheckInputRequest {
-
+// structure RecursiveShapesInputOutput {
+//     nested: RecursiveShapesInputOutputNested1
+// }
+//
+// structure RecursiveShapesInputOutputNested1 {
+//     @required
+//     recursiveMember: RecursiveShapesInputOutputNested2
+// }
+//
+// structure RecursiveShapesInputOutputNested2 {
+//     @required
+//     recursiveMember: RecursiveShapesInputOutputNested1,
+// }
+
+// list ValidList {
+//     member: RecursiveShapesInputOutput
+// }
+//
+// structure RecursiveShapesInputOutput {
+//     @required
+//     foo: ValidList
+// }
+
+list ConBList {
+    member: AnotherList
 }
 
-@documentation("Service healthcheck input structure")
-structure HealthcheckOutputResponse {
+list ConCList {
+    member: AnotherList
+}
 
+list AnotherList {
+    member: ConB
 }
 
-@readonly
-@http(method: "GET", uri: "/service/{id}/blob")
-@documentation("Stores a blob for a service id")
-operation StoreServiceBlob {
-    input: StoreServiceBlobInput,
-    output: StoreServiceBlobOutput
+set ConBSet {
+    member: AnotherSet
 }
 
-@documentation("Store a blob for a service id input structure")
-structure StoreServiceBlobInput {
-    @required
-    @httpLabel
-    id: ServiceId,
-    @required
-    @httpPayload
-    content: Blob,
+set AnotherSet {
+    member: String
 }
 
-@documentation("Store a blob for a service id output structure")
-structure StoreServiceBlobOutput {
+map ConBMap {
+    key: String,
+    value: AnotherMap
+}
 
+map AnotherMap {
+    key: String,
+    value: ConBList
 }

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

@@ -0,0 +1,93 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+package software.amazon.smithy.rust.codegen.server.smithy
+
+import software.amazon.smithy.codegen.core.Symbol
+import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.shapes.ListShape
+import software.amazon.smithy.model.shapes.MapShape
+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.StructureShape
+import software.amazon.smithy.rust.codegen.rustlang.RustReservedWords
+import software.amazon.smithy.rust.codegen.rustlang.RustType
+import software.amazon.smithy.rust.codegen.smithy.RustSymbolProvider
+import software.amazon.smithy.rust.codegen.smithy.Unconstrained
+import software.amazon.smithy.rust.codegen.smithy.WrappingSymbolProvider
+import software.amazon.smithy.rust.codegen.smithy.canReachConstrainedShape
+import software.amazon.smithy.rust.codegen.smithy.generators.builderSymbol
+import software.amazon.smithy.rust.codegen.smithy.isConstrained
+import software.amazon.smithy.rust.codegen.smithy.rustType
+import software.amazon.smithy.rust.codegen.smithy.unconstrainedTypeNameForListOrMapShape
+import software.amazon.smithy.rust.codegen.util.toSnakeCase
+
+// TODO Unit tests.
+class ConstraintViolationSymbolProvider(
+    private val base: RustSymbolProvider,
+    private val model: Model,
+    private val serviceShape: ServiceShape,
+) : WrappingSymbolProvider(base) {
+    private val constraintViolationName = "ConstraintViolation"
+
+    private fun unconstrainedSymbolForListOrMapShape(shape: Shape): Symbol {
+        check(shape is ListShape || shape is MapShape)
+
+        val unconstrainedTypeName = unconstrainedTypeNameForListOrMapShape(shape, serviceShape)
+        val namespace = "crate::${Unconstrained.namespace}::${RustReservedWords.escapeIfNeeded(unconstrainedTypeName.toSnakeCase())}"
+        val rustType = RustType.Opaque(constraintViolationName, namespace)
+        return Symbol.builder()
+            .rustType(rustType)
+            .name(rustType.name)
+            .namespace(rustType.namespace, "::")
+            .definitionFile(Unconstrained.filename)
+            .build()
+    }
+
+    override fun toSymbol(shape: Shape): Symbol =
+        when (shape) {
+            is SetShape -> {
+//                TODO("Set shapes can only contain some simple shapes, but constraint traits on simple shapes are not implemented")
+                base.toSymbol(shape)
+            }
+            is ListShape -> {
+                check(shape.canReachConstrainedShape(model, base))
+
+                if (shape.isConstrained(base)) {
+//                    TODO("The `length` constraint trait on list shapes is currently not implemented")
+                    base.toSymbol(shape)
+                } else {
+                    unconstrainedSymbolForListOrMapShape(shape)
+                }
+            }
+            is MapShape -> {
+                check(shape.canReachConstrainedShape(model, base))
+
+                if (shape.isConstrained(base)) {
+//                    TODO("The `length` constraint trait on map shapes is currently not implemented")
+                    base.toSymbol(shape)
+                } else {
+                    unconstrainedSymbolForListOrMapShape(shape)
+                }
+            }
+            is StructureShape -> {
+                check(shape.canReachConstrainedShape(model, base))
+
+                val builderSymbol = shape.builderSymbol(base)
+
+                val namespace = builderSymbol.namespace
+                val rustType = RustType.Opaque(constraintViolationName, namespace)
+                Symbol.builder()
+                    .rustType(rustType)
+                    .name(rustType.name)
+                    .namespace(rustType.namespace, "::")
+                    .definitionFile(Unconstrained.filename)
+                    .build()
+            }
+            // TODO(https://github.com/awslabs/smithy-rs/pull/1199) Simple shapes can have constraint traits.
+            else -> base.toSymbol(shape)
+        }
+}