Add accountID into endpoint2.0 param binding (#496)

* Add accountID endpoint builtin and aid mode config * Modify endpoint builtin codegen --------- Co-authored-by: Tianyi Wang <wty@amazon.com>
aws · Feb 12, 2024 · 9653bca · 9653bca
1 parent daa9e2b
commit 9653bca
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/...src/main/java/software/amazon/smithy/go/codegen/auth/AuthParametersResolverGenerator.java b/...src/main/java/software/amazon/smithy/go/codegen/auth/AuthParametersResolverGenerator.java
@@ -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;
@@ -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,
                     }
@@ -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());
             }
         };
     }

diff --git a/...ain/java/software/amazon/smithy/go/codegen/auth/ResolveAuthSchemeMiddlewareGenerator.java b/...ain/java/software/amazon/smithy/go/codegen/auth/ResolveAuthSchemeMiddlewareGenerator.java
@@ -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)

diff --git a/...rc/main/java/software/amazon/smithy/go/codegen/endpoints/EndpointMiddlewareGenerator.java b/...rc/main/java/software/amazon/smithy/go/codegen/endpoints/EndpointMiddlewareGenerator.java
@@ -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)

diff --git a/.../java/software/amazon/smithy/go/codegen/endpoints/EndpointParameterBindingsGenerator.java b/.../java/software/amazon/smithy/go/codegen/endpoints/EndpointParameterBindingsGenerator.java
@@ -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;
@@ -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
@@ -71,6 +72,7 @@ func bindEndpointParams(input interface{}, options Options) *EndpointParameters
                 }
                 """,
                 MapUtils.of(
+                        "context", GoStdlibTypes.Context.Context,
                         "builtinBindings", generateBuiltinBindings(),
                         "clientContextBindings", generateClientContextBindings()
                 ));