fix plumbing for event streams and endpoint discovery (#2362)

aws · Nov 10, 2023 · 096c09e · 096c09e
1 parent d0b37b2
commit 096c09e
Show file tree

Hide file tree

Showing 92 changed files with 477 additions and 334 deletions.
diff --git a/aws/signer/v4/middleware.go b/aws/signer/v4/middleware.go
@@ -319,7 +319,7 @@ type streamingEventsPayload struct{}
 
 // AddStreamingEventsPayload adds the streamingEventsPayload middleware to the stack.
 func AddStreamingEventsPayload(stack *middleware.Stack) error {
-	return stack.Finalize.Add(&streamingEventsPayload{}, middleware.After)
+	return stack.Finalize.Add(&streamingEventsPayload{}, middleware.Before)
 }
 
 func (s *streamingEventsPayload) ID() string {

diff --git a/...s-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEventStreamUtils.java b/...s-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEventStreamUtils.java
@@ -13,10 +13,12 @@
 import software.amazon.smithy.go.codegen.GoEventStreamIndex;
 import software.amazon.smithy.go.codegen.GoSettings;
 import software.amazon.smithy.go.codegen.GoStackStepMiddlewareGenerator;
+import software.amazon.smithy.go.codegen.GoStdlibTypes;
 import software.amazon.smithy.go.codegen.GoValueAccessUtils;
 import software.amazon.smithy.go.codegen.GoWriter;
 import software.amazon.smithy.go.codegen.MiddlewareIdentifier;
 import software.amazon.smithy.go.codegen.SmithyGoDependency;
+import software.amazon.smithy.go.codegen.SmithyGoTypes;
 import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.integration.ProtocolGenerator.GenerationContext;
 import software.amazon.smithy.go.codegen.knowledge.GoPointableIndex;
@@ -42,6 +44,7 @@
 import software.amazon.smithy.model.traits.EventHeaderTrait;
 import software.amazon.smithy.model.traits.EventPayloadTrait;
 import software.amazon.smithy.model.traits.HttpTrait;
+import software.amazon.smithy.utils.MapUtils;
 import software.amazon.smithy.utils.StringUtils;
 
 public final class AwsEventStreamUtils {
@@ -306,26 +309,46 @@ defer func() {
                                 """, getEventStreamApiSymbol("ApplyHTTPTransportFixes"))
                                 .write("");
 
-                        w.write("""
-                                 requestSignature, err := $T(request.Request)
-                                 if err != nil {
-                                    return out, metadata, $T("failed to get event stream seed signature: %v", err)
+                        w.writeGoTemplate("""
+                                requestSignature, err := $getSignature:T(request.Request)
+                                if err != nil {
+                                   return out, metadata, $errorf:T("failed to get event stream seed signature: %v", err)
+                                }
+
+                                identity := getIdentity(ctx)
+                                if identity == nil {
+                                    return out, metadata, $errorf:T("no identity")
+                                }
+
+                                creds, ok := identity.($credentialsAdapter:P)
+                                if !ok {
+                                    return out, metadata, $errorf:T("identity is not sigv4 credentials")
+                                }
+
+                                rscheme := getResolvedAuthScheme(ctx)
+                                if rscheme == nil {
+                                    return out, metadata, $errorf:T("no resolved auth scheme")
+                                }
+
+                                name, ok := $getSigningName:T(&rscheme.SignerProperties)
+                                if !ok {
+                                    return out, metadata, $errorf:T("no sigv4 signing name")
                                 }
-                                 """, getSignedRequestSignature, errorf).write("")
-                                .openBlock("signer := $T(", ")", getSymbol("NewStreamSigner",
-                                        AwsGoDependency.AWS_SIGNER_V4, false), () -> w
-                                        .write("""
-                                               $T(ctx),
-                                               $T(ctx),
-                                               $T(ctx),
-                                               requestSignature,
-                                               """, getSymbol("GetSigningCredentials",
-                                                        AwsGoDependency.AWS_MIDDLEWARE, false),
-                                                getSymbol("GetSigningName",
-                                                        AwsGoDependency.AWS_MIDDLEWARE, false),
-                                                getSymbol("GetSigningRegion",
-                                                        AwsGoDependency.AWS_MIDDLEWARE, false)
-                                        )).write("");
+
+                                region, ok := $getSigningRegion:T(&rscheme.SignerProperties)
+                                if !ok {
+                                    return out, metadata, $errorf:T("no sigv4 signing region")
+                                }
+
+                                signer := v4.NewStreamSigner(creds.Credentials, name, region, requestSignature)
+                                """,
+                                MapUtils.of(
+                                        "getSignature", getSignedRequestSignature,
+                                        "errorf", GoStdlibTypes.Fmt.Errorf,
+                                        "credentialsAdapter", SdkGoTypes.Internal.Auth.Smithy.CredentialsAdapter,
+                                        "getSigningName", SmithyGoTypes.Transport.Http.GetSigV4SigningName,
+                                        "getSigningRegion", SmithyGoTypes.Transport.Http.GetSigV4SigningRegion
+                                ));
 
                         var events = inputInfo.get().getEventStreamTarget().asUnionShape()
                                 .get();

diff --git a/...degen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointDiscoveryGenerator.java b/...degen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointDiscoveryGenerator.java
@@ -16,6 +16,7 @@
 import software.amazon.smithy.go.codegen.GoWriter;
 import software.amazon.smithy.go.codegen.SmithyGoDependency;
 import software.amazon.smithy.go.codegen.SymbolUtils;
+import software.amazon.smithy.go.codegen.endpoints.EndpointMiddlewareGenerator;
 import software.amazon.smithy.go.codegen.integration.ClientMember;
 import software.amazon.smithy.go.codegen.integration.ClientMemberResolver;
 import software.amazon.smithy.go.codegen.integration.ConfigField;
@@ -169,9 +170,9 @@ private static void generateAddDiscoverEndpointMiddleware(
                     writer.addUseImports(SmithyGoDependency.SMITHY_MIDDLEWARE);
 
                     String closeBlock = String.format("}, \"%s\", middleware.After)",
-                            EndpointGenerator.MIDDLEWARE_NAME);
+                            EndpointMiddlewareGenerator.MIDDLEWARE_ID);
 
-                    writer.openBlock("return stack.Serialize.Insert(&$T{", closeBlock, DISCOVERY_MIDDLEWARE, () -> {
+                    writer.openBlock("return stack.Finalize.Insert(&$T{", closeBlock, DISCOVERY_MIDDLEWARE, () -> {
                         writer.openBlock("Options: []func($P){", "},", DISCOVERY_ENDPOINT_OPTIONS, () -> {
                             writer.openBlock("func (opt $P) {", "},", DISCOVERY_ENDPOINT_OPTIONS, () -> {
                                 writer.write("opt.$L = o.EndpointOptions.$L", DISABLE_HTTPS, DISABLE_HTTPS);
@@ -328,9 +329,10 @@ private static void generateFetchDiscoveredEndpointFunction(
 
         writer.addUseImports(SmithyGoDependency.CONTEXT);
         writer.openBlock(
-                "func (c *Client) $L(ctx context.Context, input interface{}, optFns ...func($P)) ($T, error) {", "}",
+                "func (c *Client) $L(ctx context.Context, optFns ...func($P)) ($T, error) {", "}",
                 fetchDiscoveredEndpointFuncName, DISCOVERY_ENDPOINT_OPTIONS, DISCOVERY_ENDPOINT_WEIGHTED_ADDRESS,
                 () -> {
+                    writer.write("input := getOperationInput(ctx)");
                     writer.write("in, ok := input.($P)", symbolProvider.toSymbol(inputShape));
                     writer.openBlock("if !ok {", "}", () -> {
                         writer.addUseImports(SmithyGoDependency.FMT);

diff --git a/.../software/amazon/smithy/aws/go/codegen/customization/auth/IgnoreAnonymousCredentials.java b/.../software/amazon/smithy/aws/go/codegen/customization/auth/IgnoreAnonymousCredentials.java
@@ -16,6 +16,7 @@
 package software.amazon.smithy.aws.go.codegen.customization.auth;
 
 import software.amazon.smithy.aws.go.codegen.SdkGoTypes;
+import software.amazon.smithy.aws.traits.auth.SigV4Trait;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.go.codegen.GoDelegator;
 import software.amazon.smithy.go.codegen.GoSettings;
@@ -24,6 +25,7 @@
 import software.amazon.smithy.go.codegen.integration.GoIntegration;
 import software.amazon.smithy.go.codegen.integration.RuntimeClientPlugin;
 import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.utils.ListUtils;
 
 import java.util.List;
@@ -42,10 +44,15 @@ public class IgnoreAnonymousCredentials implements GoIntegration {
             .resolver(buildPackageSymbol("ignoreAnonymousAuth"))
             .build();
 
+    private static boolean hasCredentials(Model model, ServiceShape service) {
+        return service.hasTrait(SigV4Trait.class) || service.hasTrait(SigV4Trait.class);
+    }
+
     @Override
     public List<RuntimeClientPlugin> getClientPlugins() {
         return ListUtils.of(
                 RuntimeClientPlugin.builder()
+                        .servicePredicate(IgnoreAnonymousCredentials::hasCredentials)
                         .addConfigFieldResolver(IGNORE_ANONYMOUS_AUTH)
                         .build()
         );
@@ -55,7 +62,9 @@ public List<RuntimeClientPlugin> getClientPlugins() {
     public void writeAdditionalFiles(
             GoSettings settings, Model model, SymbolProvider symbolProvider, GoDelegator goDelegator
     ) {
-        goDelegator.useFileWriter("options.go", settings.getModuleName(), generateResolver());
+        if (hasCredentials(model, settings.getService(model))) {
+            goDelegator.useFileWriter("options.go", settings.getModuleName(), generateResolver());
+        }
     }
 
     private GoWriter.Writable generateResolver() {

diff --git a/internal/protocoltest/awsrestjson/api_client.go b/internal/protocoltest/awsrestjson/api_client.go
diff --git a/internal/protocoltest/awsrestjson/options.go b/internal/protocoltest/awsrestjson/options.go
diff --git a/internal/protocoltest/ec2query/api_client.go b/internal/protocoltest/ec2query/api_client.go
diff --git a/internal/protocoltest/ec2query/options.go b/internal/protocoltest/ec2query/options.go
diff --git a/internal/protocoltest/jsonrpc10/api_client.go b/internal/protocoltest/jsonrpc10/api_client.go
diff --git a/internal/protocoltest/jsonrpc10/options.go b/internal/protocoltest/jsonrpc10/options.go
diff --git a/internal/protocoltest/query/api_client.go b/internal/protocoltest/query/api_client.go
diff --git a/internal/protocoltest/query/options.go b/internal/protocoltest/query/options.go
diff --git a/internal/protocoltest/restxml/api_client.go b/internal/protocoltest/restxml/api_client.go
diff --git a/internal/protocoltest/restxml/options.go b/internal/protocoltest/restxml/options.go
diff --git a/internal/protocoltest/restxmlwithnamespace/api_client.go b/internal/protocoltest/restxmlwithnamespace/api_client.go
diff --git a/internal/protocoltest/restxmlwithnamespace/options.go b/internal/protocoltest/restxmlwithnamespace/options.go
diff --git a/service/apigateway/internal/customizations/unit_test.go b/service/apigateway/internal/customizations/unit_test.go
@@ -54,6 +54,7 @@ func Test_EmptyResponse(t *testing.T) {
 				Retryer: func() aws.Retryer {
 					return aws.NopRetryer{}
 				},
+				Credentials: &fakeCredentials{},
 			}
 
 			client := apigateway.NewFromConfig(cfg)
@@ -79,3 +80,9 @@ func Test_EmptyResponse(t *testing.T) {
 		})
 	}
 }
+
+type fakeCredentials struct{}
+
+func (*fakeCredentials) Retrieve(_ context.Context) (aws.Credentials, error) {
+	return aws.Credentials{}, nil
+}
diff --git a/service/codecatalyst/api_client.go b/service/codecatalyst/api_client.go
diff --git a/service/codecatalyst/options.go b/service/codecatalyst/options.go
diff --git a/service/dynamodb/api_op_BatchGetItem.go b/service/dynamodb/api_op_BatchGetItem.go
diff --git a/service/dynamodb/api_op_BatchWriteItem.go b/service/dynamodb/api_op_BatchWriteItem.go
diff --git a/service/dynamodb/api_op_CreateBackup.go b/service/dynamodb/api_op_CreateBackup.go