fix: get region from config

Author: Chase Coalwell

packages/middleware-location-constraint/src/configuration.ts

@@ -0,0 +1,16 @@
+import { Provider } from "@aws-sdk/types";
+
+export interface LocationConstraintInputConfig {}
+
+interface PreviouslyResolved {
+  region: string | Provider<string>;
+}
+
+export interface LocationConstraintResolvedConfig {
+  region: string | Provider<string>;
+}
+export function resolveLocationConstraintConfig<T>(
+  input: T & LocationConstraintInputConfig & PreviouslyResolved
+): T & LocationConstraintResolvedConfig {
+  return { ...input };
+}

packages/middleware-location-constraint/src/index.spec.ts

@@ -8,11 +8,12 @@ describe("locationConstrainMiddleware", () => {
   });
 
   it("should remove any CreateBucketConfiguration from requests directed at us-east-1", async () => {
-    const handler = locationConstraintMiddleware()(next, {} as any);
+    const handler = locationConstraintMiddleware({
+      region: "us-east-1"
+    })(next, {} as any);
     const input = {
       CreateBucketConfiguration: { LocationConstraint: "us-east-1" },
-      foo: "bar",
-      region: "us-east-1"
+      foo: "bar"
     };
     await handler({ input });
 
@@ -26,10 +27,11 @@ describe("locationConstrainMiddleware", () => {
   });
 
   it("should apply a CreateBucketConfiguration with a LocationConstraint of the target region for requests directed outside of us-east-1", async () => {
-    const handler = locationConstraintMiddleware()(next, {} as any);
-    const input = {
-      foo: "bar",
+    const handler = locationConstraintMiddleware({
       region: "us-east-2"
+    })(next, {} as any);
+    const input = {
+      foo: "bar"
     };
 
     await handler({ input });
@@ -44,7 +46,9 @@ describe("locationConstrainMiddleware", () => {
   });
 
   it("should do nothing if a LocationConstraint had already been set on a request directed outside of us-east-1", async () => {
-    const handler = locationConstraintMiddleware()(next, {} as any);
+    const handler = locationConstraintMiddleware({
+      region: "us-east-2"
+    })(next, {} as any);
     const input = {
       CreateBucketConfiguration: { LocationConstraint: "us-east-1" },
       foo: "bar"

packages/middleware-location-constraint/src/index.ts

@@ -7,14 +7,17 @@ import {
   MetadataBearer,
   Pluggable
 } from "@aws-sdk/types";
+import { LocationConstraintResolvedConfig } from "./configuration";
 
-export function locationConstraintMiddleware(): InitializeMiddleware<any, any> {
+export function locationConstraintMiddleware(
+  options: LocationConstraintResolvedConfig
+): InitializeMiddleware<any, any> {
   return <Output extends MetadataBearer>(
     next: InitializeHandler<any, Output>
   ): InitializeHandler<any, Output> => async (
     args: InitializeHandlerArguments<any>
   ): Promise<InitializeHandlerOutput<Output>> => {
-    const { region, CreateBucketConfiguration } = args.input;
+    const { CreateBucketConfiguration } = args.input;
     if (
       !CreateBucketConfiguration ||
       !CreateBucketConfiguration.LocationConstraint
@@ -23,10 +26,10 @@ export function locationConstraintMiddleware(): InitializeMiddleware<any, any> {
         ...args,
         input: {
           ...args.input,
-          CreateBucketConfiguration: { LocationConstraint: region }
+          CreateBucketConfiguration: { LocationConstraint: options.region }
         }
       };
-    } else if (region === "us-east-1") {
+    } else if (options.region === "us-east-1") {
       args = {
         ...args,
         input: {
@@ -47,9 +50,12 @@ export const locationConstraintMiddlewareOptions: InitializeHandlerOptions = {
 };
 
 export const getLocationConstraintPlugin = (
-  unused: any
+  config: LocationConstraintResolvedConfig
 ): Pluggable<any, any> => ({
   applyToStack: clientStack => {
-    locationConstraintMiddleware(), locationConstraintMiddlewareOptions;
+    clientStack.add(
+      locationConstraintMiddleware(config),
+      locationConstraintMiddlewareOptions
+    );
   }
 });