Filter unknown params declared in test case (#3802)

If a test case declares an unknown endpoint parameter when setting parameters on
the test client, just ignore it.

Author: dagnir

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointProviderTestSpec.java

@@ -121,7 +121,7 @@ private CodeBlock createTestCase(EndpointTestModel test) {
 
         if (test.getParams() != null) {
             test.getParams().forEach((n, v) -> {
-                if (!isDeclaredParam(n)) {
+                if (!endpointRulesSpecUtils.isDeclaredParam(n)) {
                     return;
                 }
 
@@ -144,9 +144,4 @@ private boolean isRegionBuiltIn(String paramName) {
         ParameterModel param = parameters.get(paramName);
         return param.getBuiltInEnum() == BuiltInParameter.AWS_REGION;
     }
-
-    private boolean isDeclaredParam(String paramName) {
-        Map<String, ParameterModel> parameters = model.getEndpointRuleSetModel().getParameters();
-        return parameters.containsKey(paramName);
-    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointRulesClientTestSpec.java

@@ -520,6 +520,11 @@ private CodeBlock setClientParams(String builderName, Map<String, TreeNode> para
             config.add("$T.builder()", configClass());
 
             params.forEach((n, v) -> {
+
+                if (!endpointRulesSpecUtils.isDeclaredParam(n)) {
+                    return;
+                }
+
                 CodeBlock valueLiteral = endpointRulesSpecUtils.treeNodeToLiteral(v);
                 switch (n) {
                     case "UseDualStack":
@@ -653,9 +658,9 @@ private CodeBlock getSkipReasonBlock(String testName) {
 
     private MethodSpec methodSetupMethod() {
         MethodSpec.Builder b = MethodSpec.methodBuilder("methodSetup")
-            .addModifiers(Modifier.PUBLIC)
-            .addAnnotation(BeforeEach.class)
-            .returns(void.class);
+                                         .addModifiers(Modifier.PUBLIC)
+                                         .addAnnotation(BeforeEach.class)
+                                         .returns(void.class);
 
         b.addStatement("super.methodSetup()");
 
@@ -675,9 +680,9 @@ private CodeBlock s3RegionalEndpointSystemPropertyCode() {
 
     private FieldSpec s3RegionEndpointSystemPropertySaveValueField() {
         return FieldSpec.builder(String.class, "regionalEndpointPropertySaveValue")
-            .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
-            .initializer("$T.getProperty($L)", System.class, s3RegionalEndpointSystemPropertyCode())
-            .build();
+                        .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
+                        .initializer("$T.getProperty($L)", System.class, s3RegionalEndpointSystemPropertyCode())
+                        .build();
     }
 
     private MethodSpec teardownMethod() {

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointRulesSpecUtils.java

@@ -27,6 +27,7 @@
 import java.net.URL;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
@@ -201,4 +202,9 @@ public List<String> rulesEngineResourceFiles() {
             throw new UncheckedIOException(e);
         }
     }
+
+    public boolean isDeclaredParam(String paramName) {
+        Map<String, ParameterModel> parameters = intermediateModel.getEndpointRuleSetModel().getParameters();
+        return parameters.containsKey(paramName);
+    }
 }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/query/endpoint-tests.json

@@ -87,6 +87,15 @@
                     }
                 }
             ]
+        },
+        {
+            "documentation": "Has has undeclared input parameter",
+            "expect": {
+                "error": "Missing info"
+            },
+            "params": {
+                "NotAParam": "ABC"
+            }
         }
     ],
     "version": "1.0"

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-rules-test-class.java

@@ -104,7 +104,15 @@ private static List<SyncTestCase> syncTestCases() {
                 OperationWithContextParamRequest request = OperationWithContextParamRequest.builder()
                                                                                            .nestedMember(ChecksumStructure.builder().checksumMode("foo").build()).build();
                 builder.build().operationWithContextParam(request);
-            }, Expect.builder().error("Missing info").build()));
+            }, Expect.builder().error("Missing info").build()), new SyncTestCase("Has has undeclared input parameter",
+                                                                                 () -> {
+                                                                                     QueryClientBuilder builder = QueryClient.builder();
+                                                                                     builder.credentialsProvider(BaseRuleSetClientTest.CREDENTIALS_PROVIDER);
+                                                                                     builder.tokenProvider(BaseRuleSetClientTest.TOKEN_PROVIDER);
+                                                                                     builder.httpClient(getSyncHttpClient());
+                                                                                     APostOperationRequest request = APostOperationRequest.builder().build();
+                                                                                     builder.build().aPostOperation(request);
+                                                                                 }, Expect.builder().error("Missing info").build()));
     }
 
     private static List<AsyncTestCase> asyncTestCases() {
@@ -166,6 +174,14 @@ private static List<AsyncTestCase> asyncTestCases() {
                 OperationWithContextParamRequest request = OperationWithContextParamRequest.builder()
                                                                                            .nestedMember(ChecksumStructure.builder().checksumMode("foo").build()).build();
                 return builder.build().operationWithContextParam(request);
-            }, Expect.builder().error("Missing info").build()));
+            }, Expect.builder().error("Missing info").build()), new AsyncTestCase("Has has undeclared input parameter",
+                                                                                  () -> {
+                                                                                      QueryAsyncClientBuilder builder = QueryAsyncClient.builder();
+                                                                                      builder.credentialsProvider(BaseRuleSetClientTest.CREDENTIALS_PROVIDER);
+                                                                                      builder.tokenProvider(BaseRuleSetClientTest.TOKEN_PROVIDER);
+                                                                                      builder.httpClient(getAsyncHttpClient());
+                                                                                      APostOperationRequest request = APostOperationRequest.builder().build();
+                                                                                      return builder.build().aPostOperation(request);
+                                                                                  }, Expect.builder().error("Missing info").build()));
     }
 }