@cdklabs/cdk-ecs-codedeploy 0.0.303 → 0.0.305

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.
Files changed (59) hide show
  1. package/.jsii +3 -3
  2. package/.jsii.tabl.json +1 -1
  3. package/lib/api-canary/index.js +1 -1
  4. package/lib/ecs-appspec/index.js +1 -1
  5. package/lib/ecs-deployment/index.js +1 -1
  6. package/lib/ecs-patterns/application-load-balanced-codedeployed-fargate-service.js +1 -1
  7. package/node_modules/@aws-sdk/client-codedeploy/package.json +5 -5
  8. package/node_modules/@aws-sdk/client-sso/package.json +2 -2
  9. package/node_modules/@aws-sdk/client-sso-oidc/package.json +4 -4
  10. package/node_modules/@aws-sdk/client-sts/dist-cjs/index.js +17 -4
  11. package/node_modules/@aws-sdk/client-sts/dist-es/defaultStsRoleAssumers.js +17 -4
  12. package/node_modules/@aws-sdk/client-sts/package.json +4 -4
  13. package/node_modules/@aws-sdk/core/account-id-endpoint.js +6 -0
  14. package/node_modules/@aws-sdk/core/dist-cjs/submodules/account-id-endpoint/index.js +97 -0
  15. package/node_modules/@aws-sdk/core/dist-es/submodules/account-id-endpoint/AccountIdEndpointModeConfigResolver.js +15 -0
  16. package/node_modules/@aws-sdk/core/dist-es/submodules/account-id-endpoint/AccountIdEndpointModeConstants.js +5 -0
  17. package/node_modules/@aws-sdk/core/dist-es/submodules/account-id-endpoint/NodeAccountIdEndpointModeConfigOptions.js +24 -0
  18. package/node_modules/@aws-sdk/core/dist-es/submodules/account-id-endpoint/index.js +3 -0
  19. package/node_modules/@aws-sdk/core/dist-types/submodules/account-id-endpoint/AccountIdEndpointModeConfigResolver.d.ts +30 -0
  20. package/node_modules/@aws-sdk/core/dist-types/submodules/account-id-endpoint/AccountIdEndpointModeConstants.d.ts +7 -0
  21. package/node_modules/@aws-sdk/core/dist-types/submodules/account-id-endpoint/NodeAccountIdEndpointModeConfigOptions.d.ts +14 -0
  22. package/node_modules/@aws-sdk/core/dist-types/submodules/account-id-endpoint/index.d.ts +3 -0
  23. package/node_modules/@aws-sdk/core/dist-types/ts3.4/submodules/account-id-endpoint/AccountIdEndpointModeConfigResolver.d.ts +15 -0
  24. package/node_modules/@aws-sdk/core/dist-types/ts3.4/submodules/account-id-endpoint/AccountIdEndpointModeConstants.d.ts +6 -0
  25. package/node_modules/@aws-sdk/core/dist-types/ts3.4/submodules/account-id-endpoint/NodeAccountIdEndpointModeConfigOptions.d.ts +7 -0
  26. package/node_modules/@aws-sdk/core/dist-types/ts3.4/submodules/account-id-endpoint/index.d.ts +3 -0
  27. package/node_modules/@aws-sdk/core/package.json +12 -2
  28. package/node_modules/@aws-sdk/credential-provider-env/dist-cjs/index.js +6 -1
  29. package/node_modules/@aws-sdk/credential-provider-env/dist-es/fromEnv.js +3 -0
  30. package/node_modules/@aws-sdk/credential-provider-env/dist-types/fromEnv.d.ts +4 -0
  31. package/node_modules/@aws-sdk/credential-provider-env/dist-types/ts3.4/fromEnv.d.ts +1 -0
  32. package/node_modules/@aws-sdk/credential-provider-env/package.json +1 -1
  33. package/node_modules/@aws-sdk/credential-provider-ini/dist-cjs/index.js +3 -2
  34. package/node_modules/@aws-sdk/credential-provider-ini/dist-es/resolveStaticCredentials.js +4 -2
  35. package/node_modules/@aws-sdk/credential-provider-ini/dist-types/resolveStaticCredentials.d.ts +1 -0
  36. package/node_modules/@aws-sdk/credential-provider-ini/dist-types/ts3.4/resolveStaticCredentials.d.ts +1 -0
  37. package/node_modules/@aws-sdk/credential-provider-ini/package.json +5 -5
  38. package/node_modules/@aws-sdk/credential-provider-node/package.json +5 -5
  39. package/node_modules/@aws-sdk/credential-provider-process/dist-cjs/index.js +9 -3
  40. package/node_modules/@aws-sdk/credential-provider-process/dist-es/getValidatedProcessCredentials.js +6 -1
  41. package/node_modules/@aws-sdk/credential-provider-process/dist-es/resolveProcessCredentials.js +1 -1
  42. package/node_modules/@aws-sdk/credential-provider-process/dist-types/ProcessCredentials.d.ts +1 -0
  43. package/node_modules/@aws-sdk/credential-provider-process/dist-types/getValidatedProcessCredentials.d.ts +2 -2
  44. package/node_modules/@aws-sdk/credential-provider-process/dist-types/ts3.4/ProcessCredentials.d.ts +1 -0
  45. package/node_modules/@aws-sdk/credential-provider-process/dist-types/ts3.4/getValidatedProcessCredentials.d.ts +3 -2
  46. package/node_modules/@aws-sdk/credential-provider-process/package.json +1 -1
  47. package/node_modules/@aws-sdk/credential-provider-sso/dist-cjs/index.js +11 -2
  48. package/node_modules/@aws-sdk/credential-provider-sso/dist-es/resolveSSOCredentials.js +9 -2
  49. package/node_modules/@aws-sdk/credential-provider-sso/package.json +2 -2
  50. package/node_modules/@smithy/core/package.json +3 -3
  51. package/node_modules/@smithy/fetch-http-handler/dist-cjs/index.js +2 -1
  52. package/node_modules/@smithy/fetch-http-handler/dist-es/fetch-http-handler.js +1 -1
  53. package/node_modules/@smithy/fetch-http-handler/package.json +1 -1
  54. package/node_modules/@smithy/middleware-retry/package.json +2 -2
  55. package/node_modules/@smithy/smithy-client/package.json +2 -2
  56. package/node_modules/@smithy/util-defaults-mode-browser/package.json +2 -2
  57. package/node_modules/@smithy/util-defaults-mode-node/package.json +2 -2
  58. package/node_modules/@smithy/util-stream/package.json +2 -2
  59. package/package.json +5 -5
@@ -0,0 +1,15 @@
1
+ import { normalizeProvider } from "@smithy/util-middleware";
2
+ import { DEFAULT_ACCOUNT_ID_ENDPOINT_MODE, validateAccountIdEndpointMode, } from "./AccountIdEndpointModeConstants";
3
+ export const resolveAccountIdEndpointModeConfig = (input) => {
4
+ return {
5
+ ...input,
6
+ accountIdEndpointMode: async () => {
7
+ const accountIdEndpointModeProvider = normalizeProvider(input.accountIdEndpointMode ?? DEFAULT_ACCOUNT_ID_ENDPOINT_MODE);
8
+ const accIdMode = await accountIdEndpointModeProvider();
9
+ if (!validateAccountIdEndpointMode(accIdMode)) {
10
+ throw new Error(`Invalid value for accountIdEndpointMode: ${accIdMode}. Valid values are: "required", "preferred", "disabled".`);
11
+ }
12
+ return accIdMode;
13
+ },
14
+ };
15
+ };
@@ -0,0 +1,5 @@
1
+ export const DEFAULT_ACCOUNT_ID_ENDPOINT_MODE = "preferred";
2
+ export const ACCOUNT_ID_ENDPOINT_MODE_VALUES = ["disabled", "preferred", "required"];
3
+ export function validateAccountIdEndpointMode(value) {
4
+ return ACCOUNT_ID_ENDPOINT_MODE_VALUES.includes(value);
5
+ }
@@ -0,0 +1,24 @@
1
+ import { DEFAULT_ACCOUNT_ID_ENDPOINT_MODE, validateAccountIdEndpointMode, } from "./AccountIdEndpointModeConstants";
2
+ const err = "Invalid AccountIdEndpointMode value";
3
+ const _throw = (message) => {
4
+ throw new Error(message);
5
+ };
6
+ export const ENV_ACCOUNT_ID_ENDPOINT_MODE = "AWS_ACCOUNT_ID_ENDPOINT_MODE";
7
+ export const CONFIG_ACCOUNT_ID_ENDPOINT_MODE = "account_id_endpoint_mode";
8
+ export const NODE_ACCOUNT_ID_ENDPOINT_MODE_CONFIG_OPTIONS = {
9
+ environmentVariableSelector: (env) => {
10
+ const value = env[ENV_ACCOUNT_ID_ENDPOINT_MODE];
11
+ if (value && !validateAccountIdEndpointMode(value)) {
12
+ _throw(err);
13
+ }
14
+ return value;
15
+ },
16
+ configFileSelector: (profile) => {
17
+ const value = profile[CONFIG_ACCOUNT_ID_ENDPOINT_MODE];
18
+ if (value && !validateAccountIdEndpointMode(value)) {
19
+ _throw(err);
20
+ }
21
+ return value;
22
+ },
23
+ default: DEFAULT_ACCOUNT_ID_ENDPOINT_MODE,
24
+ };
@@ -0,0 +1,3 @@
1
+ export * from "./AccountIdEndpointModeConfigResolver";
2
+ export * from "./AccountIdEndpointModeConstants";
3
+ export * from "./NodeAccountIdEndpointModeConfigOptions";
@@ -0,0 +1,30 @@
1
+ import { Provider } from "@smithy/types";
2
+ import { AccountIdEndpointMode } from "./AccountIdEndpointModeConstants";
3
+ /**
4
+ * @public
5
+ */
6
+ export interface AccountIdEndpointModeInputConfig {
7
+ /**
8
+ * The account ID endpoint mode to use.
9
+ */
10
+ accountIdEndpointMode?: AccountIdEndpointMode | Provider<AccountIdEndpointMode>;
11
+ }
12
+ /**
13
+ * @internal
14
+ */
15
+ interface PreviouslyResolved {
16
+ }
17
+ /**
18
+ * @internal
19
+ */
20
+ export interface AccountIdEndpointModeResolvedConfig {
21
+ /**
22
+ * Resolved value for input config {config.accountIdEndpointMode}
23
+ */
24
+ accountIdEndpointMode: Provider<AccountIdEndpointMode>;
25
+ }
26
+ /**
27
+ * @internal
28
+ */
29
+ export declare const resolveAccountIdEndpointModeConfig: <T>(input: T & AccountIdEndpointModeInputConfig & PreviouslyResolved) => T & AccountIdEndpointModeResolvedConfig;
30
+ export {};
@@ -0,0 +1,7 @@
1
+ export type AccountIdEndpointMode = "disabled" | "preferred" | "required";
2
+ export declare const DEFAULT_ACCOUNT_ID_ENDPOINT_MODE = "preferred";
3
+ export declare const ACCOUNT_ID_ENDPOINT_MODE_VALUES: AccountIdEndpointMode[];
4
+ /**
5
+ * @internal
6
+ */
7
+ export declare function validateAccountIdEndpointMode(value: any): value is AccountIdEndpointMode;
@@ -0,0 +1,14 @@
1
+ import { LoadedConfigSelectors } from "@smithy/node-config-provider";
2
+ import { AccountIdEndpointMode } from "./AccountIdEndpointModeConstants";
3
+ /**
4
+ * @internal
5
+ */
6
+ export declare const ENV_ACCOUNT_ID_ENDPOINT_MODE = "AWS_ACCOUNT_ID_ENDPOINT_MODE";
7
+ /**
8
+ * @internal
9
+ */
10
+ export declare const CONFIG_ACCOUNT_ID_ENDPOINT_MODE = "account_id_endpoint_mode";
11
+ /**
12
+ * @internal
13
+ */
14
+ export declare const NODE_ACCOUNT_ID_ENDPOINT_MODE_CONFIG_OPTIONS: LoadedConfigSelectors<AccountIdEndpointMode>;
@@ -0,0 +1,3 @@
1
+ export * from "./AccountIdEndpointModeConfigResolver";
2
+ export * from "./AccountIdEndpointModeConstants";
3
+ export * from "./NodeAccountIdEndpointModeConfigOptions";
@@ -0,0 +1,15 @@
1
+ import { Provider } from "@smithy/types";
2
+ import { AccountIdEndpointMode } from "./AccountIdEndpointModeConstants";
3
+ export interface AccountIdEndpointModeInputConfig {
4
+ accountIdEndpointMode?:
5
+ | AccountIdEndpointMode
6
+ | Provider<AccountIdEndpointMode>;
7
+ }
8
+ interface PreviouslyResolved {}
9
+ export interface AccountIdEndpointModeResolvedConfig {
10
+ accountIdEndpointMode: Provider<AccountIdEndpointMode>;
11
+ }
12
+ export declare const resolveAccountIdEndpointModeConfig: <T>(
13
+ input: T & AccountIdEndpointModeInputConfig & PreviouslyResolved
14
+ ) => T & AccountIdEndpointModeResolvedConfig;
15
+ export {};
@@ -0,0 +1,6 @@
1
+ export type AccountIdEndpointMode = "disabled" | "preferred" | "required";
2
+ export declare const DEFAULT_ACCOUNT_ID_ENDPOINT_MODE = "preferred";
3
+ export declare const ACCOUNT_ID_ENDPOINT_MODE_VALUES: AccountIdEndpointMode[];
4
+ export declare function validateAccountIdEndpointMode(
5
+ value: any
6
+ ): value is AccountIdEndpointMode;
@@ -0,0 +1,7 @@
1
+ import { LoadedConfigSelectors } from "@smithy/node-config-provider";
2
+ import { AccountIdEndpointMode } from "./AccountIdEndpointModeConstants";
3
+ export declare const ENV_ACCOUNT_ID_ENDPOINT_MODE =
4
+ "AWS_ACCOUNT_ID_ENDPOINT_MODE";
5
+ export declare const CONFIG_ACCOUNT_ID_ENDPOINT_MODE =
6
+ "account_id_endpoint_mode";
7
+ export declare const NODE_ACCOUNT_ID_ENDPOINT_MODE_CONFIG_OPTIONS: LoadedConfigSelectors<AccountIdEndpointMode>;
@@ -0,0 +1,3 @@
1
+ export * from "./AccountIdEndpointModeConfigResolver";
2
+ export * from "./AccountIdEndpointModeConstants";
3
+ export * from "./NodeAccountIdEndpointModeConfigOptions";
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/core",
3
- "version": "3.620.0",
3
+ "version": "3.620.1",
4
4
  "description": "Core functions & classes shared by multiple AWS SDK clients",
5
5
  "scripts": {
6
6
  "build": "yarn lint && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
@@ -46,6 +46,13 @@
46
46
  "require": "./dist-cjs/submodules/httpAuthSchemes/index.js",
47
47
  "types": "./dist-types/submodules/httpAuthSchemes/index.d.ts"
48
48
  },
49
+ "./account-id-endpoint": {
50
+ "module": "./dist-es/submodules/account-id-endpoint/index.js",
51
+ "node": "./dist-cjs/submodules/account-id-endpoint/index.js",
52
+ "import": "./dist-es/submodules/account-id-endpoint/index.js",
53
+ "require": "./dist-cjs/submodules/account-id-endpoint/index.js",
54
+ "types": "./dist-types/submodules/account-id-endpoint/index.d.ts"
55
+ },
49
56
  "./protocols": {
50
57
  "module": "./dist-es/submodules/protocols/index.js",
51
58
  "node": "./dist-cjs/submodules/protocols/index.js",
@@ -58,7 +65,8 @@
58
65
  "dist-*/**",
59
66
  "./client.js",
60
67
  "./httpAuthSchemes.js",
61
- "./protocols.js"
68
+ "./protocols.js",
69
+ "./account-id-endpoint.js"
62
70
  ],
63
71
  "sideEffects": false,
64
72
  "author": {
@@ -68,10 +76,12 @@
68
76
  "license": "Apache-2.0",
69
77
  "dependencies": {
70
78
  "@smithy/core": "^2.3.0",
79
+ "@smithy/node-config-provider": "^3.1.4",
71
80
  "@smithy/protocol-http": "^4.1.0",
72
81
  "@smithy/signature-v4": "^4.1.0",
73
82
  "@smithy/smithy-client": "^3.1.10",
74
83
  "@smithy/types": "^3.3.0",
84
+ "@smithy/util-middleware": "^3.0.3",
75
85
  "fast-xml-parser": "4.2.5",
76
86
  "tslib": "^2.6.2"
77
87
  },
@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
21
21
  // src/index.ts
22
22
  var src_exports = {};
23
23
  __export(src_exports, {
24
+ ENV_ACCOUNT_ID: () => ENV_ACCOUNT_ID,
24
25
  ENV_CREDENTIAL_SCOPE: () => ENV_CREDENTIAL_SCOPE,
25
26
  ENV_EXPIRATION: () => ENV_EXPIRATION,
26
27
  ENV_KEY: () => ENV_KEY,
@@ -37,6 +38,7 @@ var ENV_SECRET = "AWS_SECRET_ACCESS_KEY";
37
38
  var ENV_SESSION = "AWS_SESSION_TOKEN";
38
39
  var ENV_EXPIRATION = "AWS_CREDENTIAL_EXPIRATION";
39
40
  var ENV_CREDENTIAL_SCOPE = "AWS_CREDENTIAL_SCOPE";
41
+ var ENV_ACCOUNT_ID = "AWS_ACCOUNT_ID";
40
42
  var fromEnv = /* @__PURE__ */ __name((init) => async () => {
41
43
  var _a;
42
44
  (_a = init == null ? void 0 : init.logger) == null ? void 0 : _a.debug("@aws-sdk/credential-provider-env - fromEnv");
@@ -45,13 +47,15 @@ var fromEnv = /* @__PURE__ */ __name((init) => async () => {
45
47
  const sessionToken = process.env[ENV_SESSION];
46
48
  const expiry = process.env[ENV_EXPIRATION];
47
49
  const credentialScope = process.env[ENV_CREDENTIAL_SCOPE];
50
+ const accountId = process.env[ENV_ACCOUNT_ID];
48
51
  if (accessKeyId && secretAccessKey) {
49
52
  return {
50
53
  accessKeyId,
51
54
  secretAccessKey,
52
55
  ...sessionToken && { sessionToken },
53
56
  ...expiry && { expiration: new Date(expiry) },
54
- ...credentialScope && { credentialScope }
57
+ ...credentialScope && { credentialScope },
58
+ ...accountId && { accountId }
55
59
  };
56
60
  }
57
61
  throw new import_property_provider.CredentialsProviderError("Unable to find environment variable credentials.", { logger: init == null ? void 0 : init.logger });
@@ -64,6 +68,7 @@ var fromEnv = /* @__PURE__ */ __name((init) => async () => {
64
68
  ENV_SESSION,
65
69
  ENV_EXPIRATION,
66
70
  ENV_CREDENTIAL_SCOPE,
71
+ ENV_ACCOUNT_ID,
67
72
  fromEnv
68
73
  });
69
74
 
@@ -4,6 +4,7 @@ export const ENV_SECRET = "AWS_SECRET_ACCESS_KEY";
4
4
  export const ENV_SESSION = "AWS_SESSION_TOKEN";
5
5
  export const ENV_EXPIRATION = "AWS_CREDENTIAL_EXPIRATION";
6
6
  export const ENV_CREDENTIAL_SCOPE = "AWS_CREDENTIAL_SCOPE";
7
+ export const ENV_ACCOUNT_ID = "AWS_ACCOUNT_ID";
7
8
  export const fromEnv = (init) => async () => {
8
9
  init?.logger?.debug("@aws-sdk/credential-provider-env - fromEnv");
9
10
  const accessKeyId = process.env[ENV_KEY];
@@ -11,6 +12,7 @@ export const fromEnv = (init) => async () => {
11
12
  const sessionToken = process.env[ENV_SESSION];
12
13
  const expiry = process.env[ENV_EXPIRATION];
13
14
  const credentialScope = process.env[ENV_CREDENTIAL_SCOPE];
15
+ const accountId = process.env[ENV_ACCOUNT_ID];
14
16
  if (accessKeyId && secretAccessKey) {
15
17
  return {
16
18
  accessKeyId,
@@ -18,6 +20,7 @@ export const fromEnv = (init) => async () => {
18
20
  ...(sessionToken && { sessionToken }),
19
21
  ...(expiry && { expiration: new Date(expiry) }),
20
22
  ...(credentialScope && { credentialScope }),
23
+ ...(accountId && { accountId }),
21
24
  };
22
25
  }
23
26
  throw new CredentialsProviderError("Unable to find environment variable credentials.", { logger: init?.logger });
@@ -22,6 +22,10 @@ export declare const ENV_EXPIRATION = "AWS_CREDENTIAL_EXPIRATION";
22
22
  * @internal
23
23
  */
24
24
  export declare const ENV_CREDENTIAL_SCOPE = "AWS_CREDENTIAL_SCOPE";
25
+ /**
26
+ * @internal
27
+ */
28
+ export declare const ENV_ACCOUNT_ID = "AWS_ACCOUNT_ID";
25
29
  /**
26
30
  * @internal
27
31
  *
@@ -6,6 +6,7 @@ export declare const ENV_SECRET = "AWS_SECRET_ACCESS_KEY";
6
6
  export declare const ENV_SESSION = "AWS_SESSION_TOKEN";
7
7
  export declare const ENV_EXPIRATION = "AWS_CREDENTIAL_EXPIRATION";
8
8
  export declare const ENV_CREDENTIAL_SCOPE = "AWS_CREDENTIAL_SCOPE";
9
+ export declare const ENV_ACCOUNT_ID = "AWS_ACCOUNT_ID";
9
10
  export declare const fromEnv: (
10
11
  init?: FromEnvInit
11
12
  ) => AwsCredentialIdentityProvider;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/credential-provider-env",
3
- "version": "3.609.0",
3
+ "version": "3.620.1",
4
4
  "description": "AWS credential provider that sources credentials from known environment variables",
5
5
  "main": "./dist-cjs/index.js",
6
6
  "module": "./dist-es/index.js",
@@ -180,7 +180,7 @@ var resolveSsoCredentials = /* @__PURE__ */ __name(async (profile, options = {})
180
180
  var isSsoProfile = /* @__PURE__ */ __name((arg) => arg && (typeof arg.sso_start_url === "string" || typeof arg.sso_account_id === "string" || typeof arg.sso_session === "string" || typeof arg.sso_region === "string" || typeof arg.sso_role_name === "string"), "isSsoProfile");
181
181
 
182
182
  // src/resolveStaticCredentials.ts
183
- var isStaticCredsProfile = /* @__PURE__ */ __name((arg) => Boolean(arg) && typeof arg === "object" && typeof arg.aws_access_key_id === "string" && typeof arg.aws_secret_access_key === "string" && ["undefined", "string"].indexOf(typeof arg.aws_session_token) > -1, "isStaticCredsProfile");
183
+ var isStaticCredsProfile = /* @__PURE__ */ __name((arg) => Boolean(arg) && typeof arg === "object" && typeof arg.aws_access_key_id === "string" && typeof arg.aws_secret_access_key === "string" && ["undefined", "string"].indexOf(typeof arg.aws_session_token) > -1 && ["undefined", "string"].indexOf(typeof arg.aws_account_id) > -1, "isStaticCredsProfile");
184
184
  var resolveStaticCredentials = /* @__PURE__ */ __name((profile, options) => {
185
185
  var _a;
186
186
  (_a = options == null ? void 0 : options.logger) == null ? void 0 : _a.debug("@aws-sdk/credential-provider-ini - resolveStaticCredentials");
@@ -188,7 +188,8 @@ var resolveStaticCredentials = /* @__PURE__ */ __name((profile, options) => {
188
188
  accessKeyId: profile.aws_access_key_id,
189
189
  secretAccessKey: profile.aws_secret_access_key,
190
190
  sessionToken: profile.aws_session_token,
191
- credentialScope: profile.aws_credential_scope
191
+ ...profile.aws_credential_scope && { credentialScope: profile.aws_credential_scope },
192
+ ...profile.aws_account_id && { accountId: profile.aws_account_id }
192
193
  });
193
194
  }, "resolveStaticCredentials");
194
195
 
@@ -2,13 +2,15 @@ export const isStaticCredsProfile = (arg) => Boolean(arg) &&
2
2
  typeof arg === "object" &&
3
3
  typeof arg.aws_access_key_id === "string" &&
4
4
  typeof arg.aws_secret_access_key === "string" &&
5
- ["undefined", "string"].indexOf(typeof arg.aws_session_token) > -1;
5
+ ["undefined", "string"].indexOf(typeof arg.aws_session_token) > -1 &&
6
+ ["undefined", "string"].indexOf(typeof arg.aws_account_id) > -1;
6
7
  export const resolveStaticCredentials = (profile, options) => {
7
8
  options?.logger?.debug("@aws-sdk/credential-provider-ini - resolveStaticCredentials");
8
9
  return Promise.resolve({
9
10
  accessKeyId: profile.aws_access_key_id,
10
11
  secretAccessKey: profile.aws_secret_access_key,
11
12
  sessionToken: profile.aws_session_token,
12
- credentialScope: profile.aws_credential_scope,
13
+ ...(profile.aws_credential_scope && { credentialScope: profile.aws_credential_scope }),
14
+ ...(profile.aws_account_id && { accountId: profile.aws_account_id }),
13
15
  });
14
16
  };
@@ -8,6 +8,7 @@ export interface StaticCredsProfile extends Profile {
8
8
  aws_secret_access_key: string;
9
9
  aws_session_token?: string;
10
10
  aws_credential_scope?: string;
11
+ aws_account_id?: string;
11
12
  }
12
13
  /**
13
14
  * @internal
@@ -5,6 +5,7 @@ export interface StaticCredsProfile extends Profile {
5
5
  aws_secret_access_key: string;
6
6
  aws_session_token?: string;
7
7
  aws_credential_scope?: string;
8
+ aws_account_id?: string;
8
9
  }
9
10
  export declare const isStaticCredsProfile: (
10
11
  arg: any
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/credential-provider-ini",
3
- "version": "3.620.0",
3
+ "version": "3.620.1",
4
4
  "description": "AWS credential provider that sources credentials from ~/.aws/credentials and ~/.aws/config",
5
5
  "main": "./dist-cjs/index.js",
6
6
  "module": "./dist-es/index.js",
@@ -24,10 +24,10 @@
24
24
  },
25
25
  "license": "Apache-2.0",
26
26
  "dependencies": {
27
- "@aws-sdk/credential-provider-env": "3.609.0",
27
+ "@aws-sdk/credential-provider-env": "3.620.1",
28
28
  "@aws-sdk/credential-provider-http": "3.620.0",
29
- "@aws-sdk/credential-provider-process": "3.614.0",
30
- "@aws-sdk/credential-provider-sso": "3.620.0",
29
+ "@aws-sdk/credential-provider-process": "3.620.1",
30
+ "@aws-sdk/credential-provider-sso": "3.620.1",
31
31
  "@aws-sdk/credential-provider-web-identity": "3.609.0",
32
32
  "@aws-sdk/types": "3.609.0",
33
33
  "@smithy/credential-provider-imds": "^3.2.0",
@@ -45,7 +45,7 @@
45
45
  "typescript": "~4.9.5"
46
46
  },
47
47
  "peerDependencies": {
48
- "@aws-sdk/client-sts": "^3.620.0"
48
+ "@aws-sdk/client-sts": "^3.620.1"
49
49
  },
50
50
  "types": "./dist-types/index.d.ts",
51
51
  "engines": {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/credential-provider-node",
3
- "version": "3.620.0",
3
+ "version": "3.620.1",
4
4
  "description": "AWS credential provider that sources credentials from a Node.JS environment. ",
5
5
  "engines": {
6
6
  "node": ">=16.0.0"
@@ -28,11 +28,11 @@
28
28
  },
29
29
  "license": "Apache-2.0",
30
30
  "dependencies": {
31
- "@aws-sdk/credential-provider-env": "3.609.0",
31
+ "@aws-sdk/credential-provider-env": "3.620.1",
32
32
  "@aws-sdk/credential-provider-http": "3.620.0",
33
- "@aws-sdk/credential-provider-ini": "3.620.0",
34
- "@aws-sdk/credential-provider-process": "3.614.0",
35
- "@aws-sdk/credential-provider-sso": "3.620.0",
33
+ "@aws-sdk/credential-provider-ini": "3.620.1",
34
+ "@aws-sdk/credential-provider-process": "3.620.1",
35
+ "@aws-sdk/credential-provider-sso": "3.620.1",
36
36
  "@aws-sdk/credential-provider-web-identity": "3.609.0",
37
37
  "@aws-sdk/types": "3.609.0",
38
38
  "@smithy/credential-provider-imds": "^3.2.0",
@@ -34,7 +34,8 @@ var import_child_process = require("child_process");
34
34
  var import_util = require("util");
35
35
 
36
36
  // src/getValidatedProcessCredentials.ts
37
- var getValidatedProcessCredentials = /* @__PURE__ */ __name((profileName, data) => {
37
+ var getValidatedProcessCredentials = /* @__PURE__ */ __name((profileName, data, profiles) => {
38
+ var _a;
38
39
  if (data.Version !== 1) {
39
40
  throw Error(`Profile ${profileName} credential_process did not return Version 1.`);
40
41
  }
@@ -48,12 +49,17 @@ var getValidatedProcessCredentials = /* @__PURE__ */ __name((profileName, data)
48
49
  throw Error(`Profile ${profileName} credential_process returned expired credentials.`);
49
50
  }
50
51
  }
52
+ let accountId = data.AccountId;
53
+ if (!accountId && ((_a = profiles == null ? void 0 : profiles[profileName]) == null ? void 0 : _a.aws_account_id)) {
54
+ accountId = profiles[profileName].aws_account_id;
55
+ }
51
56
  return {
52
57
  accessKeyId: data.AccessKeyId,
53
58
  secretAccessKey: data.SecretAccessKey,
54
59
  ...data.SessionToken && { sessionToken: data.SessionToken },
55
60
  ...data.Expiration && { expiration: new Date(data.Expiration) },
56
- ...data.CredentialScope && { credentialScope: data.CredentialScope }
61
+ ...data.CredentialScope && { credentialScope: data.CredentialScope },
62
+ ...accountId && { accountId }
57
63
  };
58
64
  }, "getValidatedProcessCredentials");
59
65
 
@@ -72,7 +78,7 @@ var resolveProcessCredentials = /* @__PURE__ */ __name(async (profileName, profi
72
78
  } catch {
73
79
  throw Error(`Profile ${profileName} credential_process returned invalid JSON.`);
74
80
  }
75
- return getValidatedProcessCredentials(profileName, data);
81
+ return getValidatedProcessCredentials(profileName, data, profiles);
76
82
  } catch (error) {
77
83
  throw new import_property_provider.CredentialsProviderError(error.message, { logger });
78
84
  }
@@ -1,4 +1,4 @@
1
- export const getValidatedProcessCredentials = (profileName, data) => {
1
+ export const getValidatedProcessCredentials = (profileName, data, profiles) => {
2
2
  if (data.Version !== 1) {
3
3
  throw Error(`Profile ${profileName} credential_process did not return Version 1.`);
4
4
  }
@@ -12,11 +12,16 @@ export const getValidatedProcessCredentials = (profileName, data) => {
12
12
  throw Error(`Profile ${profileName} credential_process returned expired credentials.`);
13
13
  }
14
14
  }
15
+ let accountId = data.AccountId;
16
+ if (!accountId && profiles?.[profileName]?.aws_account_id) {
17
+ accountId = profiles[profileName].aws_account_id;
18
+ }
15
19
  return {
16
20
  accessKeyId: data.AccessKeyId,
17
21
  secretAccessKey: data.SecretAccessKey,
18
22
  ...(data.SessionToken && { sessionToken: data.SessionToken }),
19
23
  ...(data.Expiration && { expiration: new Date(data.Expiration) }),
20
24
  ...(data.CredentialScope && { credentialScope: data.CredentialScope }),
25
+ ...(accountId && { accountId }),
21
26
  };
22
27
  };
@@ -17,7 +17,7 @@ export const resolveProcessCredentials = async (profileName, profiles, logger) =
17
17
  catch {
18
18
  throw Error(`Profile ${profileName} credential_process returned invalid JSON.`);
19
19
  }
20
- return getValidatedProcessCredentials(profileName, data);
20
+ return getValidatedProcessCredentials(profileName, data, profiles);
21
21
  }
22
22
  catch (error) {
23
23
  throw new CredentialsProviderError(error.message, { logger });
@@ -8,4 +8,5 @@ export type ProcessCredentials = {
8
8
  SessionToken?: string;
9
9
  Expiration?: number;
10
10
  CredentialScope?: string;
11
+ AccountId?: string;
11
12
  };
@@ -1,6 +1,6 @@
1
- import { AwsCredentialIdentity } from "@smithy/types";
1
+ import { AwsCredentialIdentity, ParsedIniData } from "@smithy/types";
2
2
  import { ProcessCredentials } from "./ProcessCredentials";
3
3
  /**
4
4
  * @internal
5
5
  */
6
- export declare const getValidatedProcessCredentials: (profileName: string, data: ProcessCredentials) => AwsCredentialIdentity;
6
+ export declare const getValidatedProcessCredentials: (profileName: string, data: ProcessCredentials, profiles: ParsedIniData) => AwsCredentialIdentity;
@@ -5,4 +5,5 @@ export type ProcessCredentials = {
5
5
  SessionToken?: string;
6
6
  Expiration?: number;
7
7
  CredentialScope?: string;
8
+ AccountId?: string;
8
9
  };
@@ -1,6 +1,7 @@
1
- import { AwsCredentialIdentity } from "@smithy/types";
1
+ import { AwsCredentialIdentity, ParsedIniData } from "@smithy/types";
2
2
  import { ProcessCredentials } from "./ProcessCredentials";
3
3
  export declare const getValidatedProcessCredentials: (
4
4
  profileName: string,
5
- data: ProcessCredentials
5
+ data: ProcessCredentials,
6
+ profiles: ParsedIniData
6
7
  ) => AwsCredentialIdentity;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/credential-provider-process",
3
- "version": "3.614.0",
3
+ "version": "3.620.1",
4
4
  "description": "AWS credential provider that sources credential_process from ~/.aws/credentials and ~/.aws/config",
5
5
  "main": "./dist-cjs/index.js",
6
6
  "module": "./dist-es/index.js",
@@ -120,14 +120,23 @@ var resolveSSOCredentials = /* @__PURE__ */ __name(async ({
120
120
  logger
121
121
  });
122
122
  }
123
- const { roleCredentials: { accessKeyId, secretAccessKey, sessionToken, expiration, credentialScope } = {} } = ssoResp;
123
+ const {
124
+ roleCredentials: { accessKeyId, secretAccessKey, sessionToken, expiration, credentialScope, accountId } = {}
125
+ } = ssoResp;
124
126
  if (!accessKeyId || !secretAccessKey || !sessionToken || !expiration) {
125
127
  throw new import_property_provider.CredentialsProviderError("SSO returns an invalid temporary credential.", {
126
128
  tryNextLink: SHOULD_FAIL_CREDENTIAL_CHAIN,
127
129
  logger
128
130
  });
129
131
  }
130
- return { accessKeyId, secretAccessKey, sessionToken, expiration: new Date(expiration), credentialScope };
132
+ return {
133
+ accessKeyId,
134
+ secretAccessKey,
135
+ sessionToken,
136
+ expiration: new Date(expiration),
137
+ ...credentialScope && { credentialScope },
138
+ ...accountId && { accountId }
139
+ };
131
140
  }, "resolveSSOCredentials");
132
141
 
133
142
  // src/validateSsoProfile.ts
@@ -57,12 +57,19 @@ export const resolveSSOCredentials = async ({ ssoStartUrl, ssoSession, ssoAccoun
57
57
  logger,
58
58
  });
59
59
  }
60
- const { roleCredentials: { accessKeyId, secretAccessKey, sessionToken, expiration, credentialScope } = {} } = ssoResp;
60
+ const { roleCredentials: { accessKeyId, secretAccessKey, sessionToken, expiration, credentialScope, accountId } = {}, } = ssoResp;
61
61
  if (!accessKeyId || !secretAccessKey || !sessionToken || !expiration) {
62
62
  throw new CredentialsProviderError("SSO returns an invalid temporary credential.", {
63
63
  tryNextLink: SHOULD_FAIL_CREDENTIAL_CHAIN,
64
64
  logger,
65
65
  });
66
66
  }
67
- return { accessKeyId, secretAccessKey, sessionToken, expiration: new Date(expiration), credentialScope };
67
+ return {
68
+ accessKeyId,
69
+ secretAccessKey,
70
+ sessionToken,
71
+ expiration: new Date(expiration),
72
+ ...(credentialScope && { credentialScope }),
73
+ ...(accountId && { accountId }),
74
+ };
68
75
  };
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/credential-provider-sso",
3
- "version": "3.620.0",
3
+ "version": "3.620.1",
4
4
  "description": "AWS credential provider that exchanges a resolved SSO login token file for temporary AWS credentials",
5
5
  "main": "./dist-cjs/index.js",
6
6
  "module": "./dist-es/index.js",
@@ -24,7 +24,7 @@
24
24
  },
25
25
  "license": "Apache-2.0",
26
26
  "dependencies": {
27
- "@aws-sdk/client-sso": "3.620.0",
27
+ "@aws-sdk/client-sso": "3.620.1",
28
28
  "@aws-sdk/token-providers": "3.614.0",
29
29
  "@aws-sdk/types": "3.609.0",
30
30
  "@smithy/property-provider": "^3.1.3",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@smithy/core",
3
- "version": "2.3.0",
3
+ "version": "2.3.1",
4
4
  "scripts": {
5
5
  "build": "yarn lint && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
6
6
  "build:cjs": "node ../../scripts/inline core",
@@ -39,10 +39,10 @@
39
39
  "license": "Apache-2.0",
40
40
  "dependencies": {
41
41
  "@smithy/middleware-endpoint": "^3.1.0",
42
- "@smithy/middleware-retry": "^3.0.12",
42
+ "@smithy/middleware-retry": "^3.0.13",
43
43
  "@smithy/middleware-serde": "^3.0.3",
44
44
  "@smithy/protocol-http": "^4.1.0",
45
- "@smithy/smithy-client": "^3.1.10",
45
+ "@smithy/smithy-client": "^3.1.11",
46
46
  "@smithy/types": "^3.3.0",
47
47
  "@smithy/util-middleware": "^3.0.3",
48
48
  "tslib": "^2.6.2"
@@ -118,7 +118,8 @@ var _FetchHttpHandler = class _FetchHttpHandler {
118
118
  if (keepAliveSupport.supported) {
119
119
  requestOptions.keepalive = keepAlive;
120
120
  }
121
- let removeSignalEventListener = null;
121
+ let removeSignalEventListener = /* @__PURE__ */ __name(() => {
122
+ }, "removeSignalEventListener");
122
123
  const fetchRequest = new Request(url, requestOptions);
123
124
  const raceOfPromises = [
124
125
  fetch(fetchRequest).then((response) => {
@@ -69,7 +69,7 @@ export class FetchHttpHandler {
69
69
  if (keepAliveSupport.supported) {
70
70
  requestOptions.keepalive = keepAlive;
71
71
  }
72
- let removeSignalEventListener = null;
72
+ let removeSignalEventListener = () => { };
73
73
  const fetchRequest = new Request(url, requestOptions);
74
74
  const raceOfPromises = [
75
75
  fetch(fetchRequest).then((response) => {