Fix issue where an empty union was treated as 'None'

smithy-lang · Mar 15, 2024 · 2e0e037 · 2e0e037
1 parent ca0c43d
commit 2e0e037
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,8 +15,11 @@ buildscript {
 }
 
 allprojects {
+    val allowLocalDeps: String by project
     repositories {
-        mavenLocal()
+        if (allowLocalDeps.toBoolean()) {
+         mavenLocal()
+        }
         mavenCentral()
         google()
     }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,7 +12,6 @@ plugins {
 repositories {
     mavenCentral()
     google()
-    mavenLocal()
 }
 
 // Load properties manually to avoid hard coding smithy version

diff --git a/...in/software/amazon/smithy/rust/codegen/core/smithy/protocols/parse/JsonParserGenerator.kt b/...in/software/amazon/smithy/rust/codegen/core/smithy/protocols/parse/JsonParserGenerator.kt
@@ -565,7 +565,7 @@ class JsonParserGenerator(
                                 rustTemplate(
                                     """
                                     if let #{Some}(#{Ok}(#{Token}::ValueNull { .. })) = tokens.peek() {
-                                        #{skip_value}(tokens)?;
+                                        let _ = tokens.next().expect("peek returned a token")?;
                                         continue;
                                     }
                                     """,
@@ -633,6 +633,16 @@ class JsonParserGenerator(
                             *codegenScope,
                         )
                     }
+                    // If we've gotten to the point where the union had a `{ ... }` section, we can't return None
+                    // anymore. If we didn't parse a union at this point, this is an error.
+                    rustTemplate(
+                        """
+                        if variant.is_none() {
+                            return Err(#{Error}::custom("Union did not contain a valid variant."))
+                        }
+                        """,
+                        *codegenScope,
+                    )
                     rust("Ok(variant)")
                 }
             }

diff --git a/...oftware/amazon/smithy/rust/codegen/core/smithy/protocols/parse/JsonParserGeneratorTest.kt b/...oftware/amazon/smithy/rust/codegen/core/smithy/protocols/parse/JsonParserGeneratorTest.kt
@@ -194,6 +194,15 @@ class JsonParserGeneratorTest {
                 """,
             )
 
+            unitTest(
+                "all_variants_null",
+                """
+                // __type field should be ignored during deserialization
+                let input = br#"{ "top": { "choice": { "blob": null, "boolean": null, "int": null, "long": null, "__type": "value-should-be-ignored-anyway" } } }"#;
+                let _err = ${format(operationGenerator)}(input, test_output::OpOutput::builder()).expect_err("invalid union");
+                """,
+            )
+
             unitTest(
                 "empty_error",
                 """

diff --git a/gradle.properties b/gradle.properties
@@ -22,6 +22,7 @@ kotlin.code.style=official
 # codegen
 smithyGradlePluginVersion=0.9.0
 smithyVersion=1.45.0
+allowLocalDeps=false
 
 # kotlin
 kotlinVersion=1.9.20