fix(client-s3): defer endpoint validations to ruleset

kuhe · kuhe · commit 9c5bbc37b6ce · 2025-06-13T11:48:59.000-04:00
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ test-integration: bundles
 	make test-endpoints
 
 test-endpoints:
-	npx jest -c ./tests/endpoints-2.0/jest.config.js --bail --watch --verbose false
+	npx jest -c ./tests/endpoints-2.0/jest.config.js --bail --verbose false
 
 test-e2e: bundles
 	yarn g:vitest run -c vitest.config.e2e.ts --retry=4
diff --git a/clients/client-s3-control/src/models/models_1.ts b/clients/client-s3-control/src/models/models_1.ts
@@ -19,7 +19,6 @@ import {
   StorageLensTag,
   Tag,
 } from "./models_0";
-
 import { S3ControlServiceException as __BaseException } from "./S3ControlServiceException";
 
 /**
diff --git a/clients/client-s3/src/S3Client.ts b/clients/client-s3/src/S3Client.ts
@@ -755,9 +755,9 @@ export interface ClientDefaults extends Partial<__SmithyConfiguration<__HttpHand
   signingEscapePath?: boolean;
 
   /**
-   * Whether to override the request region with the region inferred from requested resource's ARN. Defaults to false.
+   * Whether to override the request region with the region inferred from requested resource's ARN. Defaults to undefined.
    */
-  useArnRegion?: boolean | Provider<boolean>;
+  useArnRegion?: boolean | undefined | Provider<boolean | undefined>;
   /**
    * The internal function that inject utilities to runtime-specific stream to help users consume the data
    * @internal
diff --git a/clients/client-s3/src/models/models_0.ts b/clients/client-s3/src/models/models_0.ts
@@ -1,6 +1,5 @@
 // smithy-typescript generated code
 import { ExceptionOptionType as __ExceptionOptionType, SENSITIVE_STRING } from "@smithy/smithy-client";
-
 import { StreamingBlobTypes } from "@smithy/types";
 
 import { S3ServiceException as __BaseException } from "./S3ServiceException";
diff --git a/clients/client-s3/src/models/models_1.ts b/clients/client-s3/src/models/models_1.ts
@@ -1,6 +1,5 @@
 // smithy-typescript generated code
 import { ExceptionOptionType as __ExceptionOptionType, SENSITIVE_STRING } from "@smithy/smithy-client";
-
 import { StreamingBlobTypes } from "@smithy/types";
 
 import {
@@ -41,7 +40,6 @@ import {
   Tag,
   TransitionDefaultMinimumObjectSize,
 } from "./models_0";
-
 import { S3ServiceException as __BaseException } from "./S3ServiceException";
 
 /**
diff --git a/clients/client-s3/src/runtimeConfig.shared.ts b/clients/client-s3/src/runtimeConfig.shared.ts
@@ -43,7 +43,7 @@ export const getRuntimeConfig = (config: S3ClientConfig) => {
     signerConstructor: config?.signerConstructor ?? SignatureV4MultiRegion,
     signingEscapePath: config?.signingEscapePath ?? false,
     urlParser: config?.urlParser ?? parseUrl,
-    useArnRegion: config?.useArnRegion ?? false,
+    useArnRegion: config?.useArnRegion ?? undefined,
     utf8Decoder: config?.utf8Decoder ?? fromUtf8,
     utf8Encoder: config?.utf8Encoder ?? toUtf8,
   };
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddS3Config.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddS3Config.java
@@ -33,6 +33,7 @@
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.knowledge.OperationIndex;
 import software.amazon.smithy.model.knowledge.TopDownIndex;
+import software.amazon.smithy.model.pattern.SmithyPattern;
 import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
@@ -47,6 +48,7 @@
 import software.amazon.smithy.model.traits.HttpHeaderTrait;
 import software.amazon.smithy.model.traits.HttpPayloadTrait;
 import software.amazon.smithy.model.traits.StreamingTrait;
+import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.model.transform.ModelTransformer;
 import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait;
 import software.amazon.smithy.typescript.codegen.LanguageTarget;
@@ -89,7 +91,23 @@ public final class AddS3Config implements TypeScriptIntegration {
     public static Shape removeHostPrefixTrait(Shape shape) {
         return shape.asOperationShape()
             .map(OperationShape::shapeToBuilder)
-            .map(builder -> ((OperationShape.Builder) builder).removeTrait(EndpointTrait.ID))
+            .map((Object object) -> {
+                OperationShape.Builder builder = (OperationShape.Builder) object;
+                Trait trait = builder.getAllTraits().get(EndpointTrait.ID);
+                if (trait instanceof EndpointTrait endpointTrait) {
+                    if (
+                        endpointTrait.getHostPrefix().equals(
+                            SmithyPattern.builder()
+                                .segments(List.of())
+                                .pattern("{AccountId}.")
+                                .build()
+                        )
+                    ) {
+                        builder.removeTrait(EndpointTrait.ID);
+                    }
+                }
+                return builder;
+            })
             .map(OperationShape.Builder::build)
             .map(s -> (Shape) s)
             .orElse(shape);
@@ -224,7 +242,7 @@ public Model preprocessModel(Model model, TypeScriptSettings settings) {
 
         Model builtModel = modelBuilder.addShapes(inputShapes).build();
         if (hasRuleset) {
-            ModelTransformer.create().mapShapes(
+            return ModelTransformer.create().mapShapes(
                 builtModel, AddS3Config::removeHostPrefixTrait
             );
         }
@@ -246,9 +264,9 @@ public void addConfigInterfaceFields(
             .write("signingEscapePath?: boolean;\n");
         writer.writeDocs(
                 "Whether to override the request region with the region inferred from requested resource's ARN."
-                    + " Defaults to false.")
+                    + " Defaults to undefined.")
             .addImport("Provider", "Provider", TypeScriptDependency.SMITHY_TYPES)
-            .write("useArnRegion?: boolean | Provider<boolean>;");
+            .write("useArnRegion?: boolean | undefined | Provider<boolean | undefined>;");
     }
 
     @Override
@@ -266,7 +284,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                         writer.write("false");
                     },
                     "useArnRegion", writer -> {
-                        writer.write("false");
+                        writer.write("undefined");
                     }
                 );
             case NODE:
diff --git a/packages/middleware-bucket-endpoint/src/NodeUseArnRegionConfigOptions.spec.ts b/packages/middleware-bucket-endpoint/src/NodeUseArnRegionConfigOptions.spec.ts
@@ -44,8 +44,8 @@ describe("NODE_USE_ARN_REGION_CONFIG_OPTIONS", () => {
     test(configFileSelector, profileContent, NODE_USE_ARN_REGION_INI_NAME, SelectorType.CONFIG);
   });
 
-  it("returns false for default", () => {
+  it("returns undefined for default", () => {
     const { default: defaultValue } = NODE_USE_ARN_REGION_CONFIG_OPTIONS;
-    expect(defaultValue).toEqual(false);
+    expect(defaultValue).toEqual(undefined);
   });
 });
diff --git a/packages/middleware-bucket-endpoint/src/NodeUseArnRegionConfigOptions.ts b/packages/middleware-bucket-endpoint/src/NodeUseArnRegionConfigOptions.ts
@@ -7,11 +7,15 @@ export const NODE_USE_ARN_REGION_INI_NAME = "s3_use_arn_region";
 /**
  * Config to load useArnRegion from environment variables and shared INI files
  *
- * @api private
+ * @internal
  */
-export const NODE_USE_ARN_REGION_CONFIG_OPTIONS: LoadedConfigSelectors<boolean> = {
+export const NODE_USE_ARN_REGION_CONFIG_OPTIONS: LoadedConfigSelectors<boolean | undefined> = {
   environmentVariableSelector: (env: NodeJS.ProcessEnv) =>
     booleanSelector(env, NODE_USE_ARN_REGION_ENV_NAME, SelectorType.ENV),
   configFileSelector: (profile) => booleanSelector(profile, NODE_USE_ARN_REGION_INI_NAME, SelectorType.CONFIG),
-  default: false,
+  /**
+   * useArnRegion has specific behavior when undefined instead of false.
+   * We therefore use undefined as the default value instead of false.
+   */
+  default: undefined,
 };
diff --git a/packages/middleware-bucket-endpoint/src/bucketEndpointMiddleware.spec.ts b/packages/middleware-bucket-endpoint/src/bucketEndpointMiddleware.spec.ts
@@ -19,7 +19,10 @@ import { parse, validate } from "@aws-sdk/util-arn-parser";
 import { bucketEndpointMiddleware } from "./bucketEndpointMiddleware";
 import { bucketHostname } from "./bucketHostname";
 
-describe("bucketEndpointMiddleware", () => {
+/**
+ * @deprecated unused as of EndpointsV2.
+ */
+describe.skip("bucketEndpointMiddleware", () => {
   const input = { Bucket: "bucket" };
   const mockRegion = "us-foo-1";
   const requestInput = {
diff --git a/packages/middleware-bucket-endpoint/src/bucketEndpointMiddleware.ts b/packages/middleware-bucket-endpoint/src/bucketEndpointMiddleware.ts
@@ -14,6 +14,10 @@ import {
 import { bucketHostname } from "./bucketHostname";
 import { BucketEndpointResolvedConfig } from "./configurations";
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 export const bucketEndpointMiddleware =
   (options: BucketEndpointResolvedConfig): BuildMiddleware<any, any> =>
   <Output extends MetadataBearer>(
@@ -98,6 +102,10 @@ export const bucketEndpointMiddleware =
     return next({ ...args, request });
   };
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 export const bucketEndpointMiddlewareOptions: RelativeMiddlewareOptions = {
   tags: ["BUCKET_ENDPOINT"],
   name: "bucketEndpointMiddleware",
@@ -106,6 +114,10 @@ export const bucketEndpointMiddlewareOptions: RelativeMiddlewareOptions = {
   override: true,
 };
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 export const getBucketEndpointPlugin = (options: BucketEndpointResolvedConfig): Pluggable<any, any> => ({
   applyToStack: (clientStack) => {
     clientStack.addRelativeTo(bucketEndpointMiddleware(options), bucketEndpointMiddlewareOptions);
diff --git a/packages/middleware-bucket-endpoint/src/bucketHostname.spec.ts b/packages/middleware-bucket-endpoint/src/bucketHostname.spec.ts
@@ -3,7 +3,10 @@ import { describe, expect, test as it } from "vitest";
 
 import { bucketHostname } from "./bucketHostname";
 
-describe("bucketHostname", () => {
+/**
+ * @deprecated unused as of EndpointsV2.
+ */
+describe.skip("bucketHostname", () => {
   const region = "us-west-2";
   describe("from bucket name", () => {
     [
diff --git a/packages/middleware-bucket-endpoint/src/bucketHostname.ts b/packages/middleware-bucket-endpoint/src/bucketHostname.ts
@@ -14,23 +14,29 @@ import {
   validateCustomEndpoint,
   validateDNSHostLabel,
   validateMrapAlias,
-  validateNoDualstack,
   validateNoFIPS,
   validateOutpostService,
   validatePartition,
-  validateRegion,
   validateRegionalClient,
   validateS3Service,
   validateService,
 } from "./bucketHostnameUtils";
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 export interface BucketHostname {
   hostname: string;
   bucketEndpoint: boolean;
   signingRegion?: string;
   signingService?: string;
 }
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 export const bucketHostname = (options: BucketHostnameParams | ArnHostnameParams): BucketHostname => {
   validateCustomEndpoint(options);
   return isBucketNameOptions(options)
@@ -40,6 +46,10 @@ export const bucketHostname = (options: BucketHostnameParams | ArnHostnameParams
       getEndpointFromArn(options);
 };
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 const getEndpointFromBucketName = ({
   accelerateEndpoint = false,
   clientRegion: region,
@@ -71,6 +81,10 @@ const getEndpointFromBucketName = ({
   };
 };
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 const getEndpointFromArn = (options: ArnHostnameParams): BucketHostname => {
   const { isCustomEndpoint, baseHostname, clientRegion } = options;
   const hostnameSuffix = isCustomEndpoint ? baseHostname : getSuffixForArnEndpoint(baseHostname)[1];
@@ -104,6 +118,10 @@ const getEndpointFromArn = (options: ArnHostnameParams): BucketHostname => {
   return getEndpointFromAccessPointArn({ ...options, clientRegion, accesspointName, hostnameSuffix });
 };
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 const getEndpointFromObjectLambdaArn = ({
   dualstackEndpoint = false,
   fipsEndpoint = false,
@@ -121,14 +139,6 @@ const getEndpointFromObjectLambdaArn = ({
 }): BucketHostname => {
   const { accountId, region, service } = bucketName;
   validateRegionalClient(clientRegion);
-  validateRegion(region, {
-    useArnRegion,
-    clientRegion,
-    clientSigningRegion,
-    allowFipsRegion: true,
-    useFipsEndpoint: fipsEndpoint,
-  });
-  validateNoDualstack(dualstackEndpoint);
   const DNSHostLabel = `${accesspointName}-${accountId}`;
   validateDNSHostLabel(DNSHostLabel, { tlsCompatible });
 
@@ -143,6 +153,10 @@ const getEndpointFromObjectLambdaArn = ({
   };
 };
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 const getEndpointFromMRAPArn = ({
   disableMultiregionAccessPoints,
   dualstackEndpoint = false,
@@ -155,14 +169,17 @@ const getEndpointFromMRAPArn = ({
     throw new Error("SDK is attempting to use a MRAP ARN. Please enable to feature.");
   }
   validateMrapAlias(mrapAlias);
-  validateNoDualstack(dualstackEndpoint);
   return {
     bucketEndpoint: true,
     hostname: `${mrapAlias}${isCustomEndpoint ? "" : `.accesspoint.s3-global`}.${hostnameSuffix}`,
     signingRegion: "*",
   };
 };
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 const getEndpointFromOutpostArn = ({
   useArnRegion,
   clientRegion,
@@ -178,14 +195,12 @@ const getEndpointFromOutpostArn = ({
 }: ArnHostnameParams & { outpostId: string; accesspointName: string; hostnameSuffix: string }): BucketHostname => {
   // if this is an Outpost ARN
   validateRegionalClient(clientRegion);
-  validateRegion(bucketName.region, { useArnRegion, clientRegion, clientSigningRegion, useFipsEndpoint: fipsEndpoint });
   const DNSHostLabel = `${accesspointName}-${bucketName.accountId}`;
   validateDNSHostLabel(DNSHostLabel, { tlsCompatible });
   const endpointRegion = useArnRegion ? bucketName.region : clientRegion;
   const signingRegion = useArnRegion ? bucketName.region : clientSigningRegion;
   validateOutpostService(bucketName.service);
   validateDNSHostLabel(outpostId, { tlsCompatible });
-  validateNoDualstack(dualstackEndpoint);
   validateNoFIPS(fipsEndpoint);
   const hostnamePrefix = `${DNSHostLabel}.${outpostId}`;
   return {
@@ -196,6 +211,10 @@ const getEndpointFromOutpostArn = ({
   };
 };
 
+/**
+ * @deprecated unused as of EndpointsV2.
+ * @internal
+ */
 const getEndpointFromAccessPointArn = ({
   useArnRegion,
   clientRegion,
@@ -210,13 +229,6 @@ const getEndpointFromAccessPointArn = ({
 }: ArnHostnameParams & { accesspointName: string; hostnameSuffix: string }): BucketHostname => {
   // construct endpoint from Accesspoint ARN
   validateRegionalClient(clientRegion);
-  validateRegion(bucketName.region, {
-    useArnRegion,
-    clientRegion,
-    clientSigningRegion,
-    allowFipsRegion: true,
-    useFipsEndpoint: fipsEndpoint,
-  });
   const hostnamePrefix = `${accesspointName}-${bucketName.accountId}`;
   validateDNSHostLabel(hostnamePrefix, { tlsCompatible });
   const endpointRegion = useArnRegion ? bucketName.region : clientRegion;
diff --git a/packages/middleware-bucket-endpoint/src/bucketHostnameUtils.ts b/packages/middleware-bucket-endpoint/src/bucketHostnameUtils.ts
diff --git a/packages/middleware-bucket-endpoint/src/configurations.ts b/packages/middleware-bucket-endpoint/src/configurations.ts
diff --git a/packages/middleware-sdk-s3-control/src/configurations.ts b/packages/middleware-sdk-s3-control/src/configurations.ts
diff --git a/packages/middleware-sdk-s3-control/src/middleware-sdk-s3-control.integ.spec.ts b/packages/middleware-sdk-s3-control/src/middleware-sdk-s3-control.integ.spec.ts
diff --git a/packages/middleware-sdk-s3-control/src/process-arnables-plugin/parse-outpost-arnables.ts b/packages/middleware-sdk-s3-control/src/process-arnables-plugin/parse-outpost-arnables.ts
diff --git a/tests/endpoints-2.0/endpoints-integration.spec.ts b/tests/endpoints-2.0/endpoints-integration.spec.ts
