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

Jump to bottom

Add accountID into endpoint2.0 param binding #496

Merged
merged 2 commits into from
Feb 12, 2024
Merged

Add accountID into endpoint2.0 param binding #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49f04d1
Add accountID endpoint builtin and aid mode config
Jan 31, 2024
1c68c88
Modify endpoint builtin codegen
Feb 6, 2024
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
8 changes: 5 additions & 3 deletions ...src/main/java/software/amazon/smithy/go/codegen/auth/AuthParametersResolverGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static software.amazon.smithy.go.codegen.GoWriter.goTemplate;

import java.util.ArrayList;
import software.amazon.smithy.go.codegen.GoStdlibTypes;
import software.amazon.smithy.go.codegen.GoWriter;
import software.amazon.smithy.go.codegen.integration.ProtocolGenerator;
import software.amazon.smithy.utils.MapUtils;
Expand All @@ -42,7 +43,7 @@ public GoWriter.Writable generate() {
loadResolvers();

return goTemplate("""
func $name:L(operation string, input interface{}, options Options) $params:P {
func $name:L(ctx $context:T, operation string, input interface{}, options Options) $params:P {
params := &$params:T{
Operation: operation,
}
Expand All @@ -55,14 +56,15 @@ public GoWriter.Writable generate() {
MapUtils.of(
"name", FUNC_NAME,
"params", AuthParametersGenerator.STRUCT_SYMBOL,
"bindings", generateResolvers()
"bindings", generateResolvers(),
"context", GoStdlibTypes.Context.Context
));
}

private GoWriter.Writable generateResolvers() {
return (writer) -> {
for (var resolver: resolvers) {
writer.write("$T(params, input, options)", resolver.resolver());
writer.write("$T(ctx, params, input, options)", resolver.resolver());
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/software/amazon/smithy/go/codegen/auth/ResolveAuthSchemeMiddlewareGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private GoWriter.Writable generateFields() {

private GoWriter.Writable generateBody() {
return goTemplate("""
params := $1L(m.operation, getOperationInput(ctx), m.options)
params := $1L(ctx, m.operation, getOperationInput(ctx), m.options)
options, err := m.options.AuthSchemeResolver.ResolveAuthSchemes(ctx, params)
if err != nil {
return out, metadata, $2T("resolve auth scheme: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/software/amazon/smithy/go/codegen/endpoints/EndpointMiddlewareGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private GoWriter.Writable generateAssertResolver() {

private GoWriter.Writable generateResolveEndpoint() {
return goTemplate("""
params := bindEndpointParams(getOperationInput(ctx), m.options)
params := bindEndpointParams(ctx, getOperationInput(ctx), m.options)
endpt, err := m.options.EndpointResolverV2.ResolveEndpoint(ctx, *params)
if err != nil {
return out, metadata, $1T("failed to resolve service endpoint, %w", err)
Expand Down
4 changes: 3 additions & 1 deletion .../java/software/amazon/smithy/go/codegen/endpoints/EndpointParameterBindingsGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
import software.amazon.smithy.go.codegen.GoStdlibTypes;
import software.amazon.smithy.go.codegen.GoWriter;
import software.amazon.smithy.go.codegen.integration.ProtocolGenerator;
import software.amazon.smithy.rulesengine.language.syntax.parameters.Parameter;
Expand Down Expand Up @@ -56,7 +57,7 @@ public GoWriter.Writable generate() {
bindEndpointParams(*EndpointParameters)
}

func bindEndpointParams(input interface{}, options Options) *EndpointParameters {
func bindEndpointParams(ctx $context:T, input interface{}, options Options) *EndpointParameters {
params := &EndpointParameters{}

$builtinBindings:W
Expand All @@ -71,6 +72,7 @@ func bindEndpointParams(input interface{}, options Options) *EndpointParameters
}
""",
MapUtils.of(
"context", GoStdlibTypes.Context.Context,
"builtinBindings", generateBuiltinBindings(),
"clientContextBindings", generateClientContextBindings()
));
Expand Down
Loading