Skip to content
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

feat(endpoint): expose static endpoint param instructions provider #590

Merged
merged 2 commits into from
Sep 19, 2022
Merged

feat(endpoint): expose static endpoint param instructions provider #590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb15df5
feat(endpoint): expose static endpoint param instructions provider
kuhe Sep 16, 2022
940b168
feat(endpoint): rename instructions method on commands to be more spe…
kuhe Sep 19, 2022
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
107 changes: 65 additions & 42 deletions ...ipt-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CommandGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,26 +119,31 @@ private void generateClientCommand() {
String name = symbol.getName();
writer.writeShapeDocs(operation, shapeDoc -> shapeDoc + "\n" + getCommandExample(serviceSymbol.getName(),
configType, name, inputType.getName(), outputType.getName()));
writer.openBlock("export class $L extends $$Command<$T, $T, $L> {", "}", name, inputType, outputType,
configType, () -> {

// Section for adding custom command properties.
writer.write("// Start section: $L", COMMAND_PROPERTIES_SECTION);
writer.pushState(COMMAND_PROPERTIES_SECTION).popState();
writer.write("// End section: $L", COMMAND_PROPERTIES_SECTION);
writer.write("");

generateCommandConstructor();
writer.write("");
generateCommandMiddlewareResolver(configType);
writeSerde();

// Hook for adding more methods to the command.
writer.write("// Start section: $L", COMMAND_BODY_EXTRA_SECTION)
writer.openBlock(
"export class $L extends $$Command<$T, $T, $L> {", "}",
name, inputType, outputType,
configType, () -> {

// Section for adding custom command properties.
writer.write("// Start section: $L", COMMAND_PROPERTIES_SECTION);
writer.pushState(COMMAND_PROPERTIES_SECTION).popState();
writer.write("// End section: $L", COMMAND_PROPERTIES_SECTION);
writer.write("");
generateEndpointParameterInstructionProvider();
writer.write("");

generateCommandConstructor();
writer.write("");
generateCommandMiddlewareResolver(configType);
writeSerde();

// Hook for adding more methods to the command.
writer.write("// Start section: $L", COMMAND_BODY_EXTRA_SECTION)
.pushState(COMMAND_BODY_EXTRA_SECTION)
.popState()
.write("// End section: $L", COMMAND_BODY_EXTRA_SECTION);
});
}
);
}

private String getCommandExample(String serviceName, String configName, String commandName, String commandInput,
Expand Down Expand Up @@ -172,32 +177,16 @@ private void generateCommandConstructor() {
});
}

private void generateCommandMiddlewareResolver(String configType) {
Symbol serde = TypeScriptDependency.MIDDLEWARE_SERDE.createSymbol("getSerdePlugin");
writer.writeDocs("@internal");
writer.write("resolveMiddleware(")
.indent()
.write("clientStack: MiddlewareStack<$L, $L>,", "ServiceInputTypes", "ServiceOutputTypes")
.write("configuration: $L,", configType)
.write("options?: $T", applicationProtocol.getOptionsType())
.dedent();
writer.openBlock("): Handler<$T, $T> {", "}", inputType, outputType, () -> {
// Add serialization and deserialization plugin.
writer.write("this.middlewareStack.use($T(configuration, this.serialize, this.deserialize));", serde);

// Add customizations.
addCommandSpecificPlugins();

// EndpointsV2
if (service.hasTrait(EndpointRuleSetTrait.class)) {
writer.addImport(
"getEndpointPlugin",
"getEndpointPlugin",
"@aws-sdk/middleware-endpoint"
);
private void generateEndpointParameterInstructionProvider() {
if (!service.hasTrait(EndpointRuleSetTrait.class)) {
return;
}
writer.addImport("EndpointParameterInstructions", null, "@aws-sdk/middleware-endpoint");
writer.openBlock(
"public static getEndpointParameterInstructions(): EndpointParameterInstructions {", "}",
() -> {
writer.openBlock(
"this.middlewareStack.use(getEndpointPlugin(configuration, {",
"}));",
"return {", "};",
() -> {
RuleSetParameterFinder parameterFinder = new RuleSetParameterFinder(service);
parameterFinder.getBuiltInParams().forEach((name, type) -> {
Expand Down Expand Up @@ -227,6 +216,40 @@ private void generateCommandMiddlewareResolver(String configType) {
}
);
}
);
}

private void generateCommandMiddlewareResolver(String configType) {
Symbol serde = TypeScriptDependency.MIDDLEWARE_SERDE.createSymbol("getSerdePlugin");
writer.writeDocs("@internal");
writer.write("resolveMiddleware(")
.indent()
.write("clientStack: MiddlewareStack<$L, $L>,", "ServiceInputTypes", "ServiceOutputTypes")
.write("configuration: $L,", configType)
.write("options?: $T", applicationProtocol.getOptionsType())
.dedent();
writer.openBlock("): Handler<$T, $T> {", "}", inputType, outputType, () -> {
// Add serialization and deserialization plugin.
writer.write("this.middlewareStack.use($T(configuration, this.serialize, this.deserialize));", serde);

// Add customizations.
addCommandSpecificPlugins();

// EndpointsV2
if (service.hasTrait(EndpointRuleSetTrait.class)) {
writer.addImport(
"getEndpointPlugin",
"getEndpointPlugin",
"@aws-sdk/middleware-endpoint"
);
writer.openBlock(
"this.middlewareStack.use(getEndpointPlugin(configuration, ",
"));",
() -> {
writer.write("$L.getEndpointParameterInstructions()", symbol.getName());
}
);
}

// Resolve the middleware stack.
writer.write("\nconst stack = clientStack.concat(this.middlewareStack);\n");
Expand Down