Correctly determine nullability of members in IDLv2 models

CHANGELOG.next.toml

@@ -186,3 +186,15 @@ message = "Smithy IDL v2 mixins are now supported"
 references = ["smithy-rs#1680"]
 meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "all"}
 author = "ogudavid"
+
+[[smithy-rs]]
+message = "Upgrade Smithy to 1.25.0"
+references = ["smithy-rs#1725"]
+meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "all"}
+author = "sugmanue"
+
+[[smithy-rs]]
+message = "Correctly determine nullability of members in IDLv2 models"
+references = ["smithy-rs#1725"]
+meta = { "breaking" = false, "tada" = false, "bug" = true, "target" = "all"}
+author = "sugmanue"

aws/sdk-adhoc-test/build.gradle.kts

@@ -25,6 +25,12 @@ configure<software.amazon.smithy.gradle.SmithyExtension> {
 }
 
 buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+    }
+
     val smithyVersion: String by project
     dependencies {
         classpath("software.amazon.smithy:smithy-cli:$smithyVersion")

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/ec2/EC2MakePrimitivesOptional.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.rustsdk.customize.ec2
+
+import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.shapes.Shape
+import software.amazon.smithy.model.traits.ClientOptionalTrait
+import software.amazon.smithy.model.transform.ModelTransformer
+
+object EC2MakePrimitivesOptional {
+    fun processModel(model: Model): Model {
+        val updates = arrayListOf<Shape>()
+        for (struct in model.structureShapes) {
+            for (member in struct.allMembers.values) {
+                updates.add(member.toBuilder().addTrait(ClientOptionalTrait()).build())
+            }
+
+        }
+        return ModelTransformer.create().replaceShapes(model, updates)
+    }
+}

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/ec2/Ec2Decorator.kt

@@ -26,7 +26,7 @@ class Ec2Decorator : RustCodegenDecorator<ClientCodegenContext> {
         // need to be boxed for the API to work properly
         return model.letIf(
             applies(service),
-            BoxPrimitiveShapes::processModel,
+            EC2MakePrimitivesOptional::processModel,
         )
     }
 

aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/customize/ec2/BoxPrimitiveShapesTest.kt → aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/customize/ec2/AddClientOptionalToShapesTest.kt

@@ -7,13 +7,12 @@ package software.amazon.smithy.rustsdk.customize.ec2
 
 import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.Test
+import software.amazon.smithy.model.knowledge.NullableIndex
 import software.amazon.smithy.model.shapes.StructureShape
-import software.amazon.smithy.model.traits.BoxTrait
 import software.amazon.smithy.rust.codegen.testutil.asSmithyModel
-import software.amazon.smithy.rust.codegen.util.hasTrait
 import software.amazon.smithy.rust.codegen.util.lookup
 
-internal class BoxPrimitiveShapesTest {
+internal class AddClientOptionalToShapesTest {
     @Test
     fun `primitive shapes are boxed`() {
         val baseModel = """
@@ -33,15 +32,11 @@ internal class BoxPrimitiveShapesTest {
             structure Other {}
 
         """.asSmithyModel()
-        val model = BoxPrimitiveShapes.processModel(baseModel)
-
+        val model = EC2MakePrimitivesOptional.processModel(baseModel)
+        val nullableIndex = NullableIndex(model)
         val struct = model.lookup<StructureShape>("test#Primitives")
         struct.members().forEach {
-            val target = model.expectShape(it.target)
-            when (target) {
-                is StructureShape -> target.hasTrait<BoxTrait>() shouldBe false
-                else -> target.hasTrait<BoxTrait>() shouldBe true
-            }
+            nullableIndex.isMemberNullable(it, NullableIndex.CheckMode.CLIENT_ZERO_VALUE_V1) shouldBe true
         }
     }
 }

aws/sdk/build.gradle.kts

@@ -35,6 +35,12 @@ val sdkOutputDir = outputDir.resolve("sdk")
 val examplesOutputDir = outputDir.resolve("examples")
 
 buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+    }
+
     val smithyVersion: String by project
     dependencies {
         classpath("software.amazon.smithy:smithy-aws-traits:$smithyVersion")

build.gradle.kts

@@ -4,6 +4,7 @@
  */
 buildscript {
     repositories {
+        mavenLocal()
         mavenCentral()
         google()
     }

buildSrc/build.gradle.kts

@@ -11,6 +11,7 @@ plugins {
     jacoco
 }
 repositories {
+    mavenLocal()
     mavenCentral()
     google()
 }

codegen-client-test/build.gradle.kts

@@ -21,6 +21,11 @@ val pluginName = "rust-codegen"
 val workingDirUnderBuildDir = "smithyprojections/codegen-client-test/"
 
 buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+    }
     val smithyVersion: String by project
     dependencies {
         classpath("software.amazon.smithy:smithy-cli:$smithyVersion")

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

@@ -7,6 +7,7 @@ package software.amazon.smithy.rust.codegen.smithy
 
 import software.amazon.smithy.build.PluginContext
 import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.knowledge.NullableIndex
 import software.amazon.smithy.model.neighbor.Walker
 import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.model.shapes.Shape
@@ -62,6 +63,7 @@ class CodegenVisitor(context: PluginContext, private val codegenDecorator: RustC
                 renameExceptions = settings.codegenConfig.renameExceptions,
                 handleRequired = false,
                 handleRustBoxing = true,
+                nullabilityCheckMode = NullableIndex.CheckMode.CLIENT_ZERO_VALUE_V1_NO_INPUT,
             )
         val baseModel = baselineTransform(context.model)
         val service = settings.getService(baseModel)

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

@@ -65,6 +65,7 @@ data class SymbolVisitorConfig(
     val renameExceptions: Boolean,
     val handleRustBoxing: Boolean,
     val handleRequired: Boolean,
+    val nullabilityCheckMode: NullableIndex.CheckMode,
 )
 
 /**
@@ -211,7 +212,7 @@ open class SymbolVisitor(
     private fun handleOptionality(symbol: Symbol, member: MemberShape): Symbol =
         if (config.handleRequired && member.isRequired) {
             symbol
-        } else if (nullableIndex.isNullable(member)) {
+        } else if (nullableIndex.isMemberNullable(member, config.nullabilityCheckMode)) {
             symbol.makeOptional()
         } else {
             symbol

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

@@ -94,6 +94,7 @@ fun String.asSmithyModel(sourceLocation: String? = null, smithyVersion: String =
         .unwrap()
 }
 
+
 /**
  * In tests, we frequently need to generate a struct, a builder, and an impl block to access said builder.
  */

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

@@ -125,17 +125,13 @@ class SymbolBuilderTest {
         "PrimitiveBoolean, false, bool",
     )
     fun `creates primitives`(primitiveType: String, optional: Boolean, rustName: String) {
-        val memberBuilder = MemberShape.builder().id("foo.bar#MyStruct\$quux").target("smithy.api#$primitiveType")
-        val member = memberBuilder.build()
-        val struct = StructureShape.builder()
-            .id("foo.bar#MyStruct")
-            .addMember(member)
-            .build()
-        val model = Model.assembler()
-            .addShapes(struct, member)
-            .assemble()
-            .unwrap()
-
+        val model = """
+    namespace foo.bar
+    structure MyStruct {
+        quux: $primitiveType
+    }
+""".asSmithyModel()
+        var member = model.expectShape(ShapeId.from("foo.bar#MyStruct\$quux"))
         val provider: SymbolProvider = testSymbolProvider(model)
         val memberSymbol = provider.toSymbol(member)
         // builtins should not have a namespace set

codegen-server-test/build.gradle.kts

@@ -22,6 +22,11 @@ val pluginName = "rust-server-codegen"
 val workingDirUnderBuildDir = "smithyprojections/codegen-server-test/"
 
 buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+    }
     val smithyVersion: String by project
     dependencies {
         classpath("software.amazon.smithy:smithy-cli:$smithyVersion")

codegen-server-test/python/build.gradle.kts

@@ -26,6 +26,11 @@ configure<software.amazon.smithy.gradle.SmithyExtension> {
 }
 
 buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+    }
     val smithyVersion: String by project
     dependencies {
         classpath("software.amazon.smithy:smithy-cli:$smithyVersion")

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

@@ -7,6 +7,7 @@ package software.amazon.smithy.rust.codegen.server.smithy
 
 import software.amazon.smithy.build.PluginContext
 import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.knowledge.NullableIndex
 import software.amazon.smithy.model.neighbor.Walker
 import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.model.shapes.Shape
@@ -70,6 +71,7 @@ open class ServerCodegenVisitor(
                 renameExceptions = false,
                 handleRequired = true,
                 handleRustBoxing = true,
+                nullabilityCheckMode = NullableIndex.CheckMode.SERVER,
             )
         val baseModel = baselineTransform(context.model)
         val service = settings.getService(baseModel)

gradle.properties

@@ -15,7 +15,7 @@ kotlin.code.style=official
 
 # codegen
 smithyGradlePluginVersion=0.6.0
-smithyVersion=1.23.1
+smithyVersion=1.25.0
 
 # kotlin
 kotlinVersion=1.6.21