@aws-sdk/middleware-sdk-rds 3.25.0 → 3.32.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +38 -0
- package/dist/cjs/index.js +11 -22
- package/dist/es/index.js +24 -42
- package/package.json +6 -7
- package/src/index.ts +13 -24
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,44 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [3.32.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.31.0...v3.32.0) (2021-09-17)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @aws-sdk/middleware-sdk-rds
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [3.31.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.30.0...v3.31.0) (2021-09-11)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* **middleware-sdk-rds:** stop throw when source id key is optional ([#2770](https://github.com/aws/aws-sdk-js-v3/issues/2770)) ([299cbbb](https://github.com/aws/aws-sdk-js-v3/commit/299cbbbef934380cdf56c668cc8cd7eebb7f73e5))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
# [3.30.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.29.0...v3.30.0) (2021-09-07)
|
|
26
|
+
|
|
27
|
+
**Note:** Version bump only for package @aws-sdk/middleware-sdk-rds
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
# [3.29.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.28.0...v3.29.0) (2021-09-02)
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
### Bug Fixes
|
|
37
|
+
|
|
38
|
+
* **middleware-sdk-rds:** double encoding the presigned url ([#2711](https://github.com/aws/aws-sdk-js-v3/issues/2711)) ([8a271be](https://github.com/aws/aws-sdk-js-v3/commit/8a271be6ac94080010aa4c3567b6770a2eee5547))
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
6
44
|
# [3.25.0](https://github.com/aws/aws-sdk-js-v3/compare/v3.24.0...v3.25.0) (2021-08-05)
|
|
7
45
|
|
|
8
46
|
**Note:** Version bump only for package @aws-sdk/middleware-sdk-rds
|
package/dist/cjs/index.js
CHANGED
|
@@ -4,19 +4,13 @@ exports.getCrossRegionPresignedUrlPlugin = exports.crossRegionPresignedUrlMiddle
|
|
|
4
4
|
const protocol_http_1 = require("@aws-sdk/protocol-http");
|
|
5
5
|
const signature_v4_1 = require("@aws-sdk/signature-v4");
|
|
6
6
|
const util_format_url_1 = require("@aws-sdk/util-format-url");
|
|
7
|
-
const util_uri_escape_1 = require("@aws-sdk/util-uri-escape");
|
|
8
7
|
const regARN = /arn:[\w+=/,.@-]+:[\w+=/,.@-]+:([\w+=/,.@-]*)?:[0-9]+:[\w+=/,.@-]+(:[\w+=/,.@-]+)?(:[\w+=/,.@-]+)?/;
|
|
9
|
-
const sourceIds = [
|
|
10
|
-
"SourceDBSnapshotIdentifier",
|
|
11
|
-
"SourceDBInstanceIdentifier",
|
|
12
|
-
"ReplicationSourceIdentifier",
|
|
13
|
-
"SourceDBClusterSnapshotIdentifier",
|
|
14
|
-
];
|
|
15
8
|
const sourceIdToCommandKeyMap = {
|
|
16
9
|
SourceDBSnapshotIdentifier: "CopyDBSnapshot",
|
|
17
10
|
SourceDBInstanceIdentifier: "CreateDBInstanceReadReplica",
|
|
18
11
|
ReplicationSourceIdentifier: "CreateDBCluster",
|
|
19
12
|
SourceDBClusterSnapshotIdentifier: "CopyDBClusterSnapshot",
|
|
13
|
+
SourceDBInstanceArn: "StartDBInstanceAutomatedBackupsReplication",
|
|
20
14
|
};
|
|
21
15
|
const version = "2014-10-31";
|
|
22
16
|
/**
|
|
@@ -27,18 +21,13 @@ function crossRegionPresignedUrlMiddleware(options) {
|
|
|
27
21
|
return (next) => async (args) => {
|
|
28
22
|
const { input } = args;
|
|
29
23
|
const region = await options.region();
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
if (!sourceId) {
|
|
38
|
-
throw new Error("Source identifier key not set");
|
|
39
|
-
}
|
|
40
|
-
if (!input.PreSignedUrl && isARN(input[sourceId]) && region !== getEndpointFromARN(input[sourceId])) {
|
|
41
|
-
const sourceRegion = getEndpointFromARN(input[sourceId]);
|
|
24
|
+
const sourceIdKey = Object.keys(sourceIdToCommandKeyMap).filter((sourceKeyId) => input.hasOwnProperty(sourceKeyId))[0];
|
|
25
|
+
// Source id is optional.
|
|
26
|
+
if (!sourceIdKey)
|
|
27
|
+
return next(args);
|
|
28
|
+
const command = sourceIdToCommandKeyMap[sourceIdKey];
|
|
29
|
+
if (!input.PreSignedUrl && isARN(input[sourceIdKey]) && region !== getEndpointFromARN(input[sourceIdKey])) {
|
|
30
|
+
const sourceRegion = getEndpointFromARN(input[sourceIdKey]);
|
|
42
31
|
const resolvedEndpoint = await options.endpoint();
|
|
43
32
|
resolvedEndpoint.hostname = `rds.${sourceRegion}.amazonaws.com`;
|
|
44
33
|
const request = new protocol_http_1.HttpRequest({
|
|
@@ -52,7 +41,7 @@ function crossRegionPresignedUrlMiddleware(options) {
|
|
|
52
41
|
Version: version,
|
|
53
42
|
KmsKeyId: input.KmsKeyId,
|
|
54
43
|
DestinationRegion: region,
|
|
55
|
-
[
|
|
44
|
+
[sourceIdKey]: input[sourceIdKey],
|
|
56
45
|
},
|
|
57
46
|
});
|
|
58
47
|
const signer = new signature_v4_1.SignatureV4({
|
|
@@ -69,7 +58,7 @@ function crossRegionPresignedUrlMiddleware(options) {
|
|
|
69
58
|
...args,
|
|
70
59
|
input: {
|
|
71
60
|
...args.input,
|
|
72
|
-
PreSignedUrl:
|
|
61
|
+
PreSignedUrl: util_format_url_1.formatUrl(presignedRequest),
|
|
73
62
|
},
|
|
74
63
|
};
|
|
75
64
|
}
|
|
@@ -101,4 +90,4 @@ function getEndpointFromARN(arn) {
|
|
|
101
90
|
}
|
|
102
91
|
return arnArr[3];
|
|
103
92
|
}
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpRequest } from \"@aws-sdk/protocol-http\";\nimport { SignatureV4 } from \"@aws-sdk/signature-v4\";\nimport {\n  Credentials,\n  Endpoint,\n  HashConstructor,\n  InitializeHandler,\n  InitializeHandlerArguments,\n  InitializeHandlerOptions,\n  InitializeHandlerOutput,\n  InitializeMiddleware,\n  MetadataBearer,\n  Pluggable,\n  Provider,\n} from \"@aws-sdk/types\";\nimport { formatUrl } from \"@aws-sdk/util-format-url\";\n\nconst regARN = /arn:[\\w+=/,.@-]+:[\\w+=/,.@-]+:([\\w+=/,.@-]*)?:[0-9]+:[\\w+=/,.@-]+(:[\\w+=/,.@-]+)?(:[\\w+=/,.@-]+)?/;\n\nconst sourceIdToCommandKeyMap: { [key: string]: string } = {\n  SourceDBSnapshotIdentifier: \"CopyDBSnapshot\",\n  SourceDBInstanceIdentifier: \"CreateDBInstanceReadReplica\",\n  ReplicationSourceIdentifier: \"CreateDBCluster\", // This key is optional.\n  SourceDBClusterSnapshotIdentifier: \"CopyDBClusterSnapshot\",\n  SourceDBInstanceArn: \"StartDBInstanceAutomatedBackupsReplication\",\n};\n\nconst version = \"2014-10-31\";\n\ninterface PreviouslyResolved {\n  credentials: Provider<Credentials>;\n  endpoint: Provider<Endpoint>;\n  region: Provider<string>;\n  sha256: HashConstructor;\n  signingEscapePath: boolean;\n}\n\n/**\n * Config of the middleware to automatically add presigned URL to request.\n * The presigned URL is generated by sigV4\n */\nexport function crossRegionPresignedUrlMiddleware(options: PreviouslyResolved): InitializeMiddleware<any, any> {\n  return <Output extends MetadataBearer>(next: InitializeHandler<any, Output>): InitializeHandler<any, Output> =>\n    async (args: InitializeHandlerArguments<any>): Promise<InitializeHandlerOutput<Output>> => {\n      const { input } = args;\n      const region = await options.region();\n      const sourceIdKey = Object.keys(sourceIdToCommandKeyMap).filter((sourceKeyId) =>\n        input.hasOwnProperty(sourceKeyId)\n      )[0];\n      // Source id is optional.\n      if (!sourceIdKey) return next(args);\n\n      const command = sourceIdToCommandKeyMap[sourceIdKey];\n      if (!input.PreSignedUrl && isARN(input[sourceIdKey]) && region !== getEndpointFromARN(input[sourceIdKey])) {\n        const sourceRegion = getEndpointFromARN(input[sourceIdKey]);\n        const resolvedEndpoint = await options.endpoint();\n        resolvedEndpoint.hostname = `rds.${sourceRegion}.amazonaws.com`;\n        const request = new HttpRequest({\n          ...resolvedEndpoint,\n          protocol: \"https\",\n          headers: {\n            host: resolvedEndpoint.hostname,\n          },\n          query: {\n            Action: command,\n            Version: version,\n            KmsKeyId: input.KmsKeyId,\n            DestinationRegion: region,\n            [sourceIdKey]: input[sourceIdKey],\n          },\n        });\n        const signer = new SignatureV4({\n          credentials: options.credentials,\n          region: sourceRegion,\n          service: \"rds\",\n          sha256: options.sha256,\n          uriEscapePath: options.signingEscapePath,\n        });\n        const presignedRequest = await signer.presign(request, {\n          expiresIn: 3600,\n        });\n        args = {\n          ...args,\n          input: {\n            ...args.input,\n            PreSignedUrl: formatUrl(presignedRequest),\n          },\n        };\n      }\n      return next(args);\n    };\n}\n\nexport const crossRegionPresignedUrlMiddlewareOptions: InitializeHandlerOptions = {\n  step: \"initialize\",\n  tags: [\"CROSS_REGION_PRESIGNED_URL\"],\n  name: \"crossRegionPresignedUrlMiddleware\",\n  override: true,\n};\n\nexport const getCrossRegionPresignedUrlPlugin = (config: PreviouslyResolved): Pluggable<any, any> => ({\n  applyToStack: (clientStack) => {\n    clientStack.add(crossRegionPresignedUrlMiddleware(config), crossRegionPresignedUrlMiddlewareOptions);\n  },\n});\n\nfunction isARN(id: string | undefined): boolean {\n  if (!id) return false;\n  return regARN.test(id);\n}\n\nfunction getEndpointFromARN(arn: string): string {\n  const arnArr = arn.split(\":\");\n  if (arnArr.length < 4) {\n    throw new Error(`Cannot infer endpoint from '${arn}'`);\n  }\n  return arnArr[3];\n}\n"]}
|
package/dist/es/index.js
CHANGED
|
@@ -1,20 +1,14 @@
|
|
|
1
|
-
import { __assign, __awaiter, __generator
|
|
1
|
+
import { __assign, __awaiter, __generator } from "tslib";
|
|
2
2
|
import { HttpRequest } from "@aws-sdk/protocol-http";
|
|
3
3
|
import { SignatureV4 } from "@aws-sdk/signature-v4";
|
|
4
4
|
import { formatUrl } from "@aws-sdk/util-format-url";
|
|
5
|
-
import { escapeUri } from "@aws-sdk/util-uri-escape";
|
|
6
5
|
var regARN = /arn:[\w+=/,.@-]+:[\w+=/,.@-]+:([\w+=/,.@-]*)?:[0-9]+:[\w+=/,.@-]+(:[\w+=/,.@-]+)?(:[\w+=/,.@-]+)?/;
|
|
7
|
-
var sourceIds = [
|
|
8
|
-
"SourceDBSnapshotIdentifier",
|
|
9
|
-
"SourceDBInstanceIdentifier",
|
|
10
|
-
"ReplicationSourceIdentifier",
|
|
11
|
-
"SourceDBClusterSnapshotIdentifier",
|
|
12
|
-
];
|
|
13
6
|
var sourceIdToCommandKeyMap = {
|
|
14
7
|
SourceDBSnapshotIdentifier: "CopyDBSnapshot",
|
|
15
8
|
SourceDBInstanceIdentifier: "CreateDBInstanceReadReplica",
|
|
16
9
|
ReplicationSourceIdentifier: "CreateDBCluster",
|
|
17
10
|
SourceDBClusterSnapshotIdentifier: "CopyDBClusterSnapshot",
|
|
11
|
+
SourceDBInstanceArn: "StartDBInstanceAutomatedBackupsReplication",
|
|
18
12
|
};
|
|
19
13
|
var version = "2014-10-31";
|
|
20
14
|
/**
|
|
@@ -25,50 +19,38 @@ export function crossRegionPresignedUrlMiddleware(options) {
|
|
|
25
19
|
var _this = this;
|
|
26
20
|
return function (next) {
|
|
27
21
|
return function (args) { return __awaiter(_this, void 0, void 0, function () {
|
|
28
|
-
var input, region,
|
|
29
|
-
var
|
|
30
|
-
return __generator(this, function (
|
|
31
|
-
switch (
|
|
22
|
+
var input, region, sourceIdKey, command, sourceRegion, resolvedEndpoint, request, signer, presignedRequest;
|
|
23
|
+
var _a;
|
|
24
|
+
return __generator(this, function (_b) {
|
|
25
|
+
switch (_b.label) {
|
|
32
26
|
case 0:
|
|
33
27
|
input = args.input;
|
|
34
28
|
return [4 /*yield*/, options.region()];
|
|
35
29
|
case 1:
|
|
36
|
-
region =
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
47
|
-
finally {
|
|
48
|
-
try {
|
|
49
|
-
if (sourceIds_1_1 && !sourceIds_1_1.done && (_a = sourceIds_1.return)) _a.call(sourceIds_1);
|
|
50
|
-
}
|
|
51
|
-
finally { if (e_1) throw e_1.error; }
|
|
52
|
-
}
|
|
53
|
-
if (!sourceId) {
|
|
54
|
-
throw new Error("Source identifier key not set");
|
|
55
|
-
}
|
|
56
|
-
if (!(!input.PreSignedUrl && isARN(input[sourceId]) && region !== getEndpointFromARN(input[sourceId]))) return [3 /*break*/, 4];
|
|
57
|
-
sourceRegion = getEndpointFromARN(input[sourceId]);
|
|
30
|
+
region = _b.sent();
|
|
31
|
+
sourceIdKey = Object.keys(sourceIdToCommandKeyMap).filter(function (sourceKeyId) {
|
|
32
|
+
return input.hasOwnProperty(sourceKeyId);
|
|
33
|
+
})[0];
|
|
34
|
+
// Source id is optional.
|
|
35
|
+
if (!sourceIdKey)
|
|
36
|
+
return [2 /*return*/, next(args)];
|
|
37
|
+
command = sourceIdToCommandKeyMap[sourceIdKey];
|
|
38
|
+
if (!(!input.PreSignedUrl && isARN(input[sourceIdKey]) && region !== getEndpointFromARN(input[sourceIdKey]))) return [3 /*break*/, 4];
|
|
39
|
+
sourceRegion = getEndpointFromARN(input[sourceIdKey]);
|
|
58
40
|
return [4 /*yield*/, options.endpoint()];
|
|
59
41
|
case 2:
|
|
60
|
-
resolvedEndpoint =
|
|
42
|
+
resolvedEndpoint = _b.sent();
|
|
61
43
|
resolvedEndpoint.hostname = "rds." + sourceRegion + ".amazonaws.com";
|
|
62
44
|
request = new HttpRequest(__assign(__assign({}, resolvedEndpoint), { protocol: "https", headers: {
|
|
63
45
|
host: resolvedEndpoint.hostname,
|
|
64
|
-
}, query: (
|
|
46
|
+
}, query: (_a = {
|
|
65
47
|
Action: command,
|
|
66
48
|
Version: version,
|
|
67
49
|
KmsKeyId: input.KmsKeyId,
|
|
68
50
|
DestinationRegion: region
|
|
69
51
|
},
|
|
70
|
-
|
|
71
|
-
|
|
52
|
+
_a[sourceIdKey] = input[sourceIdKey],
|
|
53
|
+
_a) }));
|
|
72
54
|
signer = new SignatureV4({
|
|
73
55
|
credentials: options.credentials,
|
|
74
56
|
region: sourceRegion,
|
|
@@ -80,9 +62,9 @@ export function crossRegionPresignedUrlMiddleware(options) {
|
|
|
80
62
|
expiresIn: 3600,
|
|
81
63
|
})];
|
|
82
64
|
case 3:
|
|
83
|
-
presignedRequest =
|
|
84
|
-
args = __assign(__assign({}, args), { input: __assign(__assign({}, args.input), { PreSignedUrl:
|
|
85
|
-
|
|
65
|
+
presignedRequest = _b.sent();
|
|
66
|
+
args = __assign(__assign({}, args), { input: __assign(__assign({}, args.input), { PreSignedUrl: formatUrl(presignedRequest) }) });
|
|
67
|
+
_b.label = 4;
|
|
86
68
|
case 4: return [2 /*return*/, next(args)];
|
|
87
69
|
}
|
|
88
70
|
});
|
|
@@ -112,4 +94,4 @@ function getEndpointFromARN(arn) {
|
|
|
112
94
|
}
|
|
113
95
|
return arnArr[3];
|
|
114
96
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpRequest } from \"@aws-sdk/protocol-http\";\nimport { SignatureV4 } from \"@aws-sdk/signature-v4\";\nimport {\n  Credentials,\n  Endpoint,\n  HashConstructor,\n  InitializeHandler,\n  InitializeHandlerArguments,\n  InitializeHandlerOptions,\n  InitializeHandlerOutput,\n  InitializeMiddleware,\n  MetadataBearer,\n  Pluggable,\n  Provider,\n} from \"@aws-sdk/types\";\nimport { formatUrl } from \"@aws-sdk/util-format-url\";\n\nconst regARN = /arn:[\\w+=/,.@-]+:[\\w+=/,.@-]+:([\\w+=/,.@-]*)?:[0-9]+:[\\w+=/,.@-]+(:[\\w+=/,.@-]+)?(:[\\w+=/,.@-]+)?/;\n\nconst sourceIdToCommandKeyMap: { [key: string]: string } = {\n  SourceDBSnapshotIdentifier: \"CopyDBSnapshot\",\n  SourceDBInstanceIdentifier: \"CreateDBInstanceReadReplica\",\n  ReplicationSourceIdentifier: \"CreateDBCluster\", // This key is optional.\n  SourceDBClusterSnapshotIdentifier: \"CopyDBClusterSnapshot\",\n  SourceDBInstanceArn: \"StartDBInstanceAutomatedBackupsReplication\",\n};\n\nconst version = \"2014-10-31\";\n\ninterface PreviouslyResolved {\n  credentials: Provider<Credentials>;\n  endpoint: Provider<Endpoint>;\n  region: Provider<string>;\n  sha256: HashConstructor;\n  signingEscapePath: boolean;\n}\n\n/**\n * Config of the middleware to automatically add presigned URL to request.\n * The presigned URL is generated by sigV4\n */\nexport function crossRegionPresignedUrlMiddleware(options: PreviouslyResolved): InitializeMiddleware<any, any> {\n  return <Output extends MetadataBearer>(next: InitializeHandler<any, Output>): InitializeHandler<any, Output> =>\n    async (args: InitializeHandlerArguments<any>): Promise<InitializeHandlerOutput<Output>> => {\n      const { input } = args;\n      const region = await options.region();\n      const sourceIdKey = Object.keys(sourceIdToCommandKeyMap).filter((sourceKeyId) =>\n        input.hasOwnProperty(sourceKeyId)\n      )[0];\n      // Source id is optional.\n      if (!sourceIdKey) return next(args);\n\n      const command = sourceIdToCommandKeyMap[sourceIdKey];\n      if (!input.PreSignedUrl && isARN(input[sourceIdKey]) && region !== getEndpointFromARN(input[sourceIdKey])) {\n        const sourceRegion = getEndpointFromARN(input[sourceIdKey]);\n        const resolvedEndpoint = await options.endpoint();\n        resolvedEndpoint.hostname = `rds.${sourceRegion}.amazonaws.com`;\n        const request = new HttpRequest({\n          ...resolvedEndpoint,\n          protocol: \"https\",\n          headers: {\n            host: resolvedEndpoint.hostname,\n          },\n          query: {\n            Action: command,\n            Version: version,\n            KmsKeyId: input.KmsKeyId,\n            DestinationRegion: region,\n            [sourceIdKey]: input[sourceIdKey],\n          },\n        });\n        const signer = new SignatureV4({\n          credentials: options.credentials,\n          region: sourceRegion,\n          service: \"rds\",\n          sha256: options.sha256,\n          uriEscapePath: options.signingEscapePath,\n        });\n        const presignedRequest = await signer.presign(request, {\n          expiresIn: 3600,\n        });\n        args = {\n          ...args,\n          input: {\n            ...args.input,\n            PreSignedUrl: formatUrl(presignedRequest),\n          },\n        };\n      }\n      return next(args);\n    };\n}\n\nexport const crossRegionPresignedUrlMiddlewareOptions: InitializeHandlerOptions = {\n  step: \"initialize\",\n  tags: [\"CROSS_REGION_PRESIGNED_URL\"],\n  name: \"crossRegionPresignedUrlMiddleware\",\n  override: true,\n};\n\nexport const getCrossRegionPresignedUrlPlugin = (config: PreviouslyResolved): Pluggable<any, any> => ({\n  applyToStack: (clientStack) => {\n    clientStack.add(crossRegionPresignedUrlMiddleware(config), crossRegionPresignedUrlMiddlewareOptions);\n  },\n});\n\nfunction isARN(id: string | undefined): boolean {\n  if (!id) return false;\n  return regARN.test(id);\n}\n\nfunction getEndpointFromARN(arn: string): string {\n  const arnArr = arn.split(\":\");\n  if (arnArr.length < 4) {\n    throw new Error(`Cannot infer endpoint from '${arn}'`);\n  }\n  return arnArr[3];\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-sdk/middleware-sdk-rds",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.32.0",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"build:cjs": "tsc -p tsconfig.cjs.json",
|
|
6
6
|
"build:es": "tsc -p tsconfig.es.json",
|
|
@@ -17,17 +17,16 @@
|
|
|
17
17
|
},
|
|
18
18
|
"license": "Apache-2.0",
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@aws-sdk/protocol-http": "3.
|
|
21
|
-
"@aws-sdk/signature-v4": "3.
|
|
22
|
-
"@aws-sdk/types": "3.
|
|
23
|
-
"@aws-sdk/util-format-url": "3.
|
|
24
|
-
"@aws-sdk/util-uri-escape": "3.23.0",
|
|
20
|
+
"@aws-sdk/protocol-http": "3.32.0",
|
|
21
|
+
"@aws-sdk/signature-v4": "3.32.0",
|
|
22
|
+
"@aws-sdk/types": "3.32.0",
|
|
23
|
+
"@aws-sdk/util-format-url": "3.32.0",
|
|
25
24
|
"tslib": "^2.3.0"
|
|
26
25
|
},
|
|
27
26
|
"devDependencies": {
|
|
28
27
|
"@types/jest": "^26.0.4",
|
|
29
28
|
"jest": "^26.1.0",
|
|
30
|
-
"typescript": "~4.3.
|
|
29
|
+
"typescript": "~4.3.5"
|
|
31
30
|
},
|
|
32
31
|
"engines": {
|
|
33
32
|
"node": ">= 10.0.0"
|
package/src/index.ts
CHANGED
|
@@ -14,22 +14,15 @@ import {
|
|
|
14
14
|
Provider,
|
|
15
15
|
} from "@aws-sdk/types";
|
|
16
16
|
import { formatUrl } from "@aws-sdk/util-format-url";
|
|
17
|
-
import { escapeUri } from "@aws-sdk/util-uri-escape";
|
|
18
17
|
|
|
19
18
|
const regARN = /arn:[\w+=/,.@-]+:[\w+=/,.@-]+:([\w+=/,.@-]*)?:[0-9]+:[\w+=/,.@-]+(:[\w+=/,.@-]+)?(:[\w+=/,.@-]+)?/;
|
|
20
19
|
|
|
21
|
-
const sourceIds: string[] = [
|
|
22
|
-
"SourceDBSnapshotIdentifier",
|
|
23
|
-
"SourceDBInstanceIdentifier",
|
|
24
|
-
"ReplicationSourceIdentifier",
|
|
25
|
-
"SourceDBClusterSnapshotIdentifier",
|
|
26
|
-
];
|
|
27
|
-
|
|
28
20
|
const sourceIdToCommandKeyMap: { [key: string]: string } = {
|
|
29
21
|
SourceDBSnapshotIdentifier: "CopyDBSnapshot",
|
|
30
22
|
SourceDBInstanceIdentifier: "CreateDBInstanceReadReplica",
|
|
31
|
-
ReplicationSourceIdentifier: "CreateDBCluster",
|
|
23
|
+
ReplicationSourceIdentifier: "CreateDBCluster", // This key is optional.
|
|
32
24
|
SourceDBClusterSnapshotIdentifier: "CopyDBClusterSnapshot",
|
|
25
|
+
SourceDBInstanceArn: "StartDBInstanceAutomatedBackupsReplication",
|
|
33
26
|
};
|
|
34
27
|
|
|
35
28
|
const version = "2014-10-31";
|
|
@@ -46,24 +39,20 @@ interface PreviouslyResolved {
|
|
|
46
39
|
* Config of the middleware to automatically add presigned URL to request.
|
|
47
40
|
* The presigned URL is generated by sigV4
|
|
48
41
|
*/
|
|
49
|
-
|
|
50
42
|
export function crossRegionPresignedUrlMiddleware(options: PreviouslyResolved): InitializeMiddleware<any, any> {
|
|
51
43
|
return <Output extends MetadataBearer>(next: InitializeHandler<any, Output>): InitializeHandler<any, Output> =>
|
|
52
44
|
async (args: InitializeHandlerArguments<any>): Promise<InitializeHandlerOutput<Output>> => {
|
|
53
45
|
const { input } = args;
|
|
54
46
|
const region = await options.region();
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (!
|
|
63
|
-
|
|
64
|
-
}
|
|
65
|
-
if (!input.PreSignedUrl && isARN(input[sourceId]) && region !== getEndpointFromARN(input[sourceId])) {
|
|
66
|
-
const sourceRegion = getEndpointFromARN(input[sourceId]);
|
|
47
|
+
const sourceIdKey = Object.keys(sourceIdToCommandKeyMap).filter((sourceKeyId) =>
|
|
48
|
+
input.hasOwnProperty(sourceKeyId)
|
|
49
|
+
)[0];
|
|
50
|
+
// Source id is optional.
|
|
51
|
+
if (!sourceIdKey) return next(args);
|
|
52
|
+
|
|
53
|
+
const command = sourceIdToCommandKeyMap[sourceIdKey];
|
|
54
|
+
if (!input.PreSignedUrl && isARN(input[sourceIdKey]) && region !== getEndpointFromARN(input[sourceIdKey])) {
|
|
55
|
+
const sourceRegion = getEndpointFromARN(input[sourceIdKey]);
|
|
67
56
|
const resolvedEndpoint = await options.endpoint();
|
|
68
57
|
resolvedEndpoint.hostname = `rds.${sourceRegion}.amazonaws.com`;
|
|
69
58
|
const request = new HttpRequest({
|
|
@@ -77,7 +66,7 @@ export function crossRegionPresignedUrlMiddleware(options: PreviouslyResolved):
|
|
|
77
66
|
Version: version,
|
|
78
67
|
KmsKeyId: input.KmsKeyId,
|
|
79
68
|
DestinationRegion: region,
|
|
80
|
-
[
|
|
69
|
+
[sourceIdKey]: input[sourceIdKey],
|
|
81
70
|
},
|
|
82
71
|
});
|
|
83
72
|
const signer = new SignatureV4({
|
|
@@ -94,7 +83,7 @@ export function crossRegionPresignedUrlMiddleware(options: PreviouslyResolved):
|
|
|
94
83
|
...args,
|
|
95
84
|
input: {
|
|
96
85
|
...args.input,
|
|
97
|
-
PreSignedUrl:
|
|
86
|
+
PreSignedUrl: formatUrl(presignedRequest),
|
|
98
87
|
},
|
|
99
88
|
};
|
|
100
89
|
}
|