@aws-sdk/middleware-sdk-rds 3.198.0 → 3.200.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.200.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.199.0...v3.200.0) (2022-10-31)
+
+
+### Bug Fixes
+
+* **endpoint:** instruct rds middleware to wait for endpoint resolution ([#4120](https://github.com/aws/aws-sdk-js-v3/issues/4120)) ([7cabc1e](https://github.com/aws/aws-sdk-js-v3/commit/7cabc1ebe4f1f8c37b29b421572b69cf57d2eb4b))
+
+
+
+
+
+# [3.199.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.198.0...v3.199.0) (2022-10-28)
+
+**Note:** Version bump only for package @aws-sdk/middleware-sdk-rds
+
+
+
+
+
 # [3.198.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.197.0...v3.198.0) (2022-10-27)
 
 **Note:** Version bump only for package @aws-sdk/middleware-sdk-rds

package/dist-cjs/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCrossRegionPresignedUrlPlugin = exports.crossRegionPresignedUrlMiddlewareOptions = exports.crossRegionPresignedUrlMiddleware = void 0;
+const middleware_endpoint_1 = require("@aws-sdk/middleware-endpoint");
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const signature_v4_1 = require("@aws-sdk/signature-v4");
 const util_format_url_1 = require("@aws-sdk/util-format-url");
@@ -14,7 +15,7 @@ const sourceIdToCommandKeyMap = {
 };
 const version = "2014-10-31";
 function crossRegionPresignedUrlMiddleware(options) {
-    return (next) => async (args) => {
+    return (next, context) => async (args) => {
         const { input } = args;
         const region = await options.region();
         const sourceIdKey = Object.keys(sourceIdToCommandKeyMap).filter((sourceKeyId) => input.hasOwnProperty(sourceKeyId))[0];
@@ -23,7 +24,13 @@ function crossRegionPresignedUrlMiddleware(options) {
         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;
+            if (typeof options.endpoint === "function") {
+                resolvedEndpoint = await options.endpoint();
+            }
+            else {
+                resolvedEndpoint = (0, middleware_endpoint_1.toEndpointV1)(context.endpointV2);
+            }
             resolvedEndpoint.hostname = `rds.${sourceRegion}.amazonaws.com`;
             const request = new protocol_http_1.HttpRequest({
                 ...resolvedEndpoint,
@@ -62,14 +69,16 @@ function crossRegionPresignedUrlMiddleware(options) {
 }
 exports.crossRegionPresignedUrlMiddleware = crossRegionPresignedUrlMiddleware;
 exports.crossRegionPresignedUrlMiddlewareOptions = {
-    step: "initialize",
+    step: "serialize",
     tags: ["CROSS_REGION_PRESIGNED_URL"],
     name: "crossRegionPresignedUrlMiddleware",
     override: true,
+    relation: "after",
+    toMiddleware: "endpointV2Middleware",
 };
 const getCrossRegionPresignedUrlPlugin = (config) => ({
     applyToStack: (clientStack) => {
-        clientStack.add(crossRegionPresignedUrlMiddleware(config), exports.crossRegionPresignedUrlMiddlewareOptions);
+        clientStack.addRelativeTo(crossRegionPresignedUrlMiddleware(config), exports.crossRegionPresignedUrlMiddlewareOptions);
     },
 });
 exports.getCrossRegionPresignedUrlPlugin = getCrossRegionPresignedUrlPlugin;

package/dist-es/index.js

@@ -1,3 +1,4 @@
+import { toEndpointV1 } from "@aws-sdk/middleware-endpoint";
 import { HttpRequest } from "@aws-sdk/protocol-http";
 import { SignatureV4 } from "@aws-sdk/signature-v4";
 import { formatUrl } from "@aws-sdk/util-format-url";
@@ -11,7 +12,7 @@ const sourceIdToCommandKeyMap = {
 };
 const version = "2014-10-31";
 export function crossRegionPresignedUrlMiddleware(options) {
-    return (next) => async (args) => {
+    return (next, context) => async (args) => {
         const { input } = args;
         const region = await options.region();
         const sourceIdKey = Object.keys(sourceIdToCommandKeyMap).filter((sourceKeyId) => input.hasOwnProperty(sourceKeyId))[0];
@@ -20,7 +21,13 @@ export function crossRegionPresignedUrlMiddleware(options) {
         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;
+            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,
@@ -58,14 +65,16 @@ export function crossRegionPresignedUrlMiddleware(options) {
     };
 }
 export const crossRegionPresignedUrlMiddlewareOptions = {
-    step: "initialize",
+    step: "serialize",
     tags: ["CROSS_REGION_PRESIGNED_URL"],
     name: "crossRegionPresignedUrlMiddleware",
     override: true,
+    relation: "after",
+    toMiddleware: "endpointV2Middleware",
 };
 export const getCrossRegionPresignedUrlPlugin = (config) => ({
     applyToStack: (clientStack) => {
-        clientStack.add(crossRegionPresignedUrlMiddleware(config), crossRegionPresignedUrlMiddlewareOptions);
+        clientStack.addRelativeTo(crossRegionPresignedUrlMiddleware(config), crossRegionPresignedUrlMiddlewareOptions);
     },
 });
 function isARN(id) {

package/dist-types/index.d.ts

@@ -1,7 +1,7 @@
-import { Credentials, Endpoint, HashConstructor, InitializeHandlerOptions, InitializeMiddleware, MemoizedProvider, Pluggable, Provider } from "@aws-sdk/types";
+import { Credentials, Endpoint, HashConstructor, InitializeMiddleware, MemoizedProvider, Pluggable, Provider, RelativeMiddlewareOptions, SerializeHandlerOptions } from "@aws-sdk/types";
 interface PreviouslyResolved {
     credentials: MemoizedProvider<Credentials>;
-    endpoint: Provider<Endpoint>;
+    endpoint?: Provider<Endpoint>;
     region: Provider<string>;
     sha256: HashConstructor;
     signingEscapePath: boolean;
@@ -11,6 +11,6 @@ interface PreviouslyResolved {
  * The presigned URL is generated by sigV4
  */
 export declare function crossRegionPresignedUrlMiddleware(options: PreviouslyResolved): InitializeMiddleware<any, any>;
-export declare const crossRegionPresignedUrlMiddlewareOptions: InitializeHandlerOptions;
+export declare const crossRegionPresignedUrlMiddlewareOptions: SerializeHandlerOptions & RelativeMiddlewareOptions;
 export declare const getCrossRegionPresignedUrlPlugin: (config: PreviouslyResolved) => Pluggable<any, any>;
 export {};

package/dist-types/ts3.4/index.d.ts

@@ -2,15 +2,16 @@ import {
   Credentials,
   Endpoint,
   HashConstructor,
-  InitializeHandlerOptions,
   InitializeMiddleware,
   MemoizedProvider,
   Pluggable,
   Provider,
+  RelativeMiddlewareOptions,
+  SerializeHandlerOptions,
 } from "@aws-sdk/types";
 interface PreviouslyResolved {
   credentials: MemoizedProvider<Credentials>;
-  endpoint: Provider<Endpoint>;
+  endpoint?: Provider<Endpoint>;
   region: Provider<string>;
   sha256: HashConstructor;
   signingEscapePath: boolean;
@@ -18,7 +19,8 @@ interface PreviouslyResolved {
 export declare function crossRegionPresignedUrlMiddleware(
   options: PreviouslyResolved
 ): InitializeMiddleware<any, any>;
-export declare const crossRegionPresignedUrlMiddlewareOptions: InitializeHandlerOptions;
+export declare const crossRegionPresignedUrlMiddlewareOptions: SerializeHandlerOptions &
+  RelativeMiddlewareOptions;
 export declare const getCrossRegionPresignedUrlPlugin: (
   config: PreviouslyResolved
 ) => Pluggable<any, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/middleware-sdk-rds",
-  "version": "3.198.0",
+  "version": "3.200.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -20,10 +20,11 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/protocol-http": "3.198.0",
-    "@aws-sdk/signature-v4": "3.198.0",
-    "@aws-sdk/types": "3.198.0",
-    "@aws-sdk/util-format-url": "3.198.0",
+    "@aws-sdk/middleware-endpoint": "3.200.0",
+    "@aws-sdk/protocol-http": "3.200.0",
+    "@aws-sdk/signature-v4": "3.200.0",
+    "@aws-sdk/types": "3.200.0",
+    "@aws-sdk/util-format-url": "3.200.0",
     "tslib": "^2.3.1"
   },
   "engines": {