@cdk8s/awscdk-resolver 0.0.600 → 0.0.602
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 +3 -3
- package/lib/resolve.js +1 -1
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/auth/httpAuthSchemeProvider.js +9 -15
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/endpoint/bdd.js +2 -5
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/endpoint/endpointResolver.js +7 -11
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/index.js +449 -469
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/models/CloudFormationServiceException.js +4 -8
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/models/errors.js +59 -91
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/runtimeConfig.browser.js +22 -26
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/runtimeConfig.js +30 -34
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/runtimeConfig.native.js +4 -7
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/runtimeConfig.shared.js +20 -24
- package/node_modules/@aws-sdk/client-cloudformation/dist-cjs/schemas/schemas_0.js +814 -533
- package/node_modules/@aws-sdk/client-cloudformation/package.json +8 -8
- package/node_modules/@aws-sdk/core/dist-cjs/index.js +45 -50
- package/node_modules/@aws-sdk/core/dist-cjs/submodules/account-id-endpoint/index.js +2 -4
- package/node_modules/@aws-sdk/core/dist-cjs/submodules/client/index.browser.js +21 -22
- package/node_modules/@aws-sdk/core/dist-cjs/submodules/client/index.js +51 -51
- package/node_modules/@aws-sdk/core/dist-cjs/submodules/client/index.native.js +21 -22
- package/node_modules/@aws-sdk/core/dist-cjs/submodules/httpAuthSchemes/index.js +19 -21
- package/node_modules/@aws-sdk/core/dist-cjs/submodules/protocols/index.js +107 -109
- package/node_modules/@aws-sdk/core/dist-cjs/submodules/util/index.js +2 -4
- package/node_modules/@aws-sdk/core/package.json +8 -8
- package/node_modules/@aws-sdk/credential-provider-env/dist-cjs/index.js +4 -6
- package/node_modules/@aws-sdk/credential-provider-env/package.json +6 -6
- package/node_modules/@aws-sdk/credential-provider-http/dist-cjs/fromHttp/checkUrl.js +3 -7
- package/node_modules/@aws-sdk/credential-provider-http/dist-cjs/fromHttp/fromHttp.browser.js +12 -16
- package/node_modules/@aws-sdk/credential-provider-http/dist-cjs/fromHttp/fromHttp.js +16 -21
- package/node_modules/@aws-sdk/credential-provider-http/dist-cjs/fromHttp/requestHelpers.js +14 -18
- package/node_modules/@aws-sdk/credential-provider-http/dist-cjs/fromHttp/retry-wrapper.js +1 -5
- package/node_modules/@aws-sdk/credential-provider-http/dist-cjs/index.browser.js +2 -5
- package/node_modules/@aws-sdk/credential-provider-http/dist-cjs/index.js +2 -7
- package/node_modules/@aws-sdk/credential-provider-http/package.json +6 -6
- package/node_modules/@aws-sdk/credential-provider-ini/dist-cjs/index.js +47 -41
- package/node_modules/@aws-sdk/credential-provider-ini/dist-es/resolveProcessCredentials.js +8 -4
- package/node_modules/@aws-sdk/credential-provider-ini/dist-es/resolveWebIdentityCredentials.js +14 -10
- package/node_modules/@aws-sdk/credential-provider-ini/package.json +13 -13
- package/node_modules/@aws-sdk/credential-provider-login/dist-cjs/index.js +31 -33
- package/node_modules/@aws-sdk/credential-provider-login/package.json +7 -7
- package/node_modules/@aws-sdk/credential-provider-node/dist-cjs/index.js +16 -18
- package/node_modules/@aws-sdk/credential-provider-node/package.json +11 -11
- package/node_modules/@aws-sdk/credential-provider-process/dist-cjs/index.js +11 -13
- package/node_modules/@aws-sdk/credential-provider-process/package.json +6 -6
- package/node_modules/@aws-sdk/credential-provider-sso/dist-cjs/index.js +22 -24
- package/node_modules/@aws-sdk/credential-provider-sso/dist-cjs/loadSso-BGYXHf8s.js +3 -0
- package/node_modules/@aws-sdk/credential-provider-sso/package.json +8 -8
- package/node_modules/@aws-sdk/credential-provider-web-identity/dist-cjs/fromTokenFile.js +10 -14
- package/node_modules/@aws-sdk/credential-provider-web-identity/dist-cjs/fromWebToken.js +2 -6
- package/node_modules/@aws-sdk/credential-provider-web-identity/dist-cjs/index.js +3 -27
- package/node_modules/@aws-sdk/credential-provider-web-identity/package.json +7 -7
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/index.js +0 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/cognito-identity/index.js +82 -84
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/signin/index.js +158 -119
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso/index.js +80 -82
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso-oidc/index.js +80 -82
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sts/index.js +99 -101
- package/node_modules/@aws-sdk/nested-clients/dist-es/submodules/signin/commands/CreateOAuth2TokenCommand.js +4 -1
- package/node_modules/@aws-sdk/nested-clients/dist-es/submodules/signin/endpoint/bdd.js +70 -35
- package/node_modules/@aws-sdk/nested-clients/dist-es/submodules/signin/endpoint/endpointResolver.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-es/submodules/signin/models/enums.js +3 -0
- package/node_modules/@aws-sdk/nested-clients/dist-types/submodules/signin/endpoint/EndpointParameters.d.ts +1 -0
- package/node_modules/@aws-sdk/nested-clients/dist-types/submodules/signin/models/enums.d.ts +12 -0
- package/node_modules/@aws-sdk/nested-clients/dist-types/ts3.4/submodules/signin/endpoint/EndpointParameters.d.ts +1 -0
- package/node_modules/@aws-sdk/nested-clients/dist-types/ts3.4/submodules/signin/models/enums.d.ts +3 -0
- package/node_modules/@aws-sdk/nested-clients/package.json +9 -8
- package/node_modules/@aws-sdk/signature-v4-multi-region/dist-cjs/index.js +4 -6
- package/node_modules/@aws-sdk/signature-v4-multi-region/package.json +5 -5
- package/node_modules/@aws-sdk/token-providers/dist-cjs/index.js +26 -28
- package/node_modules/@aws-sdk/token-providers/package.json +7 -7
- package/node_modules/@aws-sdk/types/dist-cjs/index.js +7 -8
- package/node_modules/@aws-sdk/types/package.json +4 -4
- package/node_modules/@aws-sdk/util-locate-window/dist-cjs/index.js +0 -2
- package/node_modules/@aws-sdk/util-locate-window/package.json +4 -4
- package/node_modules/@aws-sdk/xml-builder/dist-cjs/index.js +2 -4
- package/node_modules/@aws-sdk/xml-builder/dist-cjs/xml-external/nodable_entities.js +4 -7
- package/node_modules/@aws-sdk/xml-builder/dist-cjs/xml-parser.browser.js +2 -5
- package/node_modules/@aws-sdk/xml-builder/dist-cjs/xml-parser.js +7 -10
- package/node_modules/@aws-sdk/xml-builder/package.json +4 -4
- 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 +23 -24
- package/node_modules/@smithy/core/dist-cjs/submodules/retry/index.js +25 -26
- 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-types/submodules/schema/TypeRegistry.d.ts +1 -1
- package/node_modules/@smithy/core/package.json +7 -6
- package/node_modules/@smithy/credential-provider-imds/dist-cjs/index.js +23 -24
- package/node_modules/@smithy/credential-provider-imds/package.json +6 -6
- package/node_modules/@smithy/fetch-http-handler/dist-cjs/index.js +6 -8
- package/node_modules/@smithy/fetch-http-handler/package.json +7 -7
- package/node_modules/@smithy/node-http-handler/dist-cjs/index.js +11 -13
- package/node_modules/@smithy/node-http-handler/package.json +7 -7
- package/node_modules/@smithy/signature-v4/dist-cjs/index.js +27 -29
- package/node_modules/@smithy/signature-v4/package.json +6 -6
- package/node_modules/@smithy/types/dist-cjs/index.js +23 -18
- package/node_modules/@smithy/types/package.json +4 -4
- package/package.json +4 -4
- package/node_modules/@aws-sdk/credential-provider-sso/dist-cjs/loadSso-BKDNrsal.js +0 -8
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-sdk/nested-clients",
|
|
3
|
-
"version": "3.997.
|
|
3
|
+
"version": "3.997.21",
|
|
4
4
|
"description": "Nested clients for AWS SDK packages.",
|
|
5
5
|
"main": "./dist-cjs/index.js",
|
|
6
6
|
"module": "./dist-es/index.js",
|
|
7
7
|
"types": "./dist-types/index.d.ts",
|
|
8
8
|
"scripts": {
|
|
9
|
-
"build": "
|
|
9
|
+
"build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
|
|
10
10
|
"build:cjs": "node ../../scripts/compilation/inline",
|
|
11
|
-
"build:es": "tsc -p tsconfig.es.json",
|
|
11
|
+
"build:es": "premove dist-es && tsc -p tsconfig.es.json",
|
|
12
12
|
"build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
|
|
13
|
-
"build:types": "tsc -p tsconfig.types.json",
|
|
13
|
+
"build:types": "premove dist-types && tsc -p tsconfig.types.json",
|
|
14
14
|
"build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
|
|
15
|
-
"clean": "premove dist-cjs dist-es dist-types
|
|
15
|
+
"clean": "premove dist-cjs dist-es dist-types",
|
|
16
16
|
"lint": "node ../../scripts/validation/submodules-linter.js",
|
|
17
|
+
"prebuild": "yarn lint",
|
|
17
18
|
"test": "yarn g:vitest run",
|
|
18
19
|
"test:watch": "yarn g:vitest watch"
|
|
19
20
|
},
|
|
@@ -29,9 +30,9 @@
|
|
|
29
30
|
"dependencies": {
|
|
30
31
|
"@aws-crypto/sha256-browser": "5.2.0",
|
|
31
32
|
"@aws-crypto/sha256-js": "5.2.0",
|
|
32
|
-
"@aws-sdk/core": "^3.974.
|
|
33
|
-
"@aws-sdk/signature-v4-multi-region": "^3.996.
|
|
34
|
-
"@aws-sdk/types": "^3.973.
|
|
33
|
+
"@aws-sdk/core": "^3.974.21",
|
|
34
|
+
"@aws-sdk/signature-v4-multi-region": "^3.996.35",
|
|
35
|
+
"@aws-sdk/types": "^3.973.13",
|
|
35
36
|
"@smithy/core": "^3.24.6",
|
|
36
37
|
"@smithy/fetch-http-handler": "^5.4.6",
|
|
37
38
|
"@smithy/node-http-handler": "^4.7.6",
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var signatureV4 = require('@smithy/signature-v4');
|
|
1
|
+
const { SignatureV4, signatureV4aContainer } = require("@smithy/signature-v4");
|
|
4
2
|
|
|
5
3
|
const signatureV4CrtContainer = {
|
|
6
4
|
CrtSignerV4: null,
|
|
@@ -8,7 +6,7 @@ const signatureV4CrtContainer = {
|
|
|
8
6
|
|
|
9
7
|
const SESSION_TOKEN_QUERY_PARAM = "X-Amz-S3session-Token";
|
|
10
8
|
const SESSION_TOKEN_HEADER = SESSION_TOKEN_QUERY_PARAM.toLowerCase();
|
|
11
|
-
class SignatureV4SignWithCredentials extends
|
|
9
|
+
class SignatureV4SignWithCredentials extends SignatureV4 {
|
|
12
10
|
async signWithCredentials(requestToSign, credentials, options) {
|
|
13
11
|
const credentialsWithoutSessionToken = getCredentialsWithoutSessionToken(credentials);
|
|
14
12
|
requestToSign.headers[SESSION_TOKEN_HEADER] = credentials.sessionToken;
|
|
@@ -50,7 +48,7 @@ class SignatureV4MultiRegion {
|
|
|
50
48
|
if (typeof signatureV4CrtContainer.CrtSignerV4 === "function") {
|
|
51
49
|
return "crt";
|
|
52
50
|
}
|
|
53
|
-
else if (typeof
|
|
51
|
+
else if (typeof signatureV4aContainer.SignatureV4a === "function") {
|
|
54
52
|
return "js";
|
|
55
53
|
}
|
|
56
54
|
return "none";
|
|
@@ -108,7 +106,7 @@ class SignatureV4MultiRegion {
|
|
|
108
106
|
getSigv4aSigner() {
|
|
109
107
|
if (!this.sigv4aSigner) {
|
|
110
108
|
const CrtSignerV4 = signatureV4CrtContainer.CrtSignerV4;
|
|
111
|
-
const JsSigV4aSigner =
|
|
109
|
+
const JsSigV4aSigner = signatureV4aContainer.SignatureV4a;
|
|
112
110
|
if (this.signerOptions.runtime === "node") {
|
|
113
111
|
if (!CrtSignerV4 && !JsSigV4aSigner) {
|
|
114
112
|
throw new Error("Neither CRT nor JS SigV4a implementation is available. " +
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-sdk/signature-v4-multi-region",
|
|
3
|
-
"version": "3.996.
|
|
3
|
+
"version": "3.996.35",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
|
|
6
6
|
"build:browser": "node ./test-browser/browser-build/esbuild",
|
|
7
7
|
"build:cjs": "node ../../scripts/compilation/inline",
|
|
8
|
-
"build:es": "tsc -p tsconfig.es.json",
|
|
8
|
+
"build:es": "premove dist-es && tsc -p tsconfig.es.json",
|
|
9
9
|
"build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
|
|
10
|
-
"build:types": "tsc -p tsconfig.types.json",
|
|
10
|
+
"build:types": "premove dist-types && tsc -p tsconfig.types.json",
|
|
11
11
|
"build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
|
|
12
|
-
"clean": "premove dist-cjs dist-es dist-types
|
|
12
|
+
"clean": "premove dist-cjs dist-es dist-types",
|
|
13
13
|
"test": "yarn g:vitest run",
|
|
14
14
|
"test:watch": "yarn g:vitest watch",
|
|
15
15
|
"test:e2e": "yarn g:vitest run -c vitest.config.e2e.mts",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
},
|
|
27
27
|
"license": "Apache-2.0",
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@aws-sdk/types": "^3.973.
|
|
29
|
+
"@aws-sdk/types": "^3.973.13",
|
|
30
30
|
"@smithy/signature-v4": "^5.4.6",
|
|
31
31
|
"@smithy/types": "^4.14.3",
|
|
32
32
|
"tslib": "^2.6.2"
|
|
@@ -1,21 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
var config = require('@smithy/core/config');
|
|
6
|
-
var node_fs = require('node:fs');
|
|
1
|
+
const { setTokenFeature } = require("@aws-sdk/core/client");
|
|
2
|
+
const { getBearerTokenEnvKey } = require("@aws-sdk/core/httpAuthSchemes");
|
|
3
|
+
const { TokenProviderError, getSSOTokenFilepath, parseKnownFiles, getProfileName, loadSsoSessionData, getSSOTokenFromFile, memoize, chain } = require("@smithy/core/config");
|
|
4
|
+
const { promises } = require("node:fs");
|
|
7
5
|
|
|
8
6
|
const fromEnvSigningName = ({ logger, signingName } = {}) => async () => {
|
|
9
7
|
logger?.debug?.("@aws-sdk/token-providers - fromEnvSigningName");
|
|
10
8
|
if (!signingName) {
|
|
11
|
-
throw new
|
|
9
|
+
throw new TokenProviderError("Please pass 'signingName' to compute environment variable key", { logger });
|
|
12
10
|
}
|
|
13
|
-
const bearerTokenKey =
|
|
11
|
+
const bearerTokenKey = getBearerTokenEnvKey(signingName);
|
|
14
12
|
if (!(bearerTokenKey in process.env)) {
|
|
15
|
-
throw new
|
|
13
|
+
throw new TokenProviderError(`Token not present in '${bearerTokenKey}' environment variable`, { logger });
|
|
16
14
|
}
|
|
17
15
|
const token = { token: process.env[bearerTokenKey] };
|
|
18
|
-
|
|
16
|
+
setTokenFeature(token, "BEARER_SERVICE_ENV_VARS", "3");
|
|
19
17
|
return token;
|
|
20
18
|
};
|
|
21
19
|
|
|
@@ -23,7 +21,7 @@ const EXPIRE_WINDOW_MS = 5 * 60 * 1000;
|
|
|
23
21
|
const REFRESH_MESSAGE = `To refresh this SSO session run 'aws sso login' with the corresponding profile.`;
|
|
24
22
|
|
|
25
23
|
const getSsoOidcClient = async (ssoRegion, init = {}, callerClientConfig) => {
|
|
26
|
-
const { SSOOIDCClient } =
|
|
24
|
+
const { SSOOIDCClient } = require('@aws-sdk/nested-clients/sso-oidc');
|
|
27
25
|
const coalesce = (prop) => init.clientConfig?.[prop] ?? init.parentClientConfig?.[prop] ?? callerClientConfig?.[prop];
|
|
28
26
|
const ssoOidcClient = new SSOOIDCClient(Object.assign({}, init.clientConfig ?? {}, {
|
|
29
27
|
region: ssoRegion ?? init.clientConfig?.region,
|
|
@@ -34,7 +32,7 @@ const getSsoOidcClient = async (ssoRegion, init = {}, callerClientConfig) => {
|
|
|
34
32
|
};
|
|
35
33
|
|
|
36
34
|
const getNewSsoOidcToken = async (ssoToken, ssoRegion, init = {}, callerClientConfig) => {
|
|
37
|
-
const { CreateTokenCommand } =
|
|
35
|
+
const { CreateTokenCommand } = require('@aws-sdk/nested-clients/sso-oidc');
|
|
38
36
|
const ssoOidcClient = await getSsoOidcClient(ssoRegion, init, callerClientConfig);
|
|
39
37
|
return ssoOidcClient.send(new CreateTokenCommand({
|
|
40
38
|
clientId: ssoToken.clientId,
|
|
@@ -46,19 +44,19 @@ const getNewSsoOidcToken = async (ssoToken, ssoRegion, init = {}, callerClientCo
|
|
|
46
44
|
|
|
47
45
|
const validateTokenExpiry = (token) => {
|
|
48
46
|
if (token.expiration && token.expiration.getTime() < Date.now()) {
|
|
49
|
-
throw new
|
|
47
|
+
throw new TokenProviderError(`Token is expired. ${REFRESH_MESSAGE}`, false);
|
|
50
48
|
}
|
|
51
49
|
};
|
|
52
50
|
|
|
53
51
|
const validateTokenKey = (key, value, forRefresh = false) => {
|
|
54
52
|
if (typeof value === "undefined") {
|
|
55
|
-
throw new
|
|
53
|
+
throw new TokenProviderError(`Value not present for '${key}' in SSO Token${forRefresh ? ". Cannot refresh" : ""}. ${REFRESH_MESSAGE}`, false);
|
|
56
54
|
}
|
|
57
55
|
};
|
|
58
56
|
|
|
59
|
-
const { writeFile } =
|
|
57
|
+
const { writeFile } = promises;
|
|
60
58
|
const writeSSOTokenToFile = (id, ssoToken) => {
|
|
61
|
-
const tokenFilepath =
|
|
59
|
+
const tokenFilepath = getSSOTokenFilepath(id);
|
|
62
60
|
const tokenString = JSON.stringify(ssoToken, null, 2);
|
|
63
61
|
return writeFile(tokenFilepath, tokenString);
|
|
64
62
|
};
|
|
@@ -66,36 +64,36 @@ const writeSSOTokenToFile = (id, ssoToken) => {
|
|
|
66
64
|
const lastRefreshAttemptTime = new Date(0);
|
|
67
65
|
const fromSso = (init = {}) => async ({ callerClientConfig } = {}) => {
|
|
68
66
|
init.logger?.debug("@aws-sdk/token-providers - fromSso");
|
|
69
|
-
const profiles = await
|
|
70
|
-
const profileName =
|
|
67
|
+
const profiles = await parseKnownFiles(init);
|
|
68
|
+
const profileName = getProfileName({
|
|
71
69
|
profile: init.profile ?? callerClientConfig?.profile,
|
|
72
70
|
});
|
|
73
71
|
const profile = profiles[profileName];
|
|
74
72
|
if (!profile) {
|
|
75
|
-
throw new
|
|
73
|
+
throw new TokenProviderError(`Profile '${profileName}' could not be found in shared credentials file.`, false);
|
|
76
74
|
}
|
|
77
75
|
else if (!profile["sso_session"]) {
|
|
78
|
-
throw new
|
|
76
|
+
throw new TokenProviderError(`Profile '${profileName}' is missing required property 'sso_session'.`);
|
|
79
77
|
}
|
|
80
78
|
const ssoSessionName = profile["sso_session"];
|
|
81
|
-
const ssoSessions = await
|
|
79
|
+
const ssoSessions = await loadSsoSessionData(init);
|
|
82
80
|
const ssoSession = ssoSessions[ssoSessionName];
|
|
83
81
|
if (!ssoSession) {
|
|
84
|
-
throw new
|
|
82
|
+
throw new TokenProviderError(`Sso session '${ssoSessionName}' could not be found in shared credentials file.`, false);
|
|
85
83
|
}
|
|
86
84
|
for (const ssoSessionRequiredKey of ["sso_start_url", "sso_region"]) {
|
|
87
85
|
if (!ssoSession[ssoSessionRequiredKey]) {
|
|
88
|
-
throw new
|
|
86
|
+
throw new TokenProviderError(`Sso session '${ssoSessionName}' is missing required property '${ssoSessionRequiredKey}'.`, false);
|
|
89
87
|
}
|
|
90
88
|
}
|
|
91
89
|
ssoSession["sso_start_url"];
|
|
92
90
|
const ssoRegion = ssoSession["sso_region"];
|
|
93
91
|
let ssoToken;
|
|
94
92
|
try {
|
|
95
|
-
ssoToken = await
|
|
93
|
+
ssoToken = await getSSOTokenFromFile(ssoSessionName);
|
|
96
94
|
}
|
|
97
95
|
catch (e) {
|
|
98
|
-
throw new
|
|
96
|
+
throw new TokenProviderError(`The SSO session token associated with profile=${profileName} was not found or is invalid. ${REFRESH_MESSAGE}`, false);
|
|
99
97
|
}
|
|
100
98
|
validateTokenKey("accessToken", ssoToken.accessToken);
|
|
101
99
|
validateTokenKey("expiresAt", ssoToken.expiresAt);
|
|
@@ -141,13 +139,13 @@ const fromSso = (init = {}) => async ({ callerClientConfig } = {}) => {
|
|
|
141
139
|
const fromStatic = ({ token, logger }) => async () => {
|
|
142
140
|
logger?.debug("@aws-sdk/token-providers - fromStatic");
|
|
143
141
|
if (!token || !token.token) {
|
|
144
|
-
throw new
|
|
142
|
+
throw new TokenProviderError(`Please pass a valid token to fromStatic`, false);
|
|
145
143
|
}
|
|
146
144
|
return token;
|
|
147
145
|
};
|
|
148
146
|
|
|
149
|
-
const nodeProvider = (init = {}) =>
|
|
150
|
-
throw new
|
|
147
|
+
const nodeProvider = (init = {}) => memoize(chain(fromSso(init), async () => {
|
|
148
|
+
throw new TokenProviderError("Could not load token from any providers", false);
|
|
151
149
|
}), (token) => token.expiration !== undefined && token.expiration.getTime() - Date.now() < 300000, (token) => token.expiration !== undefined);
|
|
152
150
|
|
|
153
151
|
exports.fromEnvSigningName = fromEnvSigningName;
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-sdk/token-providers",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.1069.0",
|
|
4
4
|
"description": "A collection of token providers",
|
|
5
5
|
"main": "./dist-cjs/index.js",
|
|
6
6
|
"module": "./dist-es/index.js",
|
|
7
7
|
"scripts": {
|
|
8
8
|
"build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
|
|
9
9
|
"build:cjs": "node ../../scripts/compilation/inline",
|
|
10
|
-
"build:es": "tsc -p tsconfig.es.json",
|
|
10
|
+
"build:es": "premove dist-es && tsc -p tsconfig.es.json",
|
|
11
11
|
"build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
|
|
12
|
-
"build:types": "tsc -p tsconfig.types.json",
|
|
12
|
+
"build:types": "premove dist-types && tsc -p tsconfig.types.json",
|
|
13
13
|
"build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
|
|
14
|
-
"clean": "premove dist-cjs dist-es dist-types
|
|
14
|
+
"clean": "premove dist-cjs dist-es dist-types",
|
|
15
15
|
"extract:docs": "api-extractor run --local",
|
|
16
16
|
"test": "yarn g:vitest run",
|
|
17
17
|
"test:watch": "yarn g:vitest watch",
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
},
|
|
30
30
|
"license": "Apache-2.0",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@aws-sdk/core": "^3.974.
|
|
33
|
-
"@aws-sdk/nested-clients": "^3.997.
|
|
34
|
-
"@aws-sdk/types": "^3.973.
|
|
32
|
+
"@aws-sdk/core": "^3.974.21",
|
|
33
|
+
"@aws-sdk/nested-clients": "^3.997.21",
|
|
34
|
+
"@aws-sdk/types": "^3.973.13",
|
|
35
35
|
"@smithy/core": "^3.24.6",
|
|
36
36
|
"@smithy/types": "^4.14.3",
|
|
37
37
|
"tslib": "^2.6.2"
|
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
|
|
1
|
+
const { EndpointURLScheme, HttpAuthLocation, RequestHandlerProtocol } = require("@smithy/types");
|
|
2
|
+
exports.EndpointURLScheme = EndpointURLScheme;
|
|
3
|
+
exports.HttpAuthLocation = HttpAuthLocation;
|
|
4
|
+
exports.RequestHandlerProtocol = RequestHandlerProtocol;
|
|
2
5
|
|
|
3
|
-
var
|
|
4
|
-
|
|
5
|
-
exports.HostAddressType = void 0;
|
|
6
|
+
var HostAddressType;
|
|
6
7
|
(function (HostAddressType) {
|
|
7
8
|
HostAddressType["AAAA"] = "AAAA";
|
|
8
9
|
HostAddressType["A"] = "A";
|
|
9
|
-
})(
|
|
10
|
+
})(HostAddressType || (HostAddressType = {}));
|
|
10
11
|
|
|
11
|
-
exports.
|
|
12
|
-
exports.HttpAuthLocation = types.HttpAuthLocation;
|
|
13
|
-
exports.RequestHandlerProtocol = types.RequestHandlerProtocol;
|
|
12
|
+
exports.HostAddressType = HostAddressType;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-sdk/types",
|
|
3
|
-
"version": "3.973.
|
|
3
|
+
"version": "3.973.13",
|
|
4
4
|
"main": "./dist-cjs/index.js",
|
|
5
5
|
"module": "./dist-es/index.js",
|
|
6
6
|
"types": "./dist-types/index.d.ts",
|
|
@@ -8,11 +8,11 @@
|
|
|
8
8
|
"scripts": {
|
|
9
9
|
"build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
|
|
10
10
|
"build:cjs": "node ../../scripts/compilation/inline",
|
|
11
|
-
"build:es": "tsc -p tsconfig.es.json",
|
|
11
|
+
"build:es": "premove dist-es && tsc -p tsconfig.es.json",
|
|
12
12
|
"build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
|
|
13
|
-
"build:types": "tsc -p tsconfig.types.json",
|
|
13
|
+
"build:types": "premove dist-types && tsc -p tsconfig.types.json",
|
|
14
14
|
"build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
|
|
15
|
-
"clean": "premove dist-cjs dist-es dist-types
|
|
15
|
+
"clean": "premove dist-cjs dist-es dist-types",
|
|
16
16
|
"extract:docs": "api-extractor run --local",
|
|
17
17
|
"test": "tsc -p tsconfig.test.json"
|
|
18
18
|
},
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-sdk/util-locate-window",
|
|
3
|
-
"version": "3.965.
|
|
3
|
+
"version": "3.965.8",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
|
|
6
6
|
"build:cjs": "node ../../scripts/compilation/inline",
|
|
7
|
-
"build:es": "tsc -p tsconfig.es.json",
|
|
7
|
+
"build:es": "premove dist-es && tsc -p tsconfig.es.json",
|
|
8
8
|
"build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
|
|
9
|
-
"build:types": "tsc -p tsconfig.types.json",
|
|
9
|
+
"build:types": "premove dist-types && tsc -p tsconfig.types.json",
|
|
10
10
|
"build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
|
|
11
|
-
"clean": "premove dist-cjs dist-es dist-types
|
|
11
|
+
"clean": "premove dist-cjs dist-es dist-types",
|
|
12
12
|
"test": "yarn g:vitest run",
|
|
13
13
|
"test:watch": "yarn g:vitest watch"
|
|
14
14
|
},
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var xmlParser = require('./xml-parser');
|
|
1
|
+
const { parseXML } = require("./xml-parser");
|
|
2
|
+
exports.parseXML = parseXML;
|
|
4
3
|
|
|
5
4
|
const ATTR_ESCAPE_RE = /[&<>"]/g;
|
|
6
5
|
const ATTR_ESCAPE_MAP = {
|
|
@@ -126,6 +125,5 @@ class XmlNode {
|
|
|
126
125
|
}
|
|
127
126
|
}
|
|
128
127
|
|
|
129
|
-
exports.parseXML = xmlParser.parseXML;
|
|
130
128
|
exports.XmlNode = XmlNode;
|
|
131
129
|
exports.XmlText = XmlText;
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.EntityDecoderImpl = exports.CURRENCY = exports.COMMON_HTML = exports.XML = void 0;
|
|
4
|
-
exports.XML = {
|
|
1
|
+
const XML = {
|
|
5
2
|
amp: "&",
|
|
6
3
|
apos: "'",
|
|
7
4
|
gt: ">",
|
|
8
5
|
lt: "<",
|
|
9
6
|
quot: '"',
|
|
10
7
|
};
|
|
8
|
+
exports.XML = XML;
|
|
11
9
|
exports.COMMON_HTML = {
|
|
12
10
|
nbsp: "\u00a0",
|
|
13
11
|
copy: "\u00a9",
|
|
@@ -110,7 +108,7 @@ function parseNCRConfig(ncr) {
|
|
|
110
108
|
const clampedNull = Math.max(nullLevel, NCR_LEVEL.remove);
|
|
111
109
|
return { xmlVersion, onLevel, nullLevel: clampedNull };
|
|
112
110
|
}
|
|
113
|
-
|
|
111
|
+
exports.EntityDecoderImpl = class EntityDecoderImpl {
|
|
114
112
|
_limit;
|
|
115
113
|
_maxTotalExpansions;
|
|
116
114
|
_maxExpandedLength;
|
|
@@ -134,7 +132,7 @@ const EntityDecoderImpl = class EntityDecoderImpl {
|
|
|
134
132
|
this._postCheck = typeof options.postCheck === "function" ? options.postCheck : (r) => r;
|
|
135
133
|
this._limitTiers = parseLimitTiers(this._limit.applyLimitsTo ?? LIMIT_TIER_EXTERNAL);
|
|
136
134
|
this._numericAllowed = options.numericAllowed ?? true;
|
|
137
|
-
this._baseMap = mergeEntityMaps(
|
|
135
|
+
this._baseMap = mergeEntityMaps(XML, options.namedEntities || null);
|
|
138
136
|
this._externalMap = Object.create(null);
|
|
139
137
|
this._inputMap = Object.create(null);
|
|
140
138
|
this._totalExpansions = 0;
|
|
@@ -333,4 +331,3 @@ const EntityDecoderImpl = class EntityDecoderImpl {
|
|
|
333
331
|
return this._applyNCRAction(effective, token, cp);
|
|
334
332
|
}
|
|
335
333
|
};
|
|
336
|
-
exports.EntityDecoderImpl = EntityDecoderImpl;
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseXML = parseXML;
|
|
4
1
|
let parser;
|
|
5
|
-
function parseXML(xmlString) {
|
|
2
|
+
exports.parseXML = function parseXML(xmlString) {
|
|
6
3
|
if (!parser) {
|
|
7
4
|
parser = new DOMParser();
|
|
8
5
|
}
|
|
@@ -57,4 +54,4 @@ function parseXML(xmlString) {
|
|
|
57
54
|
return {
|
|
58
55
|
[xmlDocument.documentElement.nodeName]: xmlToObj(xmlDocument.documentElement),
|
|
59
56
|
};
|
|
60
|
-
}
|
|
57
|
+
};
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const nodable_entities_1 = require("./xml-external/nodable_entities");
|
|
6
|
-
const entityDecoder = new nodable_entities_1.EntityDecoderImpl({
|
|
7
|
-
namedEntities: { ...nodable_entities_1.XML, ...nodable_entities_1.COMMON_HTML, ...nodable_entities_1.CURRENCY },
|
|
1
|
+
const { XMLParser } = require("fast-xml-parser");
|
|
2
|
+
const { COMMON_HTML, CURRENCY, EntityDecoderImpl, XML } = require("./xml-external/nodable_entities");
|
|
3
|
+
const entityDecoder = new EntityDecoderImpl({
|
|
4
|
+
namedEntities: { ...XML, ...COMMON_HTML, ...CURRENCY },
|
|
8
5
|
numericAllowed: true,
|
|
9
6
|
limit: {
|
|
10
7
|
maxTotalExpansions: Infinity,
|
|
@@ -13,7 +10,7 @@ const entityDecoder = new nodable_entities_1.EntityDecoderImpl({
|
|
|
13
10
|
xmlVersion: 1.1,
|
|
14
11
|
},
|
|
15
12
|
});
|
|
16
|
-
const parser = new
|
|
13
|
+
const parser = new XMLParser({
|
|
17
14
|
attributeNamePrefix: "",
|
|
18
15
|
processEntities: {
|
|
19
16
|
enabled: true,
|
|
@@ -42,6 +39,6 @@ const parser = new fast_xml_parser_1.XMLParser({
|
|
|
42
39
|
tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
|
|
43
40
|
maxNestedTags: Infinity,
|
|
44
41
|
});
|
|
45
|
-
function parseXML(xmlString) {
|
|
42
|
+
exports.parseXML = function parseXML(xmlString) {
|
|
46
43
|
return parser.parse(xmlString, true);
|
|
47
|
-
}
|
|
44
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-sdk/xml-builder",
|
|
3
|
-
"version": "3.972.
|
|
3
|
+
"version": "3.972.30",
|
|
4
4
|
"description": "XML utilities for the AWS SDK",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@smithy/types": "^4.14.3",
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
"scripts": {
|
|
11
11
|
"build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
|
|
12
12
|
"build:cjs": "node ../../scripts/compilation/inline",
|
|
13
|
-
"build:es": "tsc -p tsconfig.es.json",
|
|
13
|
+
"build:es": "premove dist-es && tsc -p tsconfig.es.json",
|
|
14
14
|
"build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
|
|
15
|
-
"build:types": "tsc -p tsconfig.types.json",
|
|
15
|
+
"build:types": "premove dist-types && tsc -p tsconfig.types.json",
|
|
16
16
|
"build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
|
|
17
|
-
"clean": "premove dist-cjs dist-es dist-types
|
|
17
|
+
"clean": "premove dist-cjs dist-es dist-types",
|
|
18
18
|
"test": "yarn g:vitest run",
|
|
19
19
|
"test:watch": "yarn g:vitest watch"
|
|
20
20
|
},
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
const { getSmithyContext } = require("@smithy/core/transport");
|
|
2
|
+
exports.getSmithyContext = getSmithyContext;
|
|
3
|
+
const { HttpRequest } = require("@smithy/core/protocols");
|
|
4
|
+
const { requestBuilder } = require("@smithy/core/protocols");
|
|
5
|
+
exports.requestBuilder = requestBuilder;
|
|
6
|
+
const { HttpApiKeyAuthLocation } = require("@smithy/types");
|
|
7
7
|
|
|
8
8
|
const resolveAuthOptions = (candidateAuthOptions, authSchemePreference) => {
|
|
9
9
|
if (!authSchemePreference || authSchemePreference.length === 0) {
|
|
@@ -38,7 +38,7 @@ const httpAuthSchemeMiddleware = (config, mwOptions) => (next, context) => async
|
|
|
38
38
|
const authSchemePreference = config.authSchemePreference ? await config.authSchemePreference() : [];
|
|
39
39
|
const resolvedOptions = resolveAuthOptions(options, authSchemePreference);
|
|
40
40
|
const authSchemes = convertHttpAuthSchemesToMap(config.httpAuthSchemes);
|
|
41
|
-
const smithyContext =
|
|
41
|
+
const smithyContext = getSmithyContext(context);
|
|
42
42
|
const failureReasons = [];
|
|
43
43
|
for (const option of resolvedOptions) {
|
|
44
44
|
const scheme = authSchemes.get(option.schemeId);
|
|
@@ -106,10 +106,10 @@ const defaultErrorHandler = (signingProperties) => (error) => {
|
|
|
106
106
|
};
|
|
107
107
|
const defaultSuccessHandler = (httpResponse, signingProperties) => { };
|
|
108
108
|
const httpSigningMiddleware = (config) => (next, context) => async (args) => {
|
|
109
|
-
if (!
|
|
109
|
+
if (!HttpRequest.isInstance(args.request)) {
|
|
110
110
|
return next(args);
|
|
111
111
|
}
|
|
112
|
-
const smithyContext =
|
|
112
|
+
const smithyContext = getSmithyContext(context);
|
|
113
113
|
const scheme = smithyContext.selectedHttpAuthScheme;
|
|
114
114
|
if (!scheme) {
|
|
115
115
|
throw new Error(`No HttpAuthScheme was selected: unable to sign request`);
|
|
@@ -228,11 +228,11 @@ class HttpApiKeyAuthSigner {
|
|
|
228
228
|
if (!identity.apiKey) {
|
|
229
229
|
throw new Error("request could not be signed with `apiKey` since the `apiKey` is not defined");
|
|
230
230
|
}
|
|
231
|
-
const clonedRequest =
|
|
232
|
-
if (signingProperties.in ===
|
|
231
|
+
const clonedRequest = HttpRequest.clone(httpRequest);
|
|
232
|
+
if (signingProperties.in === HttpApiKeyAuthLocation.QUERY) {
|
|
233
233
|
clonedRequest.query[signingProperties.name] = identity.apiKey;
|
|
234
234
|
}
|
|
235
|
-
else if (signingProperties.in ===
|
|
235
|
+
else if (signingProperties.in === HttpApiKeyAuthLocation.HEADER) {
|
|
236
236
|
clonedRequest.headers[signingProperties.name] = signingProperties.scheme
|
|
237
237
|
? `${signingProperties.scheme} ${identity.apiKey}`
|
|
238
238
|
: identity.apiKey;
|
|
@@ -249,7 +249,7 @@ class HttpApiKeyAuthSigner {
|
|
|
249
249
|
|
|
250
250
|
class HttpBearerAuthSigner {
|
|
251
251
|
async sign(httpRequest, identity, signingProperties) {
|
|
252
|
-
const clonedRequest =
|
|
252
|
+
const clonedRequest = HttpRequest.clone(httpRequest);
|
|
253
253
|
if (!identity.token) {
|
|
254
254
|
throw new Error("request could not be signed with `token` since the `token` is not defined");
|
|
255
255
|
}
|
|
@@ -320,8 +320,6 @@ const memoizeIdentityProvider = (provider, isExpired, requiresRefresh) => {
|
|
|
320
320
|
};
|
|
321
321
|
};
|
|
322
322
|
|
|
323
|
-
exports.getSmithyContext = transport.getSmithyContext;
|
|
324
|
-
exports.requestBuilder = protocols.requestBuilder;
|
|
325
323
|
exports.DefaultIdentityProviderConfig = DefaultIdentityProviderConfig;
|
|
326
324
|
exports.EXPIRATION_MS = EXPIRATION_MS;
|
|
327
325
|
exports.HttpApiKeyAuthSigner = HttpApiKeyAuthSigner;
|