fix(endpoint): instruct rds middleware to wait for endpoint resolution (#4120)

* fix(endpoint): instruct rds middleware to wait for endpoint resolution

* fix(endpoint): add endpointv2 checks to middleware that request the endpoint

Author: kuhe

packages/middleware-sdk-ec2/package.json

@@ -20,6 +20,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
+    "@aws-sdk/middleware-endpoint": "*",
     "@aws-sdk/protocol-http": "*",
     "@aws-sdk/signature-v4": "*",
     "@aws-sdk/types": "*",

packages/middleware-sdk-ec2/src/index.ts

@@ -1,25 +1,28 @@
+import { toEndpointV1 } from "@aws-sdk/middleware-endpoint";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 import { SignatureV4 } from "@aws-sdk/signature-v4";
 import {
   Credentials,
   Endpoint,
+  HandlerExecutionContext,
   HashConstructor,
   InitializeHandler,
   InitializeHandlerArguments,
-  InitializeHandlerOptions,
   InitializeHandlerOutput,
   InitializeMiddleware,
   MemoizedProvider,
   MetadataBearer,
   Pluggable,
   Provider,
   RegionInfoProvider,
+  RelativeMiddlewareOptions,
+  SerializeHandlerOptions,
 } from "@aws-sdk/types";
 import { formatUrl } from "@aws-sdk/util-format-url";
 
 interface PreviouslyResolved {
   credentials: MemoizedProvider<Credentials>;
-  endpoint: Provider<Endpoint>;
+  endpoint?: Provider<Endpoint>;
   region: Provider<string>;
   sha256: HashConstructor;
   signingEscapePath: boolean;
@@ -30,12 +33,16 @@ const version = "2016-11-15";
 
 //an initialize middleware to add PresignUrl to input
 export function copySnapshotPresignedUrlMiddleware(options: PreviouslyResolved): InitializeMiddleware<any, any> {
-  return <Output extends MetadataBearer>(next: InitializeHandler<any, Output>): InitializeHandler<any, Output> =>
+  return <Output extends MetadataBearer>(
+      next: InitializeHandler<any, Output>,
+      context: HandlerExecutionContext
+    ): InitializeHandler<any, Output> =>
     async (args: InitializeHandlerArguments<any>): Promise<InitializeHandlerOutput<Output>> => {
       const { input } = args;
       if (!input.PresignedUrl) {
         const region = await options.region();
-        const resolvedEndpoint = await options.endpoint();
+        const resolvedEndpoint =
+          typeof options.endpoint === "function" ? await options.endpoint() : toEndpointV1(context.endpointV2!);
 
         if (typeof options.regionInfoProvider === "function") {
           const regionInfo = await options.regionInfoProvider(input.SourceRegion);
@@ -83,11 +90,13 @@ export function copySnapshotPresignedUrlMiddleware(options: PreviouslyResolved):
     };
 }
 
-export const copySnapshotPresignedUrlMiddlewareOptions: InitializeHandlerOptions = {
-  step: "initialize",
+export const copySnapshotPresignedUrlMiddlewareOptions: SerializeHandlerOptions & RelativeMiddlewareOptions = {
+  step: "serialize",
   tags: ["CROSS_REGION_PRESIGNED_URL"],
   name: "crossRegionPresignedUrlMiddleware",
   override: true,
+  relation: "after",
+  toMiddleware: "endpointV2Middleware",
 };
 
 export const getCopySnapshotPresignedUrlPlugin = (config: PreviouslyResolved): Pluggable<any, any> => ({

packages/middleware-sdk-rds/package.json

@@ -20,6 +20,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
+    "@aws-sdk/middleware-endpoint": "*",
     "@aws-sdk/protocol-http": "*",
     "@aws-sdk/signature-v4": "*",
     "@aws-sdk/types": "*",

packages/middleware-sdk-rds/src/index.ts

@@ -1,18 +1,21 @@
+import { toEndpointV1 } from "@aws-sdk/middleware-endpoint";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 import { SignatureV4 } from "@aws-sdk/signature-v4";
 import {
   Credentials,
   Endpoint,
+  HandlerExecutionContext,
   HashConstructor,
   InitializeHandler,
   InitializeHandlerArguments,
-  InitializeHandlerOptions,
   InitializeHandlerOutput,
   InitializeMiddleware,
   MemoizedProvider,
   MetadataBearer,
   Pluggable,
   Provider,
+  RelativeMiddlewareOptions,
+  SerializeHandlerOptions,
 } from "@aws-sdk/types";
 import { formatUrl } from "@aws-sdk/util-format-url";
 
@@ -30,7 +33,7 @@ const version = "2014-10-31";
 
 interface PreviouslyResolved {
   credentials: MemoizedProvider<Credentials>;
-  endpoint: Provider<Endpoint>;
+  endpoint?: Provider<Endpoint>;
   region: Provider<string>;
   sha256: HashConstructor;
   signingEscapePath: boolean;
@@ -41,7 +44,10 @@ interface PreviouslyResolved {
  * The presigned URL is generated by sigV4
  */
 export function crossRegionPresignedUrlMiddleware(options: PreviouslyResolved): InitializeMiddleware<any, any> {
-  return <Output extends MetadataBearer>(next: InitializeHandler<any, Output>): InitializeHandler<any, Output> =>
+  return <Output extends MetadataBearer>(
+      next: InitializeHandler<any, Output>,
+      context: HandlerExecutionContext
+    ): InitializeHandler<any, Output> =>
     async (args: InitializeHandlerArguments<any>): Promise<InitializeHandlerOutput<Output>> => {
       const { input } = args;
       const region = await options.region();
@@ -54,7 +60,14 @@ export function crossRegionPresignedUrlMiddleware(options: PreviouslyResolved):
       const command = sourceIdToCommandKeyMap[sourceIdKey];
       if (!input.PreSignedUrl && isARN(input[sourceIdKey]) && region !== getEndpointFromARN(input[sourceIdKey])) {
         const sourceRegion = getEndpointFromARN(input[sourceIdKey]);
-        const resolvedEndpoint = await options.endpoint();
+
+        let resolvedEndpoint: Endpoint;
+        if (typeof options.endpoint === "function") {
+          resolvedEndpoint = await options.endpoint();
+        } else {
+          resolvedEndpoint = toEndpointV1(context.endpointV2!);
+        }
+
         resolvedEndpoint.hostname = `rds.${sourceRegion}.amazonaws.com`;
         const request = new HttpRequest({
           ...resolvedEndpoint,
@@ -92,16 +105,18 @@ export function crossRegionPresignedUrlMiddleware(options: PreviouslyResolved):
     };
 }
 
-export const crossRegionPresignedUrlMiddlewareOptions: InitializeHandlerOptions = {
-  step: "initialize",
+export const crossRegionPresignedUrlMiddlewareOptions: SerializeHandlerOptions & RelativeMiddlewareOptions = {
+  step: "serialize",
   tags: ["CROSS_REGION_PRESIGNED_URL"],
   name: "crossRegionPresignedUrlMiddleware",
   override: true,
+  relation: "after",
+  toMiddleware: "endpointV2Middleware",
 };
 
 export const getCrossRegionPresignedUrlPlugin = (config: PreviouslyResolved): Pluggable<any, any> => ({
   applyToStack: (clientStack) => {
-    clientStack.add(crossRegionPresignedUrlMiddleware(config), crossRegionPresignedUrlMiddlewareOptions);
+    clientStack.addRelativeTo(crossRegionPresignedUrlMiddleware(config), crossRegionPresignedUrlMiddlewareOptions);
   },
 });