@cdklabs/cdk-construct-connect-datalake 0.0.13 → 0.0.14
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/.jsii +9 -9
- package/lib/index.js +1 -1
- package/node_modules/@aws-sdk/client-cloudformation/package.json +5 -5
- package/node_modules/@aws-sdk/client-connect/package.json +5 -5
- package/node_modules/@aws-sdk/client-glue/dist-cjs/index.js +6 -4
- package/node_modules/@aws-sdk/client-glue/dist-cjs/schemas/schemas_0.js +57 -30
- package/node_modules/@aws-sdk/client-glue/dist-es/models/enums.js +6 -4
- package/node_modules/@aws-sdk/client-glue/dist-es/schemas/schemas_0.js +42 -15
- package/node_modules/@aws-sdk/client-glue/dist-types/commands/GetTableCommand.d.ts +121 -0
- package/node_modules/@aws-sdk/client-glue/dist-types/commands/GetTableVersionCommand.d.ts +118 -0
- package/node_modules/@aws-sdk/client-glue/dist-types/commands/GetTableVersionsCommand.d.ts +118 -0
- package/node_modules/@aws-sdk/client-glue/dist-types/commands/GetTablesCommand.d.ts +119 -1
- package/node_modules/@aws-sdk/client-glue/dist-types/commands/GetUnfilteredTableMetadataCommand.d.ts +118 -0
- package/node_modules/@aws-sdk/client-glue/dist-types/commands/SearchTablesCommand.d.ts +118 -0
- package/node_modules/@aws-sdk/client-glue/dist-types/commands/UpdateCrawlerScheduleCommand.d.ts +2 -1
- package/node_modules/@aws-sdk/client-glue/dist-types/models/enums.d.ts +14 -12
- package/node_modules/@aws-sdk/client-glue/dist-types/models/models_2.d.ts +87 -6
- package/node_modules/@aws-sdk/client-glue/dist-types/models/models_3.d.ts +11 -1
- package/node_modules/@aws-sdk/client-glue/dist-types/schemas/schemas_0.d.ts +1 -0
- package/node_modules/@aws-sdk/client-glue/dist-types/ts3.4/commands/UpdateCrawlerScheduleCommand.d.ts +2 -4
- package/node_modules/@aws-sdk/client-glue/dist-types/ts3.4/models/enums.d.ts +8 -6
- package/node_modules/@aws-sdk/client-glue/dist-types/ts3.4/models/models_2.d.ts +18 -1
- package/node_modules/@aws-sdk/client-glue/dist-types/ts3.4/models/models_3.d.ts +3 -0
- package/node_modules/@aws-sdk/client-glue/dist-types/ts3.4/schemas/schemas_0.d.ts +1 -0
- package/node_modules/@aws-sdk/client-glue/package.json +5 -5
- package/node_modules/@aws-sdk/client-lakeformation/package.json +5 -5
- package/node_modules/@aws-sdk/client-ram/package.json +5 -5
- package/node_modules/@aws-sdk/client-sts/package.json +6 -6
- package/node_modules/@aws-sdk/core/dist-cjs/index.js +47 -2297
- package/node_modules/@aws-sdk/core/dist-es/index.js +3 -3
- package/node_modules/@aws-sdk/core/dist-types/index.d.ts +5 -5
- package/node_modules/@aws-sdk/core/dist-types/ts3.4/index.d.ts +5 -5
- package/node_modules/@aws-sdk/core/package.json +8 -8
- package/node_modules/@aws-sdk/credential-provider-env/package.json +4 -4
- package/node_modules/@aws-sdk/credential-provider-http/package.json +6 -5
- package/node_modules/@aws-sdk/credential-provider-ini/package.json +11 -11
- package/node_modules/@aws-sdk/credential-provider-login/package.json +5 -5
- package/node_modules/@aws-sdk/credential-provider-node/package.json +9 -9
- package/node_modules/@aws-sdk/credential-provider-process/package.json +4 -4
- package/node_modules/@aws-sdk/credential-provider-sso/dist-cjs/index.js +4 -1
- package/node_modules/@aws-sdk/credential-provider-sso/dist-es/resolveSSOCredentials.js +4 -1
- package/node_modules/@aws-sdk/credential-provider-sso/package.json +9 -7
- package/node_modules/@aws-sdk/credential-provider-web-identity/package.json +5 -5
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/cognito-identity/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/signin/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso-oidc/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sts/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/package.json +6 -6
- package/node_modules/@aws-sdk/signature-v4-multi-region/package.json +7 -6
- package/node_modules/@aws-sdk/token-providers/package.json +5 -5
- package/node_modules/@aws-sdk/types/package.json +2 -2
- package/node_modules/@aws-sdk/util-locate-window/package.json +2 -2
- package/node_modules/{strnum → @aws-sdk/xml-builder/node_modules/strnum}/CHANGELOG.md +8 -0
- package/node_modules/{strnum → @aws-sdk/xml-builder/node_modules/strnum}/README.md +9 -0
- package/node_modules/{strnum → @aws-sdk/xml-builder/node_modules/strnum}/package.json +4 -1
- package/node_modules/{strnum → @aws-sdk/xml-builder/node_modules/strnum}/strnum.js +9 -1
- package/node_modules/@aws-sdk/xml-builder/package.json +2 -2
- package/node_modules/@nodable/entities/package.json +4 -1
- package/node_modules/@nodable/entities/src/EntityDecoder.js +104 -3
- package/node_modules/@nodable/entities/src/index.d.ts +77 -0
- package/node_modules/@nodable/entities/src/index.js +1 -1
- package/node_modules/@smithy/core/dist-cjs/index.js +13 -15
- package/node_modules/@smithy/core/dist-cjs/submodules/cbor/index.js +29 -31
- package/node_modules/@smithy/core/dist-cjs/submodules/checksum/index.browser.js +2 -4
- package/node_modules/@smithy/core/dist-cjs/submodules/checksum/index.js +7 -9
- package/node_modules/@smithy/core/dist-cjs/submodules/checksum/index.native.js +3 -5
- package/node_modules/@smithy/core/dist-cjs/submodules/client/index.js +22 -23
- package/node_modules/@smithy/core/dist-cjs/submodules/config/index.browser.js +10 -11
- package/node_modules/@smithy/core/dist-cjs/submodules/config/index.js +38 -39
- package/node_modules/@smithy/core/dist-cjs/submodules/config/index.native.js +10 -11
- package/node_modules/@smithy/core/dist-cjs/submodules/endpoints/index.browser.js +14 -17
- package/node_modules/@smithy/core/dist-cjs/submodules/endpoints/index.js +20 -23
- package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.browser.js +9 -11
- package/node_modules/@smithy/core/dist-cjs/submodules/event-streams/index.js +11 -13
- package/node_modules/@smithy/core/dist-cjs/submodules/protocols/index.js +59 -60
- package/node_modules/@smithy/core/dist-cjs/submodules/retry/index.browser.js +26 -27
- package/node_modules/@smithy/core/dist-cjs/submodules/retry/index.js +28 -29
- package/node_modules/@smithy/core/dist-cjs/submodules/schema/index.js +5 -7
- package/node_modules/@smithy/core/dist-cjs/submodules/serde/index.browser.js +4 -6
- package/node_modules/@smithy/core/dist-cjs/submodules/serde/index.js +23 -25
- package/node_modules/@smithy/core/dist-cjs/submodules/serde/index.native.js +4 -6
- package/node_modules/@smithy/core/dist-cjs/submodules/transport/index.js +2 -4
- package/node_modules/@smithy/core/dist-es/legacy-root-exports/middleware-http-auth-scheme/httpAuthSchemeMiddleware.js +1 -1
- package/node_modules/@smithy/core/dist-es/legacy-root-exports/middleware-http-signing/httpSigningMiddleware.js +1 -1
- package/node_modules/@smithy/core/dist-es/submodules/cbor/SmithyRpcV2CborProtocol.js +1 -1
- package/node_modules/@smithy/core/dist-es/submodules/endpoints/middleware-endpoint/endpointMiddleware.js +1 -1
- package/node_modules/@smithy/core/dist-es/submodules/retry/middleware-retry/retry-pre-sra-deprecated/StandardRetryStrategy.js +2 -2
- package/node_modules/@smithy/core/dist-es/submodules/retry/util-retry/DefaultRateLimiter.js +1 -1
- package/node_modules/@smithy/core/dist-types/submodules/schema/TypeRegistry.d.ts +1 -1
- package/node_modules/@smithy/core/package.json +18 -17
- package/node_modules/@smithy/credential-provider-imds/dist-cjs/index.js +23 -24
- package/node_modules/@smithy/credential-provider-imds/package.json +7 -7
- package/node_modules/@smithy/fetch-http-handler/dist-cjs/index.js +6 -8
- package/node_modules/@smithy/fetch-http-handler/package.json +10 -10
- package/node_modules/@smithy/node-http-handler/dist-cjs/index.js +11 -13
- package/node_modules/@smithy/node-http-handler/package.json +8 -8
- package/node_modules/@smithy/signature-v4/dist-cjs/index.js +27 -29
- package/node_modules/@smithy/signature-v4/package.json +7 -7
- package/node_modules/@smithy/types/dist-cjs/index.js +23 -18
- package/node_modules/@smithy/types/package.json +10 -10
- package/node_modules/anynum/LICENSE +21 -0
- package/node_modules/anynum/README.md +142 -0
- package/node_modules/anynum/anynum.js +135 -0
- package/node_modules/anynum/digitTable.js +116 -0
- package/node_modules/anynum/package.json +42 -0
- package/node_modules/watchpack/README.md +9 -0
- package/node_modules/watchpack/lib/DirectoryWatcher.js +182 -25
- package/node_modules/watchpack/lib/index.js +55 -15
- package/node_modules/watchpack/lib/reducePlan.js +56 -35
- package/node_modules/watchpack/lib/util/globToRegExp.js +142 -0
- package/node_modules/watchpack/lib/watchEventSource.js +18 -10
- package/node_modules/watchpack/package.json +17 -23
- package/node_modules/watchpack/types/DirectoryWatcher.d.ts +2 -0
- package/node_modules/watchpack/types/index.d.ts +121 -113
- package/node_modules/watchpack/types/util/globToRegExp.d.ts +2 -0
- package/node_modules/watchpack/types/watchpack.d.ts +1 -1
- package/package.json +10 -10
- package/node_modules/glob-to-regexp/.travis.yml +0 -4
- package/node_modules/glob-to-regexp/README.md +0 -75
- package/node_modules/glob-to-regexp/index.js +0 -130
- package/node_modules/glob-to-regexp/package.json +0 -23
- package/node_modules/glob-to-regexp/test.js +0 -235
- /package/node_modules/{strnum → @aws-sdk/xml-builder/node_modules/strnum}/LICENSE +0 -0
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var node_stream = require('node:stream');
|
|
5
|
-
var serde = require('@smithy/core/serde');
|
|
1
|
+
const { createReadStream } = require("node:fs");
|
|
2
|
+
const { Writable } = require("node:stream");
|
|
3
|
+
const { toUint8Array, fromUtf8 } = require("@smithy/core/serde");
|
|
6
4
|
|
|
7
5
|
async function blobReader(blob, onChunk, chunkSize = 1024 * 1024) {
|
|
8
6
|
const size = blob.size;
|
|
@@ -22,7 +20,7 @@ const blobHasher = async function blobHasher(hashCtor, blob) {
|
|
|
22
20
|
return hash.digest();
|
|
23
21
|
};
|
|
24
22
|
|
|
25
|
-
class HashCalculator extends
|
|
23
|
+
class HashCalculator extends Writable {
|
|
26
24
|
hash;
|
|
27
25
|
constructor(hash, options) {
|
|
28
26
|
super(options);
|
|
@@ -30,7 +28,7 @@ class HashCalculator extends node_stream.Writable {
|
|
|
30
28
|
}
|
|
31
29
|
_write(chunk, encoding, callback) {
|
|
32
30
|
try {
|
|
33
|
-
this.hash.update(
|
|
31
|
+
this.hash.update(toUint8Array(chunk));
|
|
34
32
|
}
|
|
35
33
|
catch (err) {
|
|
36
34
|
return callback(err);
|
|
@@ -44,7 +42,7 @@ const fileStreamHasher = (hashCtor, fileStream) => new Promise((resolve, reject)
|
|
|
44
42
|
reject(new Error("Unable to calculate hash for non-file streams."));
|
|
45
43
|
return;
|
|
46
44
|
}
|
|
47
|
-
const fileStreamTee =
|
|
45
|
+
const fileStreamTee = createReadStream(fileStream.path, {
|
|
48
46
|
start: fileStream.start,
|
|
49
47
|
end: fileStream.end,
|
|
50
48
|
});
|
|
@@ -244,7 +242,7 @@ function isEmptyData(data) {
|
|
|
244
242
|
}
|
|
245
243
|
function convertToBuffer(data) {
|
|
246
244
|
if (typeof data === "string") {
|
|
247
|
-
return
|
|
245
|
+
return fromUtf8(data);
|
|
248
246
|
}
|
|
249
247
|
if (ArrayBuffer.isView(data)) {
|
|
250
248
|
return new Uint8Array(data.buffer, data.byteOffset, data.byteLength / Uint8Array.BYTES_PER_ELEMENT);
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var serde = require('@smithy/core/serde');
|
|
1
|
+
const { fromUtf8, fromBase64 } = require("@smithy/core/serde");
|
|
4
2
|
|
|
5
3
|
async function blobReader$1(blob, onChunk, chunkSize = 1024 * 1024) {
|
|
6
4
|
const size = blob.size;
|
|
@@ -183,7 +181,7 @@ function isEmptyData(data) {
|
|
|
183
181
|
}
|
|
184
182
|
function convertToBuffer(data) {
|
|
185
183
|
if (typeof data === "string") {
|
|
186
|
-
return
|
|
184
|
+
return fromUtf8(data);
|
|
187
185
|
}
|
|
188
186
|
if (ArrayBuffer.isView(data)) {
|
|
189
187
|
return new Uint8Array(data.buffer, data.byteOffset, data.byteLength / Uint8Array.BYTES_PER_ELEMENT);
|
|
@@ -209,7 +207,7 @@ function blobReader(blob, onChunk, chunkSize = 1024 * 1024) {
|
|
|
209
207
|
const result = event.target.result;
|
|
210
208
|
const dataOffset = result.indexOf(",") + 1;
|
|
211
209
|
const data = result.substring(dataOffset);
|
|
212
|
-
const decoded =
|
|
210
|
+
const decoded = fromBase64(data);
|
|
213
211
|
onChunk(decoded);
|
|
214
212
|
totalBytesRead += decoded.byteLength;
|
|
215
213
|
read();
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
const { getSmithyContext, normalizeProvider } = require("@smithy/core/transport");
|
|
2
|
+
exports.getSmithyContext = getSmithyContext;
|
|
3
|
+
exports.normalizeProvider = normalizeProvider;
|
|
4
|
+
const { SMITHY_CONTEXT_KEY, AlgorithmId } = require("@smithy/types");
|
|
5
|
+
exports.AlgorithmId = AlgorithmId;
|
|
6
|
+
const { NormalizedSchema } = require("@smithy/core/schema");
|
|
6
7
|
|
|
7
8
|
const getAllAliases = (name, aliases) => {
|
|
8
9
|
const _aliases = [];
|
|
@@ -313,16 +314,16 @@ const waiterServiceDefaults = {
|
|
|
313
314
|
minDelay: 2,
|
|
314
315
|
maxDelay: 120,
|
|
315
316
|
};
|
|
316
|
-
|
|
317
|
+
var WaiterState;
|
|
317
318
|
(function (WaiterState) {
|
|
318
319
|
WaiterState["ABORTED"] = "ABORTED";
|
|
319
320
|
WaiterState["FAILURE"] = "FAILURE";
|
|
320
321
|
WaiterState["SUCCESS"] = "SUCCESS";
|
|
321
322
|
WaiterState["RETRY"] = "RETRY";
|
|
322
323
|
WaiterState["TIMEOUT"] = "TIMEOUT";
|
|
323
|
-
})(
|
|
324
|
+
})(WaiterState || (WaiterState = {}));
|
|
324
325
|
const checkExceptions = (result) => {
|
|
325
|
-
if (result.state ===
|
|
326
|
+
if (result.state === WaiterState.ABORTED) {
|
|
326
327
|
const abortError = new Error(`${JSON.stringify({
|
|
327
328
|
...result,
|
|
328
329
|
reason: "Request was aborted",
|
|
@@ -330,7 +331,7 @@ const checkExceptions = (result) => {
|
|
|
330
331
|
abortError.name = "AbortError";
|
|
331
332
|
throw abortError;
|
|
332
333
|
}
|
|
333
|
-
else if (result.state ===
|
|
334
|
+
else if (result.state === WaiterState.TIMEOUT) {
|
|
334
335
|
const timeoutError = new Error(`${JSON.stringify({
|
|
335
336
|
...result,
|
|
336
337
|
reason: "Waiter has timed out",
|
|
@@ -338,7 +339,7 @@ const checkExceptions = (result) => {
|
|
|
338
339
|
timeoutError.name = "TimeoutError";
|
|
339
340
|
throw timeoutError;
|
|
340
341
|
}
|
|
341
|
-
else if (result.state !==
|
|
342
|
+
else if (result.state !== WaiterState.SUCCESS) {
|
|
342
343
|
throw new Error(`${JSON.stringify(result, getCircularReplacer())}`);
|
|
343
344
|
}
|
|
344
345
|
return result;
|
|
@@ -358,10 +359,10 @@ const runPolling = async ({ minDelay, maxDelay, maxWaitTime, abortController, cl
|
|
|
358
359
|
const message = "AbortController signal aborted.";
|
|
359
360
|
observedResponses[message] |= 0;
|
|
360
361
|
observedResponses[message] += 1;
|
|
361
|
-
return { state:
|
|
362
|
+
return { state: WaiterState.ABORTED, observedResponses };
|
|
362
363
|
}
|
|
363
364
|
if (Date.now() + delayMs > waitUntil) {
|
|
364
|
-
return { state:
|
|
365
|
+
return { state: WaiterState.TIMEOUT, observedResponses };
|
|
365
366
|
}
|
|
366
367
|
await sleep(delayMs / 1_000);
|
|
367
368
|
}
|
|
@@ -371,7 +372,7 @@ const runPolling = async ({ minDelay, maxDelay, maxWaitTime, abortController, cl
|
|
|
371
372
|
observedResponses[message] |= 0;
|
|
372
373
|
observedResponses[message] += 1;
|
|
373
374
|
}
|
|
374
|
-
if (state !==
|
|
375
|
+
if (state !== WaiterState.RETRY) {
|
|
375
376
|
return { state, reason, final: reason, observedResponses };
|
|
376
377
|
}
|
|
377
378
|
currentAttempt += 1;
|
|
@@ -448,7 +449,7 @@ const validateWaiterOptions = (options) => {
|
|
|
448
449
|
const abortTimeout = (abortSignal) => {
|
|
449
450
|
let onAbort;
|
|
450
451
|
const promise = new Promise((resolve) => {
|
|
451
|
-
onAbort = () => resolve({ state:
|
|
452
|
+
onAbort = () => resolve({ state: WaiterState.ABORTED });
|
|
452
453
|
if (typeof abortSignal.addEventListener === "function") {
|
|
453
454
|
abortSignal.addEventListener("abort", onAbort);
|
|
454
455
|
}
|
|
@@ -543,11 +544,11 @@ class Client {
|
|
|
543
544
|
}
|
|
544
545
|
|
|
545
546
|
const SENSITIVE_STRING$1 = "***SensitiveInformation***";
|
|
546
|
-
function schemaLogFilter(schema
|
|
547
|
+
function schemaLogFilter(schema, data) {
|
|
547
548
|
if (data == null) {
|
|
548
549
|
return data;
|
|
549
550
|
}
|
|
550
|
-
const ns =
|
|
551
|
+
const ns = NormalizedSchema.of(schema);
|
|
551
552
|
if (ns.getMergedTraits().sensitive) {
|
|
552
553
|
return SENSITIVE_STRING$1;
|
|
553
554
|
}
|
|
@@ -594,7 +595,7 @@ class Command {
|
|
|
594
595
|
commandName,
|
|
595
596
|
inputFilterSensitiveLog,
|
|
596
597
|
outputFilterSensitiveLog,
|
|
597
|
-
[
|
|
598
|
+
[SMITHY_CONTEXT_KEY]: {
|
|
598
599
|
commandInstance: this,
|
|
599
600
|
...smithyContext,
|
|
600
601
|
},
|
|
@@ -862,11 +863,11 @@ const emitWarningIfUnsupportedVersion = (version) => {
|
|
|
862
863
|
}
|
|
863
864
|
};
|
|
864
865
|
|
|
865
|
-
const knownAlgorithms = Object.values(
|
|
866
|
+
const knownAlgorithms = Object.values(AlgorithmId);
|
|
866
867
|
const getChecksumConfiguration = (runtimeConfig) => {
|
|
867
868
|
const checksumAlgorithms = [];
|
|
868
|
-
for (const id in
|
|
869
|
-
const algorithmId =
|
|
869
|
+
for (const id in AlgorithmId) {
|
|
870
|
+
const algorithmId = AlgorithmId[id];
|
|
870
871
|
if (runtimeConfig[algorithmId] === undefined) {
|
|
871
872
|
continue;
|
|
872
873
|
}
|
|
@@ -1089,14 +1090,12 @@ const _json = (obj) => {
|
|
|
1089
1090
|
return obj;
|
|
1090
1091
|
};
|
|
1091
1092
|
|
|
1092
|
-
exports.getSmithyContext = transport.getSmithyContext;
|
|
1093
|
-
exports.normalizeProvider = transport.normalizeProvider;
|
|
1094
|
-
exports.AlgorithmId = types.AlgorithmId;
|
|
1095
1093
|
exports.Client = Client;
|
|
1096
1094
|
exports.Command = Command;
|
|
1097
1095
|
exports.NoOpLogger = NoOpLogger;
|
|
1098
1096
|
exports.SENSITIVE_STRING = SENSITIVE_STRING;
|
|
1099
1097
|
exports.ServiceException = ServiceException;
|
|
1098
|
+
exports.WaiterState = WaiterState;
|
|
1100
1099
|
exports._json = _json;
|
|
1101
1100
|
exports.checkExceptions = checkExceptions;
|
|
1102
1101
|
exports.constructStack = constructStack;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var client = require('@smithy/core/client');
|
|
4
|
-
var transport = require('@smithy/core/transport');
|
|
1
|
+
const { normalizeProvider } = require("@smithy/core/client");
|
|
2
|
+
const { isValidHostLabel } = require("@smithy/core/transport");
|
|
5
3
|
|
|
6
4
|
class ProviderError extends Error {
|
|
7
5
|
name = "ProviderError";
|
|
@@ -132,19 +130,19 @@ const numberSelector = (obj, key, type) => {
|
|
|
132
130
|
return numberValue;
|
|
133
131
|
};
|
|
134
132
|
|
|
135
|
-
|
|
133
|
+
var SelectorType;
|
|
136
134
|
(function (SelectorType) {
|
|
137
135
|
SelectorType["ENV"] = "env";
|
|
138
136
|
SelectorType["CONFIG"] = "shared config entry";
|
|
139
|
-
})(
|
|
137
|
+
})(SelectorType || (SelectorType = {}));
|
|
140
138
|
|
|
141
139
|
const resolveCustomEndpointsConfig = (input) => {
|
|
142
140
|
const { tls, endpoint, urlParser, useDualstackEndpoint } = input;
|
|
143
141
|
return Object.assign(input, {
|
|
144
142
|
tls: tls ?? true,
|
|
145
|
-
endpoint:
|
|
143
|
+
endpoint: normalizeProvider(typeof endpoint === "string" ? urlParser(endpoint) : endpoint),
|
|
146
144
|
isCustomEndpoint: true,
|
|
147
|
-
useDualstackEndpoint:
|
|
145
|
+
useDualstackEndpoint: normalizeProvider(useDualstackEndpoint ?? false),
|
|
148
146
|
});
|
|
149
147
|
};
|
|
150
148
|
|
|
@@ -165,12 +163,12 @@ const getEndpointFromRegion = async (input) => {
|
|
|
165
163
|
};
|
|
166
164
|
|
|
167
165
|
const resolveEndpointsConfig = (input) => {
|
|
168
|
-
const useDualstackEndpoint =
|
|
166
|
+
const useDualstackEndpoint = normalizeProvider(input.useDualstackEndpoint ?? false);
|
|
169
167
|
const { endpoint, useFipsEndpoint, urlParser, tls } = input;
|
|
170
168
|
return Object.assign(input, {
|
|
171
169
|
tls: tls ?? true,
|
|
172
170
|
endpoint: endpoint
|
|
173
|
-
?
|
|
171
|
+
? normalizeProvider(typeof endpoint === "string" ? urlParser(endpoint) : endpoint)
|
|
174
172
|
: () => getEndpointFromRegion({ ...input, useDualstackEndpoint, useFipsEndpoint }),
|
|
175
173
|
isCustomEndpoint: !!endpoint,
|
|
176
174
|
useDualstackEndpoint,
|
|
@@ -178,7 +176,7 @@ const resolveEndpointsConfig = (input) => {
|
|
|
178
176
|
};
|
|
179
177
|
|
|
180
178
|
const validRegions = new Set();
|
|
181
|
-
const checkRegion = (region, check =
|
|
179
|
+
const checkRegion = (region, check = isValidHostLabel) => {
|
|
182
180
|
if (!validRegions.has(region) && !check(region)) {
|
|
183
181
|
if (region === "*") {
|
|
184
182
|
console.warn(`@smithy/config-resolver WARN - Please use the caller region instead of "*". See "sigv4a" in https://github.com/aws/aws-sdk-js-v3/blob/main/supplemental-docs/CLIENTS.md.`);
|
|
@@ -349,6 +347,7 @@ exports.NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS = NODE_USE_FIPS_ENDPOINT_CONFIG_OP
|
|
|
349
347
|
exports.ProviderError = ProviderError;
|
|
350
348
|
exports.REGION_ENV_NAME = REGION_ENV_NAME;
|
|
351
349
|
exports.REGION_INI_NAME = REGION_INI_NAME;
|
|
350
|
+
exports.SelectorType = SelectorType;
|
|
352
351
|
exports.TokenProviderError = TokenProviderError;
|
|
353
352
|
exports.booleanSelector = booleanSelector;
|
|
354
353
|
exports.chain = chain;
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
var client = require('@smithy/core/client');
|
|
9
|
-
var transport = require('@smithy/core/transport');
|
|
1
|
+
const { homedir } = require("node:os");
|
|
2
|
+
const { sep, join } = require("node:path");
|
|
3
|
+
const { createHash } = require("node:crypto");
|
|
4
|
+
const { readFile: readFile$1 } = require("node:fs/promises");
|
|
5
|
+
const { IniSectionType } = require("@smithy/types");
|
|
6
|
+
const { normalizeProvider } = require("@smithy/core/client");
|
|
7
|
+
const { isValidHostLabel } = require("@smithy/core/transport");
|
|
10
8
|
|
|
11
9
|
class ProviderError extends Error {
|
|
12
10
|
name = "ProviderError";
|
|
@@ -137,11 +135,11 @@ const numberSelector = (obj, key, type) => {
|
|
|
137
135
|
return numberValue;
|
|
138
136
|
};
|
|
139
137
|
|
|
140
|
-
|
|
138
|
+
var SelectorType;
|
|
141
139
|
(function (SelectorType) {
|
|
142
140
|
SelectorType["ENV"] = "env";
|
|
143
141
|
SelectorType["CONFIG"] = "shared config entry";
|
|
144
|
-
})(
|
|
142
|
+
})(SelectorType || (SelectorType = {}));
|
|
145
143
|
|
|
146
144
|
const homeDirCache = {};
|
|
147
145
|
const getHomeDirCacheKey = () => {
|
|
@@ -151,7 +149,7 @@ const getHomeDirCacheKey = () => {
|
|
|
151
149
|
return "DEFAULT";
|
|
152
150
|
};
|
|
153
151
|
const getHomeDir = () => {
|
|
154
|
-
const { HOME, USERPROFILE, HOMEPATH, HOMEDRIVE = `C:${
|
|
152
|
+
const { HOME, USERPROFILE, HOMEPATH, HOMEDRIVE = `C:${sep}` } = process.env;
|
|
155
153
|
if (HOME)
|
|
156
154
|
return HOME;
|
|
157
155
|
if (USERPROFILE)
|
|
@@ -160,7 +158,7 @@ const getHomeDir = () => {
|
|
|
160
158
|
return `${HOMEDRIVE}${HOMEPATH}`;
|
|
161
159
|
const homeDirCacheKey = getHomeDirCacheKey();
|
|
162
160
|
if (!homeDirCache[homeDirCacheKey])
|
|
163
|
-
homeDirCache[homeDirCacheKey] =
|
|
161
|
+
homeDirCache[homeDirCacheKey] = homedir();
|
|
164
162
|
return homeDirCache[homeDirCacheKey];
|
|
165
163
|
};
|
|
166
164
|
|
|
@@ -169,9 +167,9 @@ const DEFAULT_PROFILE = "default";
|
|
|
169
167
|
const getProfileName = (init) => init.profile || process.env[ENV_PROFILE] || DEFAULT_PROFILE;
|
|
170
168
|
|
|
171
169
|
const getSSOTokenFilepath = (id) => {
|
|
172
|
-
const hasher =
|
|
170
|
+
const hasher = createHash("sha1");
|
|
173
171
|
const cacheName = hasher.update(id).digest("hex");
|
|
174
|
-
return
|
|
172
|
+
return join(getHomeDir(), ".aws", "sso", "cache", `${cacheName}.json`);
|
|
175
173
|
};
|
|
176
174
|
|
|
177
175
|
const tokenIntercept = {};
|
|
@@ -180,7 +178,7 @@ const getSSOTokenFromFile = async (id) => {
|
|
|
180
178
|
return tokenIntercept[id];
|
|
181
179
|
}
|
|
182
180
|
const ssoTokenFilepath = getSSOTokenFilepath(id);
|
|
183
|
-
const ssoTokenText = await
|
|
181
|
+
const ssoTokenText = await readFile$1(ssoTokenFilepath, "utf8");
|
|
184
182
|
return JSON.parse(ssoTokenText);
|
|
185
183
|
};
|
|
186
184
|
|
|
@@ -192,11 +190,11 @@ const getConfigData = (data) => Object.entries(data)
|
|
|
192
190
|
if (indexOfSeparator === -1) {
|
|
193
191
|
return false;
|
|
194
192
|
}
|
|
195
|
-
return Object.values(
|
|
193
|
+
return Object.values(IniSectionType).includes(key.substring(0, indexOfSeparator));
|
|
196
194
|
})
|
|
197
195
|
.reduce((acc, [key, value]) => {
|
|
198
196
|
const indexOfSeparator = key.indexOf(CONFIG_PREFIX_SEPARATOR);
|
|
199
|
-
const updatedKey = key.substring(0, indexOfSeparator) ===
|
|
197
|
+
const updatedKey = key.substring(0, indexOfSeparator) === IniSectionType.PROFILE ? key.substring(indexOfSeparator + 1) : key;
|
|
200
198
|
acc[updatedKey] = value;
|
|
201
199
|
return acc;
|
|
202
200
|
}, {
|
|
@@ -204,10 +202,10 @@ const getConfigData = (data) => Object.entries(data)
|
|
|
204
202
|
});
|
|
205
203
|
|
|
206
204
|
const ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
|
|
207
|
-
const getConfigFilepath = () => process.env[ENV_CONFIG_PATH] ||
|
|
205
|
+
const getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || join(getHomeDir(), ".aws", "config");
|
|
208
206
|
|
|
209
207
|
const ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
|
|
210
|
-
const getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] ||
|
|
208
|
+
const getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || join(getHomeDir(), ".aws", "credentials");
|
|
211
209
|
|
|
212
210
|
const prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-@\+\.%:/]+)\2$/;
|
|
213
211
|
const profileNameBlockList = ["__proto__", "profile __proto__"];
|
|
@@ -225,7 +223,7 @@ const parseIni = (iniData) => {
|
|
|
225
223
|
const matches = prefixKeyRegex.exec(sectionName);
|
|
226
224
|
if (matches) {
|
|
227
225
|
const [, prefix, , name] = matches;
|
|
228
|
-
if (Object.values(
|
|
226
|
+
if (Object.values(IniSectionType).includes(prefix)) {
|
|
229
227
|
currentSection = [prefix, name].join(CONFIG_PREFIX_SEPARATOR);
|
|
230
228
|
}
|
|
231
229
|
}
|
|
@@ -267,7 +265,7 @@ const readFile = (path, options) => {
|
|
|
267
265
|
return fileIntercept[path];
|
|
268
266
|
}
|
|
269
267
|
if (!filePromises[path] || options?.ignoreCache) {
|
|
270
|
-
filePromises[path] =
|
|
268
|
+
filePromises[path] = readFile$1(path, "utf8");
|
|
271
269
|
}
|
|
272
270
|
return filePromises[path];
|
|
273
271
|
};
|
|
@@ -279,11 +277,11 @@ const loadSharedConfigFiles = async (init = {}) => {
|
|
|
279
277
|
const relativeHomeDirPrefix = "~/";
|
|
280
278
|
let resolvedFilepath = filepath;
|
|
281
279
|
if (filepath.startsWith(relativeHomeDirPrefix)) {
|
|
282
|
-
resolvedFilepath =
|
|
280
|
+
resolvedFilepath = join(homeDir, filepath.slice(2));
|
|
283
281
|
}
|
|
284
282
|
let resolvedConfigFilepath = configFilepath;
|
|
285
283
|
if (configFilepath.startsWith(relativeHomeDirPrefix)) {
|
|
286
|
-
resolvedConfigFilepath =
|
|
284
|
+
resolvedConfigFilepath = join(homeDir, configFilepath.slice(2));
|
|
287
285
|
}
|
|
288
286
|
const parsedFiles = await Promise.all([
|
|
289
287
|
readFile(resolvedConfigFilepath, {
|
|
@@ -305,7 +303,7 @@ const loadSharedConfigFiles = async (init = {}) => {
|
|
|
305
303
|
};
|
|
306
304
|
|
|
307
305
|
const getSsoSessionData = (data) => Object.entries(data)
|
|
308
|
-
.filter(([key]) => key.startsWith(
|
|
306
|
+
.filter(([key]) => key.startsWith(IniSectionType.SSO_SESSION + CONFIG_PREFIX_SEPARATOR))
|
|
309
307
|
.reduce((acc, [key, value]) => ({ ...acc, [key.substring(key.indexOf(CONFIG_PREFIX_SEPARATOR) + 1)]: value }), {});
|
|
310
308
|
|
|
311
309
|
const swallowError = () => ({});
|
|
@@ -409,13 +407,13 @@ const ENV_USE_DUALSTACK_ENDPOINT = "AWS_USE_DUALSTACK_ENDPOINT";
|
|
|
409
407
|
const CONFIG_USE_DUALSTACK_ENDPOINT = "use_dualstack_endpoint";
|
|
410
408
|
const DEFAULT_USE_DUALSTACK_ENDPOINT = false;
|
|
411
409
|
const NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS = {
|
|
412
|
-
environmentVariableSelector: (env) => booleanSelector(env, ENV_USE_DUALSTACK_ENDPOINT,
|
|
413
|
-
configFileSelector: (profile) => booleanSelector(profile, CONFIG_USE_DUALSTACK_ENDPOINT,
|
|
410
|
+
environmentVariableSelector: (env) => booleanSelector(env, ENV_USE_DUALSTACK_ENDPOINT, SelectorType.ENV),
|
|
411
|
+
configFileSelector: (profile) => booleanSelector(profile, CONFIG_USE_DUALSTACK_ENDPOINT, SelectorType.CONFIG),
|
|
414
412
|
default: false,
|
|
415
413
|
};
|
|
416
414
|
const nodeDualstackConfigSelectors = {
|
|
417
|
-
environmentVariableSelector: (env) => booleanSelector(env, ENV_USE_DUALSTACK_ENDPOINT,
|
|
418
|
-
configFileSelector: (profile) => booleanSelector(profile, CONFIG_USE_DUALSTACK_ENDPOINT,
|
|
415
|
+
environmentVariableSelector: (env) => booleanSelector(env, ENV_USE_DUALSTACK_ENDPOINT, SelectorType.ENV),
|
|
416
|
+
configFileSelector: (profile) => booleanSelector(profile, CONFIG_USE_DUALSTACK_ENDPOINT, SelectorType.CONFIG),
|
|
419
417
|
default: undefined,
|
|
420
418
|
};
|
|
421
419
|
|
|
@@ -423,13 +421,13 @@ const ENV_USE_FIPS_ENDPOINT = "AWS_USE_FIPS_ENDPOINT";
|
|
|
423
421
|
const CONFIG_USE_FIPS_ENDPOINT = "use_fips_endpoint";
|
|
424
422
|
const DEFAULT_USE_FIPS_ENDPOINT = false;
|
|
425
423
|
const NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS = {
|
|
426
|
-
environmentVariableSelector: (env) => booleanSelector(env, ENV_USE_FIPS_ENDPOINT,
|
|
427
|
-
configFileSelector: (profile) => booleanSelector(profile, CONFIG_USE_FIPS_ENDPOINT,
|
|
424
|
+
environmentVariableSelector: (env) => booleanSelector(env, ENV_USE_FIPS_ENDPOINT, SelectorType.ENV),
|
|
425
|
+
configFileSelector: (profile) => booleanSelector(profile, CONFIG_USE_FIPS_ENDPOINT, SelectorType.CONFIG),
|
|
428
426
|
default: false,
|
|
429
427
|
};
|
|
430
428
|
const nodeFipsConfigSelectors = {
|
|
431
|
-
environmentVariableSelector: (env) => booleanSelector(env, ENV_USE_FIPS_ENDPOINT,
|
|
432
|
-
configFileSelector: (profile) => booleanSelector(profile, CONFIG_USE_FIPS_ENDPOINT,
|
|
429
|
+
environmentVariableSelector: (env) => booleanSelector(env, ENV_USE_FIPS_ENDPOINT, SelectorType.ENV),
|
|
430
|
+
configFileSelector: (profile) => booleanSelector(profile, CONFIG_USE_FIPS_ENDPOINT, SelectorType.CONFIG),
|
|
433
431
|
default: undefined,
|
|
434
432
|
};
|
|
435
433
|
|
|
@@ -437,9 +435,9 @@ const resolveCustomEndpointsConfig = (input) => {
|
|
|
437
435
|
const { tls, endpoint, urlParser, useDualstackEndpoint } = input;
|
|
438
436
|
return Object.assign(input, {
|
|
439
437
|
tls: tls ?? true,
|
|
440
|
-
endpoint:
|
|
438
|
+
endpoint: normalizeProvider(typeof endpoint === "string" ? urlParser(endpoint) : endpoint),
|
|
441
439
|
isCustomEndpoint: true,
|
|
442
|
-
useDualstackEndpoint:
|
|
440
|
+
useDualstackEndpoint: normalizeProvider(useDualstackEndpoint ?? false),
|
|
443
441
|
});
|
|
444
442
|
};
|
|
445
443
|
|
|
@@ -460,12 +458,12 @@ const getEndpointFromRegion = async (input) => {
|
|
|
460
458
|
};
|
|
461
459
|
|
|
462
460
|
const resolveEndpointsConfig = (input) => {
|
|
463
|
-
const useDualstackEndpoint =
|
|
461
|
+
const useDualstackEndpoint = normalizeProvider(input.useDualstackEndpoint ?? false);
|
|
464
462
|
const { endpoint, useFipsEndpoint, urlParser, tls } = input;
|
|
465
463
|
return Object.assign(input, {
|
|
466
464
|
tls: tls ?? true,
|
|
467
465
|
endpoint: endpoint
|
|
468
|
-
?
|
|
466
|
+
? normalizeProvider(typeof endpoint === "string" ? urlParser(endpoint) : endpoint)
|
|
469
467
|
: () => getEndpointFromRegion({ ...input, useDualstackEndpoint, useFipsEndpoint }),
|
|
470
468
|
isCustomEndpoint: !!endpoint,
|
|
471
469
|
useDualstackEndpoint,
|
|
@@ -486,7 +484,7 @@ const NODE_REGION_CONFIG_FILE_OPTIONS = {
|
|
|
486
484
|
};
|
|
487
485
|
|
|
488
486
|
const validRegions = new Set();
|
|
489
|
-
const checkRegion = (region, check =
|
|
487
|
+
const checkRegion = (region, check = isValidHostLabel) => {
|
|
490
488
|
if (!validRegions.has(region) && !check(region)) {
|
|
491
489
|
if (region === "*") {
|
|
492
490
|
console.warn(`@smithy/config-resolver WARN - Please use the caller region instead of "*". See "sigv4a" in https://github.com/aws/aws-sdk-js-v3/blob/main/supplemental-docs/CLIENTS.md.`);
|
|
@@ -657,7 +655,7 @@ const getImdsEndpoint = async () => {
|
|
|
657
655
|
return { hostname: "169.254.169.254", path: "/" };
|
|
658
656
|
};
|
|
659
657
|
const imdsHttpGet = async ({ hostname, path }) => {
|
|
660
|
-
const { request } =
|
|
658
|
+
const { request } = require('node:http');
|
|
661
659
|
return new Promise((resolve, reject) => {
|
|
662
660
|
const req = request({
|
|
663
661
|
method: "GET",
|
|
@@ -709,6 +707,7 @@ exports.NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS = NODE_USE_FIPS_ENDPOINT_CONFIG_OP
|
|
|
709
707
|
exports.ProviderError = ProviderError;
|
|
710
708
|
exports.REGION_ENV_NAME = REGION_ENV_NAME;
|
|
711
709
|
exports.REGION_INI_NAME = REGION_INI_NAME;
|
|
710
|
+
exports.SelectorType = SelectorType;
|
|
712
711
|
exports.TokenProviderError = TokenProviderError;
|
|
713
712
|
exports.booleanSelector = booleanSelector;
|
|
714
713
|
exports.chain = chain;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var client = require('@smithy/core/client');
|
|
4
|
-
var transport = require('@smithy/core/transport');
|
|
1
|
+
const { normalizeProvider } = require("@smithy/core/client");
|
|
2
|
+
const { isValidHostLabel } = require("@smithy/core/transport");
|
|
5
3
|
|
|
6
4
|
class ProviderError extends Error {
|
|
7
5
|
name = "ProviderError";
|
|
@@ -132,19 +130,19 @@ const numberSelector = (obj, key, type) => {
|
|
|
132
130
|
return numberValue;
|
|
133
131
|
};
|
|
134
132
|
|
|
135
|
-
|
|
133
|
+
var SelectorType;
|
|
136
134
|
(function (SelectorType) {
|
|
137
135
|
SelectorType["ENV"] = "env";
|
|
138
136
|
SelectorType["CONFIG"] = "shared config entry";
|
|
139
|
-
})(
|
|
137
|
+
})(SelectorType || (SelectorType = {}));
|
|
140
138
|
|
|
141
139
|
const resolveCustomEndpointsConfig = (input) => {
|
|
142
140
|
const { tls, endpoint, urlParser, useDualstackEndpoint } = input;
|
|
143
141
|
return Object.assign(input, {
|
|
144
142
|
tls: tls ?? true,
|
|
145
|
-
endpoint:
|
|
143
|
+
endpoint: normalizeProvider(typeof endpoint === "string" ? urlParser(endpoint) : endpoint),
|
|
146
144
|
isCustomEndpoint: true,
|
|
147
|
-
useDualstackEndpoint:
|
|
145
|
+
useDualstackEndpoint: normalizeProvider(useDualstackEndpoint ?? false),
|
|
148
146
|
});
|
|
149
147
|
};
|
|
150
148
|
|
|
@@ -165,12 +163,12 @@ const getEndpointFromRegion = async (input) => {
|
|
|
165
163
|
};
|
|
166
164
|
|
|
167
165
|
const resolveEndpointsConfig = (input) => {
|
|
168
|
-
const useDualstackEndpoint =
|
|
166
|
+
const useDualstackEndpoint = normalizeProvider(input.useDualstackEndpoint ?? false);
|
|
169
167
|
const { endpoint, useFipsEndpoint, urlParser, tls } = input;
|
|
170
168
|
return Object.assign(input, {
|
|
171
169
|
tls: tls ?? true,
|
|
172
170
|
endpoint: endpoint
|
|
173
|
-
?
|
|
171
|
+
? normalizeProvider(typeof endpoint === "string" ? urlParser(endpoint) : endpoint)
|
|
174
172
|
: () => getEndpointFromRegion({ ...input, useDualstackEndpoint, useFipsEndpoint }),
|
|
175
173
|
isCustomEndpoint: !!endpoint,
|
|
176
174
|
useDualstackEndpoint,
|
|
@@ -178,7 +176,7 @@ const resolveEndpointsConfig = (input) => {
|
|
|
178
176
|
};
|
|
179
177
|
|
|
180
178
|
const validRegions = new Set();
|
|
181
|
-
const checkRegion = (region, check =
|
|
179
|
+
const checkRegion = (region, check = isValidHostLabel) => {
|
|
182
180
|
if (!validRegions.has(region) && !check(region)) {
|
|
183
181
|
if (region === "*") {
|
|
184
182
|
console.warn(`@smithy/config-resolver WARN - Please use the caller region instead of "*". See "sigv4a" in https://github.com/aws/aws-sdk-js-v3/blob/main/supplemental-docs/CLIENTS.md.`);
|
|
@@ -338,6 +336,7 @@ exports.NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS = NODE_USE_FIPS_ENDPOINT_CONFIG_OP
|
|
|
338
336
|
exports.ProviderError = ProviderError;
|
|
339
337
|
exports.REGION_ENV_NAME = REGION_ENV_NAME;
|
|
340
338
|
exports.REGION_INI_NAME = REGION_INI_NAME;
|
|
339
|
+
exports.SelectorType = SelectorType;
|
|
341
340
|
exports.TokenProviderError = TokenProviderError;
|
|
342
341
|
exports.booleanSelector = booleanSelector;
|
|
343
342
|
exports.chain = chain;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
const { toEndpointV1, getSmithyContext, normalizeProvider, isValidHostLabel } = require("@smithy/core/transport");
|
|
2
|
+
exports.isValidHostLabel = isValidHostLabel;
|
|
3
|
+
exports.middlewareEndpointToEndpointV1 = toEndpointV1;
|
|
4
|
+
exports.toEndpointV1 = toEndpointV1;
|
|
5
|
+
const { EndpointURLScheme } = require("@smithy/types");
|
|
6
6
|
|
|
7
7
|
const getEndpointFromConfig = async (serviceId) => undefined;
|
|
8
8
|
|
|
@@ -104,7 +104,7 @@ function bindGetEndpointFromInstructions(getEndpointFromConfig) {
|
|
|
104
104
|
endpointFromConfig = await getEndpointFromConfig(clientConfig.serviceId);
|
|
105
105
|
}
|
|
106
106
|
if (endpointFromConfig) {
|
|
107
|
-
clientConfig.endpoint = () => Promise.resolve(
|
|
107
|
+
clientConfig.endpoint = () => Promise.resolve(toEndpointV1(endpointFromConfig));
|
|
108
108
|
clientConfig.isCustomEndpoint = true;
|
|
109
109
|
}
|
|
110
110
|
}
|
|
@@ -183,7 +183,7 @@ function bindEndpointMiddleware(getEndpointFromConfig) {
|
|
|
183
183
|
if (authScheme) {
|
|
184
184
|
context["signing_region"] = authScheme.signingRegion;
|
|
185
185
|
context["signing_service"] = authScheme.signingName;
|
|
186
|
-
const smithyContext =
|
|
186
|
+
const smithyContext = getSmithyContext(context);
|
|
187
187
|
const httpAuthOption = smithyContext?.selectedHttpAuthScheme?.httpAuthOption;
|
|
188
188
|
if (httpAuthOption) {
|
|
189
189
|
httpAuthOption.signingProperties = Object.assign(httpAuthOption.signingProperties || {}, {
|
|
@@ -228,14 +228,14 @@ function bindResolveEndpointConfig(getEndpointFromConfig) {
|
|
|
228
228
|
return (input) => {
|
|
229
229
|
const tls = input.tls ?? true;
|
|
230
230
|
const { endpoint, useDualstackEndpoint, useFipsEndpoint } = input;
|
|
231
|
-
const customEndpointProvider = endpoint != null ? async () =>
|
|
231
|
+
const customEndpointProvider = endpoint != null ? async () => toEndpointV1(await normalizeProvider(endpoint)()) : undefined;
|
|
232
232
|
const isCustomEndpoint = !!endpoint;
|
|
233
233
|
const resolvedConfig = Object.assign(input, {
|
|
234
234
|
endpoint: customEndpointProvider,
|
|
235
235
|
tls,
|
|
236
236
|
isCustomEndpoint,
|
|
237
|
-
useDualstackEndpoint:
|
|
238
|
-
useFipsEndpoint:
|
|
237
|
+
useDualstackEndpoint: normalizeProvider(useDualstackEndpoint ?? false),
|
|
238
|
+
useFipsEndpoint: normalizeProvider(useFipsEndpoint ?? false),
|
|
239
239
|
});
|
|
240
240
|
let configuredEndpointPromise = undefined;
|
|
241
241
|
resolvedConfig.serviceConfiguredEndpoint = async () => {
|
|
@@ -398,8 +398,8 @@ const IP_V4_REGEX = new RegExp(`^(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\
|
|
|
398
398
|
const isIpAddress = (value) => IP_V4_REGEX.test(value) || (value.startsWith("[") && value.endsWith("]"));
|
|
399
399
|
|
|
400
400
|
const DEFAULT_PORTS = {
|
|
401
|
-
[
|
|
402
|
-
[
|
|
401
|
+
[EndpointURLScheme.HTTP]: 80,
|
|
402
|
+
[EndpointURLScheme.HTTPS]: 443,
|
|
403
403
|
};
|
|
404
404
|
const parseURL = (value) => {
|
|
405
405
|
const whatwgURL = (() => {
|
|
@@ -431,7 +431,7 @@ const parseURL = (value) => {
|
|
|
431
431
|
return null;
|
|
432
432
|
}
|
|
433
433
|
const scheme = protocol.slice(0, -1);
|
|
434
|
-
if (!Object.values(
|
|
434
|
+
if (!Object.values(EndpointURLScheme).includes(scheme)) {
|
|
435
435
|
return null;
|
|
436
436
|
}
|
|
437
437
|
const isIp = isIpAddress(hostname);
|
|
@@ -480,7 +480,7 @@ const endpointFunctions = {
|
|
|
480
480
|
coalesce,
|
|
481
481
|
getAttr,
|
|
482
482
|
isSet,
|
|
483
|
-
isValidHostLabel
|
|
483
|
+
isValidHostLabel,
|
|
484
484
|
ite,
|
|
485
485
|
not,
|
|
486
486
|
parseURL,
|
|
@@ -810,9 +810,6 @@ const resolveEndpointConfig = bindResolveEndpointConfig(getEndpointFromConfig);
|
|
|
810
810
|
const endpointMiddleware = bindEndpointMiddleware(getEndpointFromConfig);
|
|
811
811
|
const getEndpointPlugin = bindGetEndpointPlugin(getEndpointFromConfig);
|
|
812
812
|
|
|
813
|
-
exports.isValidHostLabel = transport.isValidHostLabel;
|
|
814
|
-
exports.middlewareEndpointToEndpointV1 = transport.toEndpointV1;
|
|
815
|
-
exports.toEndpointV1 = transport.toEndpointV1;
|
|
816
813
|
exports.BinaryDecisionDiagram = BinaryDecisionDiagram;
|
|
817
814
|
exports.EndpointCache = EndpointCache;
|
|
818
815
|
exports.EndpointError = EndpointError;
|