refactor/regen for upstream endpoint middleware/binding changes (#2293)

aws · Oct 27, 2023 · 53337e2 · 53337e2
1 parent 6cb7073
commit 53337e2
Show file tree

Hide file tree

Showing 225 changed files with 1,818 additions and 30,427 deletions.
diff --git a/...n/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java b/...n/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointAuthSchemeGenerator.java
@@ -25,7 +25,6 @@
 import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.integration.GoIntegration;
 import software.amazon.smithy.model.Model;
-import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
 
 
@@ -37,9 +36,7 @@
 public class AwsEndpointAuthSchemeGenerator implements GoIntegration {
 
     @Override
-    public void renderPostEndpointResolutionHook(
-        GoSettings settings, GoWriter writer, Model model, Optional<OperationShape> operation
-    ) {
+    public void renderPostEndpointResolutionHook(GoSettings settings, GoWriter writer, Model model) {
         ServiceShape serviceShape = settings.getService(model);
         writer.write(
             """
@@ -100,7 +97,7 @@ private GoWriter.Writable generateAuthSchemeDetection(ServiceShape serviceShape)
                         if $T(err, &nfe) {
                             // if no auth scheme is found, default to sigv4
                             signingName := \"$L\"
-                            signingRegion := m.BuiltInResolver.(*$L).Region
+                            signingRegion := *params.Region
                             ctx = $T(ctx, signingName)
                             ctx = $T(ctx, signingRegion)
                             $W
@@ -119,7 +116,6 @@ private GoWriter.Writable generateAuthSchemeDetection(ServiceShape serviceShape)
                 SymbolUtils.createPointableSymbolBuilder("NoAuthenticationSchemesFoundError", AwsGoDependency.INTERNAL_AUTH).build(),
                 SymbolUtils.createValueSymbolBuilder("As", SmithyGoDependency.ERRORS).build(),
                 signingNameDefault,
-                AwsEndpointResolverBuiltInGenerator.BUILTIN_RESOLVER_IMPLEMENTATION_TYPE,
                 SymbolUtils.createValueSymbolBuilder("SetSigningName", AwsGoDependency.AWS_MIDDLEWARE).build(),
                 SymbolUtils.createValueSymbolBuilder("SetSigningRegion", AwsGoDependency.AWS_MIDDLEWARE).build(),
                 signerVersion,
@@ -165,7 +161,7 @@ private GoWriter.Writable generateSigV4Resolution(ServiceShape serviceShape) {
                         signingName = *v4Scheme.SigningName
                     }
                     if v4Scheme.SigningRegion == nil {
-                        signingRegion = m.BuiltInResolver.(*$L).Region
+                        signingRegion = *params.Region
                     } else {
                         signingRegion = *v4Scheme.SigningRegion
                     }
@@ -181,7 +177,6 @@ private GoWriter.Writable generateSigV4Resolution(ServiceShape serviceShape) {
                 """,
                 SymbolUtils.createPointableSymbolBuilder("AuthenticationSchemeV4", AwsGoDependency.INTERNAL_AUTH).build(),
                 signingNameDefault,
-                AwsEndpointResolverBuiltInGenerator.BUILTIN_RESOLVER_IMPLEMENTATION_TYPE,
                 SymbolUtils.createValueSymbolBuilder("SetDisableDoubleEncoding", AwsGoDependency.INTERNAL_AUTH).build(),
                 SymbolUtils.createValueSymbolBuilder("SetSigningName", AwsGoDependency.AWS_MIDDLEWARE).build(),
                 SymbolUtils.createValueSymbolBuilder("SetSigningRegion", AwsGoDependency.AWS_MIDDLEWARE).build(),

diff --git a/...-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointGenerator.java b/...-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsEndpointGenerator.java
@@ -17,14 +17,12 @@
 
 import java.util.List;
 import java.util.function.Consumer;
-import software.amazon.smithy.aws.go.codegen.customization.S3ModelUtils;
 import software.amazon.smithy.aws.traits.ServiceTrait;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.go.codegen.GoSettings;
 import software.amazon.smithy.go.codegen.GoWriter;
 import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.TriConsumer;
-import software.amazon.smithy.go.codegen.endpoints.EndpointResolutionGenerator;
 import software.amazon.smithy.go.codegen.integration.ConfigField;
 import software.amazon.smithy.go.codegen.integration.ConfigFieldResolver;
 import software.amazon.smithy.go.codegen.integration.GoIntegration;