chore(codegen): use function supplier in RuntimeClientPlugin (#2470)

Author: trivikr

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsAuthPlugin.java

@@ -21,13 +21,15 @@
 import static software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin.Convention.HAS_MIDDLEWARE;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import software.amazon.smithy.aws.traits.ServiceTrait;
 import software.amazon.smithy.aws.traits.auth.SigV4Trait;
+import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.knowledge.TopDownIndex;
@@ -104,7 +106,9 @@ && isAwsService(s)
             RuntimeClientPlugin.builder()
                     .withConventions(AwsDependency.STS_MIDDLEWARE.dependency,
                             "StsAuth", HAS_CONFIG)
-                    .additionalResolveFunctionParameters("STSClient")
+                    .additionalResolveFunctionParamsSupplier((m, s, o) -> new HashMap<String, Object>() {{
+                        put("STSClient", Symbol.builder().name("STSClient").build());
+                    }})
                     .servicePredicate((m, s) -> testServiceId(s, "STS"))
                     .build(),
             RuntimeClientPlugin.builder()

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddEndpointDiscoveryPlugin.java

@@ -16,12 +16,14 @@
 package software.amazon.smithy.aws.typescript.codegen;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 import software.amazon.smithy.aws.traits.clientendpointdiscovery.ClientDiscoveredEndpointTrait;
 import software.amazon.smithy.aws.traits.clientendpointdiscovery.ClientEndpointDiscoveryTrait;
 import software.amazon.smithy.codegen.core.CodegenException;
+import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.OperationShape;
@@ -68,21 +70,29 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                         .withConventions(AwsDependency.MIDDLEWARE_ENDPOINT_DISCOVERY.dependency,
                                 "EndpointDiscovery", RuntimeClientPlugin.Convention.HAS_CONFIG)
                         // ToDo: The Endpoint Discovery Command Name needs to be read from ClientEndpointDiscoveryTrait.
-                        .additionalResolveFunctionParameters("DescribeEndpointsCommand")
+                        .additionalResolveFunctionParamsSupplier((m, s, o) -> new HashMap<String, Object>() {{
+                            put("DescribeEndpointsCommand", Symbol.builder().name("DescribeEndpointsCommand").build());
+                        }})
                         .servicePredicate((m, s) -> hasClientEndpointDiscovery(s))
                         .build(),
                 // ToDo: The value ClientDiscoveredEndpointTrait.isRequired() needs to be passed to Plugin instead
                 // of creating two functions Required and Optional. The map of identifiers also needs to be passed.
                 RuntimeClientPlugin.builder()
                         .withConventions(AwsDependency.MIDDLEWARE_ENDPOINT_DISCOVERY.dependency,
                                 "EndpointDiscoveryRequired", RuntimeClientPlugin.Convention.HAS_MIDDLEWARE)
-                        .additionalPluginFunctionParameters(new String[]{"clientStack", "options"})
+                        .additionalPluginFunctionParamsSupplier((m, s, o) -> new HashMap<String, Object>() {{
+                            put("clientStack", Symbol.builder().name("clientStack").build());
+                            put("options", Symbol.builder().name("options").build());
+                        }})
                         .operationPredicate((m, s, o) -> isClientDiscoveredEndpointRequired(s, o))
                         .build(),
                 RuntimeClientPlugin.builder()
                         .withConventions(AwsDependency.MIDDLEWARE_ENDPOINT_DISCOVERY.dependency,
                                 "EndpointDiscoveryOptional", RuntimeClientPlugin.Convention.HAS_MIDDLEWARE)
-                        .additionalPluginFunctionParameters(new String[]{"clientStack", "options"})
+                        .additionalPluginFunctionParamsSupplier((m, s, o) -> new HashMap<String, Object>() {{
+                            put("clientStack", Symbol.builder().name("clientStack").build());
+                            put("options", Symbol.builder().name("options").build());
+                        }})
                         .operationPredicate((m, s, o) -> isClientDiscoveredEndpointOptional(s, o))
                         .build()
         );