BREAKFIX: Only generate AccountIDEndpointMode config for services tha…

…t use it (#2795)
aws · Sep 17, 2024 · 6a28d22 · 6a28d22
1 parent 0d08ea0
commit 6a28d22
Show file tree

Hide file tree

Showing 1,174 changed files with 3,890 additions and 13,892 deletions.
diff --git a/.changelog/28f542b4288d47b982b4261b8f5f6530.json b/.changelog/28f542b4288d47b982b4261b8f5f6530.json
diff --git a/...ws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java b/...ws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AddAwsConfigFields.java
@@ -24,6 +24,7 @@
 import java.util.function.BiPredicate;
 import java.util.logging.Logger;
 
+import software.amazon.smithy.aws.go.codegen.customization.AccountIDEndpointRouting;
 import software.amazon.smithy.aws.go.codegen.customization.auth.AwsHttpBearerAuthScheme;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.codegen.core.SymbolProvider;
@@ -242,6 +243,7 @@ public class AddAwsConfigFields implements GoIntegration {
                     .name(SDK_ACCOUNTID_ENDPOINT_MODE)
                     .type(SdkGoTypes.Aws.AccountIDEndpointMode)
                     .documentation("Indicates how aws account ID is applied in endpoint2.0 routing")
+                    .servicePredicate(AccountIDEndpointRouting::hasAccountIdEndpoints)
                     .build()
     );
 

diff --git a/...in/java/software/amazon/smithy/aws/go/codegen/customization/AccountIDEndpointRouting.java b/...in/java/software/amazon/smithy/aws/go/codegen/customization/AccountIDEndpointRouting.java
@@ -9,6 +9,8 @@
 import software.amazon.smithy.go.codegen.integration.GoIntegration;
 import software.amazon.smithy.go.codegen.SmithyGoTypes;
 import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.rulesengine.language.syntax.Identifier;
 import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
 import software.amazon.smithy.utils.MapUtils;
 
@@ -17,6 +19,10 @@
 public class AccountIDEndpointRouting implements GoIntegration {
     @Override
     public void renderPreEndpointResolutionHook(GoSettings settings, GoWriter writer, Model model) {
+        if (!hasAccountIdEndpoints(model, settings.getService(model))) {
+            return;
+        }
+
         writer.write("""
                 if err := checkAccountID(getIdentity(ctx), m.options.AccountIDEndpointMode); err != nil {
                     return out, metadata, $T("invalid accountID set: %w", err)
@@ -32,9 +38,10 @@ public void writeAdditionalFiles(
             SymbolProvider symbolProvider,
             GoDelegator goDelegator
     ) {
-        if (!settings.getService(model).hasTrait(EndpointRuleSetTrait.class)) {
+        if (!hasAccountIdEndpoints(model, settings.getService(model))) {
             return;
         }
+
         goDelegator.useShapeWriter(settings.getService(model), goTemplate("""
         func checkAccountID(identity $auth:T, mode $accountIDEndpointMode:T) error {
             switch mode {
@@ -67,4 +74,19 @@ func checkAccountID(identity $auth:T, mode $accountIDEndpointMode:T) error {
         )
         ));
     }
+
+    public static boolean hasAccountIdEndpoints(Model model, ServiceShape service) {
+        if (!service.hasTrait(EndpointRuleSetTrait.class)) {
+            return false;
+        }
+
+        var rules = service.expectTrait(EndpointRuleSetTrait.class).getEndpointRuleSet();
+        for (var param : rules.getParameters()) {
+            if (param.getBuiltIn().orElse("").equals("AWS::Auth::AccountId")) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
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/jsonrpc/api_client.go b/internal/protocoltest/jsonrpc/api_client.go
diff --git a/internal/protocoltest/jsonrpc/options.go b/internal/protocoltest/jsonrpc/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/internal/protocoltest/smithyrpcv2cbor/api_client.go b/internal/protocoltest/smithyrpcv2cbor/api_client.go
diff --git a/internal/protocoltest/smithyrpcv2cbor/options.go b/internal/protocoltest/smithyrpcv2cbor/options.go
diff --git a/service/accessanalyzer/api_client.go b/service/accessanalyzer/api_client.go
diff --git a/service/accessanalyzer/endpoints.go b/service/accessanalyzer/endpoints.go
diff --git a/service/accessanalyzer/options.go b/service/accessanalyzer/options.go
diff --git a/service/account/api_client.go b/service/account/api_client.go
diff --git a/service/account/endpoints.go b/service/account/endpoints.go
diff --git a/service/account/options.go b/service/account/options.go