Added new ERROR event to EndpointTestsTraitValidator when builtin params are inconsistent

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/validators/EndpointTestsTraitValidator.java

@@ -8,9 +8,13 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.knowledge.TopDownIndex;
 import software.amazon.smithy.model.node.Node;
+import software.amazon.smithy.model.node.ObjectNode;
+import software.amazon.smithy.model.node.StringNode;
 import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.StructureShape;
@@ -71,6 +75,7 @@ private void validateEndpointRuleSet(
         // be used frequently in downstream validation.
         List<Parameter> builtInParamsWithDefaults = new ArrayList<>();
         List<Parameter> builtInParamsWithoutDefaults = new ArrayList<>();
+        Map<String, String> builtInParameters = new HashMap<>();
 
         for (Parameter parameter : parameters) {
             if (parameter.isBuiltIn()) {
@@ -79,6 +84,7 @@ private void validateEndpointRuleSet(
                 } else {
                     builtInParamsWithoutDefaults.add(parameter);
                 }
+                builtInParameters.put(parameter.getName().getName().getValue(), parameter.getBuiltIn().get());
             }
         }
 
@@ -112,6 +118,11 @@ private void validateEndpointRuleSet(
                         testCase,
                         testOperationInput,
                         events);
+                validateBuiltInsUseInconsistentValues(serviceShape,
+                        builtInParameters,
+                        testCase,
+                        testOperationInput,
+                        events);
 
                 StructureShape inputShape = model.expectShape(
                         operationNameMap.get(operationName).getInputShape(),
@@ -149,12 +160,8 @@ private void validateConfiguredBuiltInValues(
         for (Map.Entry<Parameter, Node> builtInParasWithNonDefaultValue : builtInParamsWithNonDefaultValues
                 .entrySet()) {
             String builtInName = builtInParasWithNonDefaultValue.getKey().getBuiltIn().get();
-            // Emit if either the built-in with a non-matching value isn't
-            // specified or the value set for it doesn't match.
-            if (!testOperationInput.getBuiltInParams().containsMember(builtInName)
-                    || !testOperationInput.getBuiltInParams()
-                            .expectMember(builtInName)
-                            .equals(builtInParasWithNonDefaultValue.getValue())) {
+            // Emit if the built-in with a non-matching value isn't specified.
+            if (!testOperationInput.getBuiltInParams().containsMember(builtInName)) {
                 events.add(error(serviceShape,
                         testOperationInput,
                         String.format("Test case does not supply the `%s` value for the `%s` parameter's "
@@ -186,6 +193,45 @@ private void validateBuiltInsWithoutDefaultsHaveValues(
         }
     }
 
+    private void validateBuiltInsUseInconsistentValues(
+            ServiceShape serviceShape,
+            Map<String, String> builtInParameters,
+            EndpointTestCase testCase,
+            EndpointTestOperationInput testOperationInput,
+            List<ValidationEvent> events
+    ) {
+        if (testOperationInput == null) {
+            return;
+        }
+        for (Entry<StringNode, Node> testCaseParam : testCase.getParams().getMembers().entrySet()) {
+            if (!builtInParameters.containsKey(testCaseParam.getKey().getValue())) {
+                continue;
+            }
+
+            ObjectNode operationInputBuiltInParams = testOperationInput.getBuiltInParams();
+            if (operationInputBuiltInParams == null) {
+                continue;
+            }
+
+            String builtInName = builtInParameters.get(testCaseParam.getKey().getValue());
+            if (!operationInputBuiltInParams.containsMember(builtInName)) {
+                continue;
+            }
+
+            Optional<Node> paramValue = operationInputBuiltInParams.getMember(builtInName);
+            if (!paramValue.isPresent()) {
+                continue;
+            }
+
+            if (!paramValue.get().equals(testCaseParam.getValue())) {
+                events.add(error(
+                        serviceShape,
+                        "Inconsistent testcase parameters: " + testCaseParam.getValue()
+                                + " and " + paramValue.get()));
+            }
+        }
+    }
+
     private void validateOperationInput(
             Model model,
             ServiceShape serviceShape,

smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/validators/RuleSetParameterValidator.java

@@ -271,7 +271,7 @@ private void validateTestsParameters(
 
             // All required params from a ruleset must be present in all test cases.
             if (parameter.isRequired() && !parameter.getDefault().isPresent()
-                    && (!testSuiteHasParam || testSuiteParams.get(name).size() != trait.getTestCases().size())) {
+                    && (!testSuiteHasParam || testSuiteParams.get(name).size() < trait.getTestCases().size())) {
                 errors.add(parameterError(serviceShape,
                         parameter,
                         "TestCase.RequiredMissing",

smithy-rules-engine/src/test/resources/software/amazon/smithy/rulesengine/traits/errorfiles/inconsistent-builtin-params.errors

@@ -0,0 +1,3 @@
+[WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointRuleSet | UnstableTrait.smithy.rules#endpointRuleSet
+[WARNING] example#FizzBuzz: This shape applies a trait that is unstable: smithy.rules#endpointTests | UnstableTrait.smithy.rules#endpointTests
+[ERROR] example#FizzBuzz: Inconsistent testcase parameters: https://another.example.com and https://custom.example.com | EndpointTestsTrait

smithy-rules-engine/src/test/resources/software/amazon/smithy/rulesengine/traits/errorfiles/inconsistent-builtin-params.smithy

@@ -0,0 +1,82 @@
+$version: "1.0"
+
+namespace example
+
+use smithy.rules#endpointRuleSet
+use smithy.rules#endpointTests
+
+@endpointRuleSet({
+  "version": "1.3",
+  parameters: {
+    endpoint: {
+      type: "string"
+      builtIn: "SDK::Endpoint"
+      documentation: "docs"
+    }
+  },
+  "rules": [
+    {
+      "conditions": [],
+      "documentation": "base rule",
+      "endpoint": {
+        "url": "https://fizzbuzz.amazonaws.com",
+        "headers": {}
+      },
+      "type": "endpoint"
+    }
+  ]
+})
+@endpointTests(
+  version: "1.3",
+  testCases: [
+    {
+      "documentation": "Inconsistent",
+      "params": {
+        endpoint: "https://another.example.com"
+      },
+      "expect": {
+        "endpoint": {
+          "url": "https://fizzbuzz.amazonaws.com"
+        }
+      },
+      "operationInputs": [
+        {
+          "operationName": "ListShards",
+          "builtInParams": {
+            "SDK::Endpoint": "https://custom.example.com",
+          }
+        }
+      ]
+    }
+    {
+      "documentation": "Consistent",
+      "params": {
+        endpoint: "https://another.example.com"
+      },
+      "expect": {
+        "endpoint": {
+          "url": "https://fizzbuzz.amazonaws.com"
+        }
+      },
+      "operationInputs": [
+        {
+          "operationName": "ListShards",
+          "builtInParams": {
+            "SDK::Endpoint": "https://another.example.com",
+          }
+        }
+      ]
+    }
+  ]
+)
+service FizzBuzz {
+  operations: [
+    ListShards
+  ]
+}
+
+operation ListShards {
+  input: Struct
+}
+
+structure Struct {}

smithy-rules-engine/src/test/resources/software/amazon/smithy/rulesengine/traits/errorfiles/non-default-builtin-values.errors

@@ -1,4 +1,4 @@
 [WARNING] smithy.example#ExampleService: This shape applies a trait that is unstable: smithy.rules#endpointRuleSet | UnstableTrait
 [WARNING] smithy.example#ExampleService: This shape applies a trait that is unstable: smithy.rules#endpointTests | UnstableTrait
-[ERROR] smithy.example#ExampleService: Test case does not supply the `"https://another.example.com"` value for the `endpoint` parameter's `SDK::Endpoint` built-in. | EndpointTestsTrait
+[ERROR] smithy.example#ExampleService: Inconsistent testcase parameters: https://another.example.com and https://custom.example.com | EndpointTestsTrait
 [ERROR] smithy.example#ExampleService: Test case does not supply the `"https://some.example.com"` value for the `endpoint` parameter's `SDK::Endpoint` built-in. | EndpointTestsTrait