chore(middleware-sdk-s3): split region redirect middlewares in differ…

…ent files
aws · Sep 25, 2023 · 8ed442b · 8ed442b
1 parent e133bb7
commit 8ed442b
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 49 deletions.
diff --git a/packages/middleware-sdk-s3/src/region-redirect-endpoint-middleware.ts b/packages/middleware-sdk-s3/src/region-redirect-endpoint-middleware.ts
@@ -0,0 +1,58 @@
+import {
+  HandlerExecutionContext,
+  MetadataBearer,
+  Pluggable,
+  RelativeMiddlewareOptions,
+  SerializeHandler,
+  SerializeHandlerArguments,
+  SerializeHandlerOutput,
+  SerializeMiddleware,
+} from "@smithy/types";
+
+import { PreviouslyResolved } from "./region-redirect-middleware";
+
+/**
+ * @internal
+ */
+export const regionRedirectEndpointMiddleware = (config: PreviouslyResolved): SerializeMiddleware<any, any> => {
+  return <Output extends MetadataBearer>(
+      next: SerializeHandler<any, Output>,
+      context: HandlerExecutionContext
+    ): SerializeHandler<any, Output> =>
+    async (args: SerializeHandlerArguments<any>): Promise<SerializeHandlerOutput<Output>> => {
+      const originalRegion = await config.region();
+      if (context.__s3RegionRedirect) {
+        config.region = async () => {
+          return context.__s3RegionRedirect;
+        };
+      }
+      const result = await next(args);
+      if (context.__s3RegionRedirect) {
+        const region = await config.region();
+        if (originalRegion !== region) {
+          throw new Error("Region was not restored following S3 region redirect.");
+        }
+      }
+      return result;
+    };
+};
+
+/**
+ * @internal
+ */
+export const regionRedirectEndpointMiddlewareOptions: RelativeMiddlewareOptions = {
+  tags: ["REGION_REDIRECT", "S3"],
+  name: "regionRedirectEndpointMiddleware",
+  override: true,
+  relation: "before",
+  toMiddleware: "endpointV2Middleware",
+};
+
+/**
+ * @internal
+ */
+export const getRegionRedirectMiddlewarePlugin = (clientConfig: PreviouslyResolved): Pluggable<any, any> => ({
+  applyToStack: (clientStack) => {
+    clientStack.addRelativeTo(regionRedirectEndpointMiddleware(clientConfig), regionRedirectEndpointMiddlewareOptions);
+  },
+});
diff --git a/packages/middleware-sdk-s3/src/region-redirect-middleware.e2e.spec.ts b/packages/middleware-sdk-s3/src/region-redirect-middleware.e2e.spec.ts
@@ -10,8 +10,8 @@ import { STS } from "@aws-sdk/client-sts";
 
 const regionConfigs = [
   { region: "us-east-1", followRegionRedirects: true },
+  { region: "eu-west-1", followRegionRedirects: true },
   { region: "us-west-2", followRegionRedirects: true },
-  { region: "us-west-1", followRegionRedirects: true },
 ];
 
 const s3Clients = regionConfigs.map((config) => new S3Client(config));
@@ -23,7 +23,7 @@ async function testS3GlobalClient() {
 
   const callerID = await stsClient.getCallerIdentity({});
 
-  const bucketNames = regionConfigs.map((config) => `${callerID.Account}-redirect-testing-${config.region}`);
+  const bucketNames = regionConfigs.map((config) => `${callerID.Account}-redirect-${config.region}`);
   await Promise.all(
     bucketNames.map((bucketName, index) => s3Clients[index].send(new CreateBucketCommand({ Bucket: bucketName })))
   );

diff --git a/packages/middleware-sdk-s3/src/region-redirect-middleware.spec.ts b/packages/middleware-sdk-s3/src/region-redirect-middleware.spec.ts
@@ -10,7 +10,7 @@ describe(regionRedirectMiddleware.name, () => {
     if (call === 0) {
       call++;
       throw Object.assign(new Error(), {
-        Code: "PermanentRedirect",
+        name: "PermanentRedirect",
         $metadata: { httpStatusCode: 301 },
         $response: { headers: { "x-amz-bucket-region": redirectRegion } },
       });

diff --git a/packages/middleware-sdk-s3/src/region-redirect-middleware.ts b/packages/middleware-sdk-s3/src/region-redirect-middleware.ts
@@ -8,17 +8,12 @@ import {
   MetadataBearer,
   Pluggable,
   Provider,
-  RelativeMiddlewareOptions,
-  SerializeHandler,
-  SerializeHandlerArguments,
-  SerializeHandlerOutput,
-  SerializeMiddleware,
 } from "@smithy/types";
 
 /**
  * @internal
  */
-interface PreviouslyResolved {
+export interface PreviouslyResolved {
   region: Provider<string>;
   followRegionRedirects: boolean;
 }
@@ -55,34 +50,6 @@ export function regionRedirectMiddleware(clientConfig: PreviouslyResolved): Init
     };
 }
 
-/**
- * @internal
- */
-export const regionRedirectEndpointMiddleware = (config: PreviouslyResolved): SerializeMiddleware<any, any> => {
-  return <Output extends MetadataBearer>(
-      next: SerializeHandler<any, Output>,
-      context: HandlerExecutionContext
-    ): SerializeHandler<any, Output> =>
-    async (args: SerializeHandlerArguments<any>): Promise<SerializeHandlerOutput<Output>> => {
-      const originalRegion = await config.region();
-      if (context.__s3RegionRedirect) {
-        const regionProviderRef = config.region;
-        config.region = async () => {
-          config.region = regionProviderRef;
-          return context.__s3RegionRedirect;
-        };
-      }
-      const result = await next(args);
-      if (context.__s3RegionRedirect) {
-        const region = await config.region();
-        if (originalRegion !== region) {
-          throw new Error("Region was not restored following S3 region redirect.");
-        }
-      }
-      return result;
-    };
-};
-
 /**
  * @internal
  */
@@ -93,23 +60,11 @@ export const regionRedirectMiddlewareOptions: InitializeHandlerOptions = {
   override: true,
 };
 
-/**
- * @internal
- */
-export const regionRedirectEndpointMiddlewareOptions: RelativeMiddlewareOptions = {
-  tags: ["REGION_REDIRECT", "S3"],
-  name: "regionRedirectEndpointMiddleware",
-  override: true,
-  relation: "before",
-  toMiddleware: "endpointV2Middleware",
-};
-
 /**
  * @internal
  */
 export const getRegionRedirectMiddlewarePlugin = (clientConfig: PreviouslyResolved): Pluggable<any, any> => ({
   applyToStack: (clientStack) => {
     clientStack.add(regionRedirectMiddleware(clientConfig), regionRedirectMiddlewareOptions);
-    clientStack.addRelativeTo(regionRedirectEndpointMiddleware(clientConfig), regionRedirectEndpointMiddlewareOptions);
   },
 });