Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 25, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99d461b
chore: switch to use function supplier in runtime client plugin
trivikr Jun 6, 2021
52576ef
chore: use Symbol for variables in function parameters
trivikr Jun 7, 2021
ca062d4
chore: add additional prefix to resolve/plugin function params supplier
trivikr Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsAuthPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down
16 changes: 13 additions & 3 deletions ...c/main/java/software/amazon/smithy/aws/typescript/codegen/AddEndpointDiscoveryPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
);
Expand Down