Allow non-builtIn params to have default values

smithy-lang · Sep 19, 2023 · 806b624 · 806b624
1 parent 39bf43e
commit 806b624
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/...rc/main/java/software/amazon/smithy/rulesengine/language/syntax/parameters/Parameter.java b/...rc/main/java/software/amazon/smithy/rulesengine/language/syntax/parameters/Parameter.java
@@ -52,9 +52,6 @@ public final class Parameter extends SyntaxElement implements ToSmithyBuilder<Pa
     private final String documentation;
 
     private Parameter(Builder builder) {
-        if (builder.defaultValue != null && builder.builtIn == null) {
-            throw new RuntimeException("Cannot set a default value for non-builtin parameters");
-        }
         if (builder.defaultValue != null && !builder.required) {
             throw new RuntimeException("When a default value is set, the field must also be marked as required");
         }

diff --git a/...ources/software/amazon/smithy/rulesengine/language/errorfiles/valid/default-values.smithy b/...ources/software/amazon/smithy/rulesengine/language/errorfiles/valid/default-values.smithy
@@ -8,13 +8,20 @@ use smithy.rules#endpointTests
 
 @clientContextParams(
     bar: {type: "string", documentation: "a client string parameter"}
+    baz: {type: "string", documentation: "another client string parameter"}
 )
 @endpointRuleSet({
     version: "1.0",
     parameters: {
         bar: {
             type: "string",
             documentation: "docs"
+        }
+        baz: {
+            type: "string",
+            documentation: "docs"
+            required: true
+            default: "baz"
         },
         endpoint: {
             type: "string",
@@ -38,7 +45,7 @@ use smithy.rules#endpointTests
                 }
             ],
             "endpoint": {
-                "url": "https://example.com"
+                "url": "https://example.com/{baz}"
             },
             "type": "endpoint"
         },
@@ -65,7 +72,24 @@ use smithy.rules#endpointTests
             }],
             "expect": {
                 "endpoint": {
-                    "url": "https://example.com"
+                    "url": "https://example.com/baz"
+                }
+            }
+        },
+        {
+            "params": {
+                "bar": "a b",
+                "baz": "BIG"
+            }
+            "operationInputs": [{
+                "operationName": "GetThing",
+                "builtInParams": {
+                    "SDK::Endpoint": "https://custom.example.com"
+                }
+            }],
+            "expect": {
+                "endpoint": {
+                    "url": "https://example.com/BIG"
                 }
             }
         },

diff --git a/...ftware/amazon/smithy/rulesengine/language/invalid-rules/only-builtins-have-defaults.json5 b/...ftware/amazon/smithy/rulesengine/language/invalid-rules/only-builtins-have-defaults.json5