Fix host prefix bug (#2200)

aws · Jul 27, 2023 · a1a9884 · a1a9884
1 parent c23800d
commit a1a9884
Show file tree

Hide file tree

Showing 230 changed files with 668 additions and 941 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,6 +25,7 @@
 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;
 
 
@@ -36,7 +37,9 @@
 public class AwsEndpointAuthSchemeGenerator implements GoIntegration {
 
     @Override
-    public void renderPostEndpointResolutionHook(GoSettings settings, GoWriter writer, Model model) {
+    public void renderPostEndpointResolutionHook(
+        GoSettings settings, GoWriter writer, Model model, Optional<OperationShape> operation
+    ) {
         ServiceShape serviceShape = settings.getService(model);
         writer.write(
             """

diff --git a/...-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointDisableHttps.java b/...-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/EndpointDisableHttps.java
@@ -47,7 +47,7 @@ public class EndpointDisableHttps implements GoIntegration {
 
         private final List<RuntimeClientPlugin> runtimeClientPlugins = new ArrayList<>();
 
-        public static final String MIDDLEWARE_ID = "EndpointDisableHTTPSMiddleware";
+        public static final String MIDDLEWARE_ID = "endpointDisableHTTPSMiddleware";
         public static final String MIDDLEWARE_ADDER = String.format("add%s", MIDDLEWARE_ID);
 
         /**

diff --git a/...egen/src/main/java/software/amazon/smithy/aws/go/codegen/LegacyEndpointContextSetter.java b/...egen/src/main/java/software/amazon/smithy/aws/go/codegen/LegacyEndpointContextSetter.java
@@ -20,7 +20,7 @@ public class LegacyEndpointContextSetter implements GoIntegration {
 
     private final List<RuntimeClientPlugin> runtimeClientPlugins = new ArrayList<>();
 
-    public static final String MIDDLEWARE_ID = "LegacyEndpointContextSetter";
+    public static final String MIDDLEWARE_ID = "legacyEndpointContextSetter";
     public static final String MIDDLEWARE_ADDER = String.format("add%s", MIDDLEWARE_ID);
 
     /**

diff --git a/...n/java/software/amazon/smithy/aws/go/codegen/customization/DisableEndpointHostPrefix.java b/...n/java/software/amazon/smithy/aws/go/codegen/customization/DisableEndpointHostPrefix.java
@@ -1,21 +1,45 @@
 package software.amazon.smithy.aws.go.codegen.customization;
 
+import java.util.Optional;
+
+
 import software.amazon.smithy.go.codegen.GoSettings;
 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.integration.GoIntegration;
 import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.pattern.SmithyPattern.Segment;
+import software.amazon.smithy.model.traits.EndpointTrait;
+import software.amazon.smithy.model.shapes.OperationShape;
+
 
 public class DisableEndpointHostPrefix implements GoIntegration {
     @Override
-    public void renderPostEndpointResolutionHook(GoSettings settings, GoWriter writer, Model model) {
-        writer.write(
-            """
-            ctx = $T(ctx, true)
-            """,
-            SymbolUtils.createPointableSymbolBuilder("DisableEndpointHostPrefix", SmithyGoDependency.SMITHY_HTTP_TRANSPORT).build()
-        );
+    public void renderPostEndpointResolutionHook(
+        GoSettings settings, GoWriter writer, Model model, Optional<OperationShape> operation
+    ) {
+        if (!S3ModelUtils.isServiceS3Control(model, settings.getService(model))) {
+            return;
+        }
+
+        if (operation.isPresent() && operation.get().getTrait(EndpointTrait.class).isPresent()) {
+            EndpointTrait endpointTrait = operation.get().getTrait(EndpointTrait.class).get();
+            boolean written = false;
+            for (Segment segment : endpointTrait.getHostPrefix().getLabels()) {
+                if (segment.isLabel() && segment.getContent().equals("AccountId") && !written) {
+                    writer.write(
+                        """
+                        ctx = $T(ctx, true)
+                        """,
+                        SymbolUtils.createPointableSymbolBuilder(
+                            "DisableEndpointHostPrefix", SmithyGoDependency.SMITHY_HTTP_TRANSPORT).build()
+                    );
+                    // we only want the content above written ONCE per operation.
+                    written = true;
+                }
+            }
+        }
     }
 
 }
diff --git a/...n/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration b/...n/resources/META-INF/services/software.amazon.smithy.go.codegen.integration.GoIntegration
@@ -54,11 +54,11 @@ software.amazon.smithy.aws.go.codegen.AwsEndpointResolverInitializerGenerator
 software.amazon.smithy.aws.go.codegen.AwsEndpointResolverBuiltInGenerator
 software.amazon.smithy.aws.go.codegen.customization.S3HttpPathBucketFilterIntegration
 software.amazon.smithy.aws.go.codegen.customization.S3HttpLabelBucketFilterIntegration
-software.amazon.smithy.aws.go.codegen.customization.DisableEndpointHostPrefix
 software.amazon.smithy.aws.go.codegen.AwsEndpointAuthSchemeGenerator
 software.amazon.smithy.aws.go.codegen.EndpointDisableHttps
 software.amazon.smithy.aws.go.codegen.customization.S3Bucketer
 software.amazon.smithy.aws.go.codegen.customization.S3SerializeImmutableHostnameBucket
 software.amazon.smithy.aws.go.codegen.customization.S3UpdateOutpostArn
 software.amazon.smithy.aws.go.codegen.LegacyEndpointContextSetter
+software.amazon.smithy.aws.go.codegen.customization.DisableEndpointHostPrefix
 
diff --git a/service/eventbridge/api_client.go b/service/eventbridge/api_client.go
diff --git a/service/eventbridge/api_op_ActivateEventSource.go b/service/eventbridge/api_op_ActivateEventSource.go
diff --git a/service/eventbridge/api_op_CancelReplay.go b/service/eventbridge/api_op_CancelReplay.go
diff --git a/service/eventbridge/api_op_CreateApiDestination.go b/service/eventbridge/api_op_CreateApiDestination.go
diff --git a/service/eventbridge/api_op_CreateArchive.go b/service/eventbridge/api_op_CreateArchive.go
diff --git a/service/eventbridge/api_op_CreateConnection.go b/service/eventbridge/api_op_CreateConnection.go
diff --git a/service/eventbridge/api_op_CreateEndpoint.go b/service/eventbridge/api_op_CreateEndpoint.go
diff --git a/service/eventbridge/api_op_CreateEventBus.go b/service/eventbridge/api_op_CreateEventBus.go
diff --git a/service/eventbridge/api_op_CreatePartnerEventSource.go b/service/eventbridge/api_op_CreatePartnerEventSource.go