Adds account ID as a built-in endpoint parameter (#4016)

Author: cenedhryn

codegen/src/main/java/software/amazon/awssdk/codegen/model/rules/endpoints/BuiltInParameter.java

@@ -23,6 +23,7 @@ public enum BuiltInParameter {
     AWS_USE_DUAL_STACK,
     AWS_USE_FIPS,
     SDK_ENDPOINT,
+    AWS_AUTH_ACCOUNT_ID,
     AWS_STS_USE_GLOBAL_ENDPOINT,
     AWS_S3_FORCE_PATH_STYLE,
     AWS_S3_ACCELERATE,
@@ -43,6 +44,8 @@ public static BuiltInParameter fromValue(String s) {
                 return AWS_USE_FIPS;
             case "sdk::endpoint":
                 return SDK_ENDPOINT;
+            case "aws::auth::accountid":
+                return AWS_AUTH_ACCOUNT_ID;
             case "aws::sts::useglobalendpoint":
                 return AWS_STS_USE_GLOBAL_ENDPOINT;
             case "aws::s3::forcepathstyle":

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java

@@ -287,6 +287,9 @@ private MethodSpec ruleParams() {
                 case SDK_ENDPOINT:
                     builtInFn = "endpointBuiltIn";
                     break;
+                case AWS_AUTH_ACCOUNT_ID:
+                    builtInFn = "accountIdBuiltIn";
+                    break;
                 case AWS_S3_USE_GLOBAL_ENDPOINT:
                     builtInFn = "useGlobalEndpointBuiltIn";
                     break;

codegen/src/main/resources/software/amazon/awssdk/codegen/rules/AwsEndpointProviderUtils.java.resource

@@ -37,6 +37,10 @@ public final class AwsEndpointProviderUtils {
         return executionAttributes.getAttribute(AwsExecutionAttribute.FIPS_ENDPOINT_ENABLED);
     }
 
+    public static String accountIdBuiltIn(ExecutionAttributes executionAttributes) {
+        return executionAttributes.getAttribute(AwsExecutionAttribute.AWS_AUTH_ACCOUNT_ID);
+    }
+
     /**
      * Returns the endpoint set on the client. Note that this strips off the query part of the URI because the endpoint
      * rules library, e.g. {@code ParseURL} will return an exception if the URI it parses has query parameters.

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/query/endpoint-rule-set.json

@@ -16,6 +16,10 @@
       "type": "boolean",
       "builtIn": "AWS::UseFIPS"
     },
+    "awsAccountId": {
+      "type": "String",
+      "builtIn": "AWS::Auth::AccountId"
+    },
     "endpointId": {
       "type": "string"
     },

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-parameters.java

@@ -18,6 +18,8 @@ public final class QueryEndpointParams implements ToCopyableBuilder<QueryEndpoin
 
     private final Boolean useFIPSEndpoint;
 
+    private final String awsAccountId;
+
     private final String endpointId;
 
     private final Boolean defaultTrueParam;
@@ -36,6 +38,7 @@ private QueryEndpointParams(BuilderImpl builder) {
         this.region = builder.region;
         this.useDualStackEndpoint = builder.useDualStackEndpoint;
         this.useFIPSEndpoint = builder.useFIPSEndpoint;
+        this.awsAccountId = builder.awsAccountId;
         this.endpointId = builder.endpointId;
         this.defaultTrueParam = builder.defaultTrueParam;
         this.defaultStringParam = builder.defaultStringParam;
@@ -61,6 +64,10 @@ public Boolean useFipsEndpoint() {
         return useFIPSEndpoint;
     }
 
+    public String awsAccountId() {
+        return awsAccountId;
+    }
+
     public String endpointId() {
         return endpointId;
     }
@@ -101,6 +108,8 @@ public interface Builder extends CopyableBuilder<Builder, QueryEndpointParams> {
 
         Builder useFipsEndpoint(Boolean useFIPSEndpoint);
 
+        Builder awsAccountId(String awsAccountId);
+
         Builder endpointId(String endpointId);
 
         Builder defaultTrueParam(Boolean defaultTrueParam);
@@ -126,6 +135,8 @@ private static class BuilderImpl implements Builder {
 
         private Boolean useFIPSEndpoint;
 
+        private String awsAccountId;
+
         private String endpointId;
 
         private Boolean defaultTrueParam = true;
@@ -174,6 +185,12 @@ public Builder useFipsEndpoint(Boolean useFIPSEndpoint) {
             return this;
         }
 
+        @Override
+        public Builder awsAccountId(String awsAccountId) {
+            this.awsAccountId = awsAccountId;
+            return this;
+        }
+
         @Override
         public Builder endpointId(String endpointId) {
             this.endpointId = endpointId;

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-provider-class.java

@@ -54,6 +54,9 @@ private static Map<Identifier, Value> toIdentifierValueMap(QueryEndpointParams p
         if (params.useFipsEndpoint() != null) {
             paramsMap.put(Identifier.of("useFIPSEndpoint"), Value.fromBool(params.useFipsEndpoint()));
         }
+        if (params.awsAccountId() != null) {
+            paramsMap.put(Identifier.of("awsAccountId"), Value.fromStr(params.awsAccountId()));
+        }
         if (params.endpointId() != null) {
             paramsMap.put(Identifier.of("endpointId"), Value.fromStr(params.endpointId()));
         }
@@ -339,6 +342,9 @@ private static EndpointRuleset ruleSet() {
                                 .addParameter(
                                         Parameter.builder().name("useFIPSEndpoint").type(ParameterType.fromValue("boolean"))
                                                 .required(false).builtIn("AWS::UseFIPS").build())
+                                .addParameter(
+                                    Parameter.builder().name("awsAccountId").type(ParameterType.fromValue("String"))
+                                             .required(false).builtIn("AWS::Auth::AccountId").build())
                                 .addParameter(
                                         Parameter.builder().name("endpointId").type(ParameterType.fromValue("string"))
                                                 .required(false).build())

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor.java

@@ -96,6 +96,7 @@ public static QueryEndpointParams ruleParams(SdkRequest request, ExecutionAttrib
         builder.region(AwsEndpointProviderUtils.regionBuiltIn(executionAttributes));
         builder.useDualStackEndpoint(AwsEndpointProviderUtils.dualStackEnabledBuiltIn(executionAttributes));
         builder.useFipsEndpoint(AwsEndpointProviderUtils.fipsEnabledBuiltIn(executionAttributes));
+        builder.awsAccountId(AwsEndpointProviderUtils.accountIdBuiltIn(executionAttributes));
         setClientContextParams(builder, executionAttributes);
         setContextParams(builder, executionAttributes.getAttribute(AwsExecutionAttribute.OPERATION_NAME), request);
         setStaticContextParams(builder, executionAttributes.getAttribute(AwsExecutionAttribute.OPERATION_NAME));

core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsExecutionAttribute.java

@@ -27,7 +27,7 @@
  * AWS-specific attributes attached to the execution. This information is available to {@link ExecutionInterceptor}s.
  */
 @SdkPublicApi
-public final class AwsExecutionAttribute extends SdkExecutionAttribute {
+public final class  AwsExecutionAttribute extends SdkExecutionAttribute {
     /**
      * The AWS {@link Region} the client was configured with. This is not always same as the
      * {@link AwsSignerExecutionAttribute#SIGNING_REGION} for global services like IAM.
@@ -58,6 +58,12 @@ public final class AwsExecutionAttribute extends SdkExecutionAttribute {
     public static final ExecutionAttribute<Boolean> USE_GLOBAL_ENDPOINT =
         new ExecutionAttribute<>("UseGlobalEndpoint");
 
+    /**
+     * The AWS account ID associated with the identity resolved for this request.
+     */
+    public static final ExecutionAttribute<String> AWS_AUTH_ACCOUNT_ID =
+        new ExecutionAttribute<>("AwsAuthAccountId");
+
     private AwsExecutionAttribute() {
     }
 }