@cdk8s/awscdk-resolver 0.0.397 → 0.0.399

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 (130) hide show
  1. package/.jsii +4 -4
  2. package/lib/resolve.js +1 -1
  3. package/node_modules/@aws/lambda-invoke-store/README.md +8 -0
  4. package/node_modules/@aws/lambda-invoke-store/{dist → dist-cjs}/invoke-store.js +12 -36
  5. package/node_modules/@aws/lambda-invoke-store/dist-es/invoke-store.js +64 -0
  6. package/node_modules/@aws/lambda-invoke-store/{dist → dist-types}/invoke-store.d.ts +5 -0
  7. package/node_modules/@aws/lambda-invoke-store/package.json +26 -8
  8. package/node_modules/@aws-sdk/client-cloudformation/dist-types/runtimeConfig.d.ts +1 -1
  9. package/node_modules/@aws-sdk/client-cloudformation/dist-types/ts3.4/runtimeConfig.d.ts +1 -3
  10. package/node_modules/@aws-sdk/client-cloudformation/package.json +34 -34
  11. package/node_modules/@aws-sdk/client-sso/dist-cjs/endpoint/ruleset.js +1 -1
  12. package/node_modules/@aws-sdk/client-sso/dist-es/endpoint/ruleset.js +1 -1
  13. package/node_modules/@aws-sdk/client-sso/package.json +32 -32
  14. package/node_modules/@aws-sdk/core/package.json +11 -11
  15. package/node_modules/@aws-sdk/credential-provider-env/package.json +5 -5
  16. package/node_modules/@aws-sdk/credential-provider-http/package.json +10 -10
  17. package/node_modules/@aws-sdk/credential-provider-ini/package.json +13 -13
  18. package/node_modules/@aws-sdk/credential-provider-node/dist-cjs/index.js +108 -45
  19. package/node_modules/@aws-sdk/credential-provider-node/dist-es/defaultProvider.js +55 -46
  20. package/node_modules/@aws-sdk/credential-provider-node/dist-es/runtime/memoize-chain.js +54 -0
  21. package/node_modules/@aws-sdk/credential-provider-node/dist-types/defaultProvider.d.ts +3 -2
  22. package/node_modules/@aws-sdk/credential-provider-node/dist-types/runtime/memoize-chain.d.ts +18 -0
  23. package/node_modules/@aws-sdk/credential-provider-node/dist-types/ts3.4/defaultProvider.d.ts +3 -2
  24. package/node_modules/@aws-sdk/credential-provider-node/dist-types/ts3.4/runtime/memoize-chain.d.ts +19 -0
  25. package/node_modules/@aws-sdk/credential-provider-node/package.json +13 -13
  26. package/node_modules/@aws-sdk/credential-provider-process/package.json +6 -6
  27. package/node_modules/@aws-sdk/credential-provider-sso/dist-cjs/index.js +1 -0
  28. package/node_modules/@aws-sdk/credential-provider-sso/dist-es/resolveSSOCredentials.js +1 -0
  29. package/node_modules/@aws-sdk/credential-provider-sso/package.json +8 -8
  30. package/node_modules/@aws-sdk/credential-provider-web-identity/dist-cjs/fromTokenFile.js +2 -2
  31. package/node_modules/@aws-sdk/credential-provider-web-identity/dist-es/fromTokenFile.js +2 -2
  32. package/node_modules/@aws-sdk/credential-provider-web-identity/dist-types/fromTokenFile.d.ts +2 -3
  33. package/node_modules/@aws-sdk/credential-provider-web-identity/dist-types/ts3.4/fromTokenFile.d.ts +5 -3
  34. package/node_modules/@aws-sdk/credential-provider-web-identity/package.json +7 -7
  35. package/node_modules/@aws-sdk/middleware-host-header/package.json +4 -4
  36. package/node_modules/@aws-sdk/middleware-logger/package.json +3 -3
  37. package/node_modules/@aws-sdk/middleware-recursion-detection/package.json +5 -5
  38. package/node_modules/@aws-sdk/middleware-user-agent/dist-cjs/index.js +3 -3
  39. package/node_modules/@aws-sdk/middleware-user-agent/dist-es/constants.js +2 -2
  40. package/node_modules/@aws-sdk/middleware-user-agent/dist-es/user-agent-middleware.js +1 -1
  41. package/node_modules/@aws-sdk/middleware-user-agent/package.json +7 -7
  42. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso-oidc/endpoint/ruleset.js +1 -1
  43. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sts/endpoint/ruleset.js +1 -1
  44. package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sts/index.js +17 -8
  45. package/node_modules/@aws-sdk/nested-clients/dist-es/submodules/sso-oidc/endpoint/ruleset.js +1 -1
  46. package/node_modules/@aws-sdk/nested-clients/dist-es/submodules/sts/defaultStsRoleAssumers.js +17 -8
  47. package/node_modules/@aws-sdk/nested-clients/dist-es/submodules/sts/endpoint/ruleset.js +1 -1
  48. package/node_modules/@aws-sdk/nested-clients/dist-types/submodules/sts/defaultStsRoleAssumers.d.ts +1 -1
  49. package/node_modules/@aws-sdk/nested-clients/dist-types/ts3.4/submodules/sts/defaultStsRoleAssumers.d.ts +1 -1
  50. package/node_modules/@aws-sdk/nested-clients/package.json +32 -32
  51. package/node_modules/@aws-sdk/region-config-resolver/dist-cjs/index.js +7 -0
  52. package/node_modules/@aws-sdk/region-config-resolver/dist-cjs/regionConfig/stsRegionDefaultResolver.js +20 -0
  53. package/node_modules/@aws-sdk/region-config-resolver/dist-cjs/regionConfig/stsRegionDefaultResolver.native.js +6 -0
  54. package/node_modules/@aws-sdk/region-config-resolver/dist-es/index.js +1 -0
  55. package/node_modules/@aws-sdk/region-config-resolver/dist-es/regionConfig/stsRegionDefaultResolver.browser.js +3 -0
  56. package/node_modules/@aws-sdk/region-config-resolver/dist-es/regionConfig/stsRegionDefaultResolver.js +16 -0
  57. package/node_modules/@aws-sdk/region-config-resolver/dist-es/regionConfig/stsRegionDefaultResolver.native.js +3 -0
  58. package/node_modules/@aws-sdk/region-config-resolver/dist-types/index.d.ts +1 -0
  59. package/node_modules/@aws-sdk/region-config-resolver/dist-types/regionConfig/stsRegionDefaultResolver.browser.d.ts +4 -0
  60. package/node_modules/@aws-sdk/region-config-resolver/dist-types/regionConfig/stsRegionDefaultResolver.d.ts +14 -0
  61. package/node_modules/@aws-sdk/region-config-resolver/dist-types/regionConfig/stsRegionDefaultResolver.native.d.ts +4 -0
  62. package/node_modules/@aws-sdk/region-config-resolver/dist-types/ts3.4/index.d.ts +1 -0
  63. package/node_modules/@aws-sdk/region-config-resolver/dist-types/ts3.4/regionConfig/stsRegionDefaultResolver.browser.d.ts +1 -0
  64. package/node_modules/@aws-sdk/region-config-resolver/dist-types/ts3.4/regionConfig/stsRegionDefaultResolver.d.ts +7 -0
  65. package/node_modules/@aws-sdk/region-config-resolver/dist-types/ts3.4/regionConfig/stsRegionDefaultResolver.native.d.ts +1 -0
  66. package/node_modules/@aws-sdk/region-config-resolver/package.json +10 -5
  67. package/node_modules/@aws-sdk/token-providers/dist-cjs/index.js +3 -1
  68. package/node_modules/@aws-sdk/token-providers/dist-es/getSsoOidcClient.js +3 -1
  69. package/node_modules/@aws-sdk/token-providers/package.json +7 -7
  70. package/node_modules/@aws-sdk/types/dist-types/credentials.d.ts +2 -0
  71. package/node_modules/@aws-sdk/types/dist-types/identity/AwsCredentialIdentity.d.ts +1 -0
  72. package/node_modules/@aws-sdk/types/dist-types/ts3.4/credentials.d.ts +2 -0
  73. package/node_modules/@aws-sdk/types/dist-types/ts3.4/identity/AwsCredentialIdentity.d.ts +1 -0
  74. package/node_modules/@aws-sdk/types/package.json +2 -2
  75. package/node_modules/@aws-sdk/util-endpoints/package.json +5 -5
  76. package/node_modules/@aws-sdk/util-user-agent-browser/package.json +3 -3
  77. package/node_modules/@aws-sdk/util-user-agent-node/package.json +5 -5
  78. package/node_modules/@aws-sdk/xml-builder/package.json +2 -2
  79. package/node_modules/@smithy/abort-controller/package.json +2 -2
  80. package/node_modules/@smithy/config-resolver/package.json +5 -5
  81. package/node_modules/@smithy/core/dist-cjs/submodules/serde/index.js +5 -14
  82. package/node_modules/@smithy/core/dist-es/submodules/serde/schema-serde-lib/schema-date-utils.js +5 -14
  83. package/node_modules/@smithy/core/package.json +7 -7
  84. package/node_modules/@smithy/credential-provider-imds/package.json +5 -5
  85. package/node_modules/@smithy/fetch-http-handler/package.json +5 -5
  86. package/node_modules/@smithy/hash-node/package.json +2 -2
  87. package/node_modules/@smithy/invalid-dependency/package.json +2 -2
  88. package/node_modules/@smithy/middleware-content-length/package.json +3 -3
  89. package/node_modules/@smithy/middleware-endpoint/package.json +8 -8
  90. package/node_modules/@smithy/middleware-retry/package.json +8 -8
  91. package/node_modules/@smithy/middleware-serde/package.json +3 -3
  92. package/node_modules/@smithy/middleware-stack/package.json +2 -2
  93. package/node_modules/@smithy/node-config-provider/package.json +4 -4
  94. package/node_modules/@smithy/node-http-handler/dist-cjs/index.js +7 -4
  95. package/node_modules/@smithy/node-http-handler/dist-es/node-http-handler.js +5 -2
  96. package/node_modules/@smithy/node-http-handler/dist-es/write-request-body.js +2 -2
  97. package/node_modules/@smithy/node-http-handler/dist-types/node-http-handler.d.ts +2 -2
  98. package/node_modules/@smithy/node-http-handler/dist-types/ts3.4/node-http-handler.d.ts +2 -2
  99. package/node_modules/@smithy/node-http-handler/dist-types/ts3.4/write-request-body.d.ts +2 -1
  100. package/node_modules/@smithy/node-http-handler/dist-types/write-request-body.d.ts +2 -1
  101. package/node_modules/@smithy/node-http-handler/package.json +5 -5
  102. package/node_modules/@smithy/property-provider/package.json +2 -2
  103. package/node_modules/@smithy/protocol-http/package.json +2 -2
  104. package/node_modules/@smithy/querystring-builder/package.json +2 -2
  105. package/node_modules/@smithy/querystring-parser/package.json +2 -2
  106. package/node_modules/@smithy/service-error-classification/package.json +2 -2
  107. package/node_modules/@smithy/shared-ini-file-loader/package.json +2 -2
  108. package/node_modules/@smithy/signature-v4/package.json +4 -4
  109. package/node_modules/@smithy/smithy-client/package.json +7 -7
  110. package/node_modules/@smithy/types/dist-es/index.js +1 -0
  111. package/node_modules/@smithy/types/dist-types/index.d.ts +1 -0
  112. package/node_modules/@smithy/types/dist-types/ts3.4/index.d.ts +1 -0
  113. package/node_modules/@smithy/types/package.json +1 -1
  114. package/node_modules/@smithy/url-parser/package.json +3 -3
  115. package/node_modules/@smithy/util-defaults-mode-browser/package.json +4 -4
  116. package/node_modules/@smithy/util-defaults-mode-node/package.json +7 -7
  117. package/node_modules/@smithy/util-endpoints/package.json +3 -3
  118. package/node_modules/@smithy/util-middleware/package.json +2 -2
  119. package/node_modules/@smithy/util-retry/package.json +3 -3
  120. package/node_modules/@smithy/util-stream/package.json +4 -4
  121. package/node_modules/@smithy/util-waiter/dist-cjs/index.js +17 -4
  122. package/node_modules/@smithy/util-waiter/dist-es/circularReplacer.js +12 -0
  123. package/node_modules/@smithy/util-waiter/dist-es/poller.js +2 -1
  124. package/node_modules/@smithy/util-waiter/dist-es/waiter.js +4 -3
  125. package/node_modules/@smithy/util-waiter/dist-types/circularReplacer.d.ts +6 -0
  126. package/node_modules/@smithy/util-waiter/dist-types/poller.d.ts +1 -1
  127. package/node_modules/@smithy/util-waiter/dist-types/ts3.4/circularReplacer.d.ts +6 -0
  128. package/node_modules/@smithy/util-waiter/dist-types/ts3.4/poller.d.ts +1 -1
  129. package/node_modules/@smithy/util-waiter/package.json +3 -3
  130. package/package.json +8 -8
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/credential-provider-ini",
3
- "version": "3.916.0",
3
+ "version": "3.922.0",
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",
@@ -28,18 +28,18 @@
28
28
  },
29
29
  "license": "Apache-2.0",
30
30
  "dependencies": {
31
- "@aws-sdk/core": "3.916.0",
32
- "@aws-sdk/credential-provider-env": "3.916.0",
33
- "@aws-sdk/credential-provider-http": "3.916.0",
34
- "@aws-sdk/credential-provider-process": "3.916.0",
35
- "@aws-sdk/credential-provider-sso": "3.916.0",
36
- "@aws-sdk/credential-provider-web-identity": "3.916.0",
37
- "@aws-sdk/nested-clients": "3.916.0",
38
- "@aws-sdk/types": "3.914.0",
39
- "@smithy/credential-provider-imds": "^4.2.3",
40
- "@smithy/property-provider": "^4.2.3",
41
- "@smithy/shared-ini-file-loader": "^4.3.3",
42
- "@smithy/types": "^4.8.0",
31
+ "@aws-sdk/core": "3.922.0",
32
+ "@aws-sdk/credential-provider-env": "3.922.0",
33
+ "@aws-sdk/credential-provider-http": "3.922.0",
34
+ "@aws-sdk/credential-provider-process": "3.922.0",
35
+ "@aws-sdk/credential-provider-sso": "3.922.0",
36
+ "@aws-sdk/credential-provider-web-identity": "3.922.0",
37
+ "@aws-sdk/nested-clients": "3.922.0",
38
+ "@aws-sdk/types": "3.922.0",
39
+ "@smithy/credential-provider-imds": "^4.2.4",
40
+ "@smithy/property-provider": "^4.2.4",
41
+ "@smithy/shared-ini-file-loader": "^4.3.4",
42
+ "@smithy/types": "^4.8.1",
43
43
  "tslib": "^2.6.2"
44
44
  },
45
45
  "devDependencies": {
@@ -21,17 +21,73 @@ const remoteProvider = async (init) => {
21
21
  return fromInstanceMetadata(init);
22
22
  };
23
23
 
24
+ function memoizeChain(providers, treatAsExpired) {
25
+ const chain = internalCreateChain(providers);
26
+ let activeLock;
27
+ let passiveLock;
28
+ let credentials;
29
+ const provider = async (options) => {
30
+ if (options?.forceRefresh) {
31
+ return await chain(options);
32
+ }
33
+ if (credentials?.expiration) {
34
+ if (credentials?.expiration?.getTime() < Date.now()) {
35
+ credentials = undefined;
36
+ }
37
+ }
38
+ if (activeLock) {
39
+ await activeLock;
40
+ }
41
+ else if (!credentials || treatAsExpired?.(credentials)) {
42
+ if (credentials) {
43
+ if (!passiveLock) {
44
+ passiveLock = chain(options).then((c) => {
45
+ credentials = c;
46
+ passiveLock = undefined;
47
+ });
48
+ }
49
+ }
50
+ else {
51
+ activeLock = chain(options).then((c) => {
52
+ credentials = c;
53
+ activeLock = undefined;
54
+ });
55
+ return provider(options);
56
+ }
57
+ }
58
+ return credentials;
59
+ };
60
+ return provider;
61
+ }
62
+ const internalCreateChain = (providers) => async (awsIdentityProperties) => {
63
+ let lastProviderError;
64
+ for (const provider of providers) {
65
+ try {
66
+ return await provider(awsIdentityProperties);
67
+ }
68
+ catch (err) {
69
+ lastProviderError = err;
70
+ if (err?.tryNextLink) {
71
+ continue;
72
+ }
73
+ throw err;
74
+ }
75
+ }
76
+ throw lastProviderError;
77
+ };
78
+
24
79
  let multipleCredentialSourceWarningEmitted = false;
25
- const defaultProvider = (init = {}) => propertyProvider.memoize(propertyProvider.chain(async () => {
26
- const profile = init.profile ?? process.env[sharedIniFileLoader.ENV_PROFILE];
27
- if (profile) {
28
- const envStaticCredentialsAreSet = process.env[credentialProviderEnv.ENV_KEY] && process.env[credentialProviderEnv.ENV_SECRET];
29
- if (envStaticCredentialsAreSet) {
30
- if (!multipleCredentialSourceWarningEmitted) {
31
- const warnFn = init.logger?.warn && init.logger?.constructor?.name !== "NoOpLogger"
32
- ? init.logger.warn.bind(init.logger)
33
- : console.warn;
34
- warnFn(`@aws-sdk/credential-provider-node - defaultProvider::fromEnv WARNING:
80
+ const defaultProvider = (init = {}) => memoizeChain([
81
+ async () => {
82
+ const profile = init.profile ?? process.env[sharedIniFileLoader.ENV_PROFILE];
83
+ if (profile) {
84
+ const envStaticCredentialsAreSet = process.env[credentialProviderEnv.ENV_KEY] && process.env[credentialProviderEnv.ENV_SECRET];
85
+ if (envStaticCredentialsAreSet) {
86
+ if (!multipleCredentialSourceWarningEmitted) {
87
+ const warnFn = init.logger?.warn && init.logger?.constructor?.name !== "NoOpLogger"
88
+ ? init.logger.warn.bind(init.logger)
89
+ : console.warn;
90
+ warnFn(`@aws-sdk/credential-provider-node - defaultProvider::fromEnv WARNING:
35
91
  Multiple credential sources detected:
36
92
  Both AWS_PROFILE and the pair AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY static credentials are set.
37
93
  This SDK will proceed with the AWS_PROFILE value.
@@ -40,45 +96,52 @@ const defaultProvider = (init = {}) => propertyProvider.memoize(propertyProvider
40
96
  Please ensure that your environment only sets either the AWS_PROFILE or the
41
97
  AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY pair.
42
98
  `);
43
- multipleCredentialSourceWarningEmitted = true;
99
+ multipleCredentialSourceWarningEmitted = true;
100
+ }
44
101
  }
102
+ throw new propertyProvider.CredentialsProviderError("AWS_PROFILE is set, skipping fromEnv provider.", {
103
+ logger: init.logger,
104
+ tryNextLink: true,
105
+ });
106
+ }
107
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromEnv");
108
+ return credentialProviderEnv.fromEnv(init)();
109
+ },
110
+ async (awsIdentityProperties) => {
111
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromSSO");
112
+ const { ssoStartUrl, ssoAccountId, ssoRegion, ssoRoleName, ssoSession } = init;
113
+ if (!ssoStartUrl && !ssoAccountId && !ssoRegion && !ssoRoleName && !ssoSession) {
114
+ throw new propertyProvider.CredentialsProviderError("Skipping SSO provider in default chain (inputs do not include SSO fields).", { logger: init.logger });
45
115
  }
46
- throw new propertyProvider.CredentialsProviderError("AWS_PROFILE is set, skipping fromEnv provider.", {
116
+ const { fromSSO } = await import('@aws-sdk/credential-provider-sso');
117
+ return fromSSO(init)(awsIdentityProperties);
118
+ },
119
+ async (awsIdentityProperties) => {
120
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromIni");
121
+ const { fromIni } = await import('@aws-sdk/credential-provider-ini');
122
+ return fromIni(init)(awsIdentityProperties);
123
+ },
124
+ async (awsIdentityProperties) => {
125
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromProcess");
126
+ const { fromProcess } = await import('@aws-sdk/credential-provider-process');
127
+ return fromProcess(init)(awsIdentityProperties);
128
+ },
129
+ async (awsIdentityProperties) => {
130
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromTokenFile");
131
+ const { fromTokenFile } = await import('@aws-sdk/credential-provider-web-identity');
132
+ return fromTokenFile(init)(awsIdentityProperties);
133
+ },
134
+ async () => {
135
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::remoteProvider");
136
+ return (await remoteProvider(init))();
137
+ },
138
+ async () => {
139
+ throw new propertyProvider.CredentialsProviderError("Could not load credentials from any providers", {
140
+ tryNextLink: false,
47
141
  logger: init.logger,
48
- tryNextLink: true,
49
142
  });
50
- }
51
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromEnv");
52
- return credentialProviderEnv.fromEnv(init)();
53
- }, async () => {
54
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromSSO");
55
- const { ssoStartUrl, ssoAccountId, ssoRegion, ssoRoleName, ssoSession } = init;
56
- if (!ssoStartUrl && !ssoAccountId && !ssoRegion && !ssoRoleName && !ssoSession) {
57
- throw new propertyProvider.CredentialsProviderError("Skipping SSO provider in default chain (inputs do not include SSO fields).", { logger: init.logger });
58
- }
59
- const { fromSSO } = await import('@aws-sdk/credential-provider-sso');
60
- return fromSSO(init)();
61
- }, async () => {
62
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromIni");
63
- const { fromIni } = await import('@aws-sdk/credential-provider-ini');
64
- return fromIni(init)();
65
- }, async () => {
66
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromProcess");
67
- const { fromProcess } = await import('@aws-sdk/credential-provider-process');
68
- return fromProcess(init)();
69
- }, async () => {
70
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromTokenFile");
71
- const { fromTokenFile } = await import('@aws-sdk/credential-provider-web-identity');
72
- return fromTokenFile(init)();
73
- }, async () => {
74
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::remoteProvider");
75
- return (await remoteProvider(init))();
76
- }, async () => {
77
- throw new propertyProvider.CredentialsProviderError("Could not load credentials from any providers", {
78
- tryNextLink: false,
79
- logger: init.logger,
80
- });
81
- }), credentialsTreatedAsExpired, credentialsWillNeedRefresh);
143
+ },
144
+ ], credentialsTreatedAsExpired);
82
145
  const credentialsWillNeedRefresh = (credentials) => credentials?.expiration !== undefined;
83
146
  const credentialsTreatedAsExpired = (credentials) => credentials?.expiration !== undefined && credentials.expiration.getTime() - Date.now() < 300000;
84
147
 
@@ -1,18 +1,20 @@
1
1
  import { ENV_KEY, ENV_SECRET, fromEnv } from "@aws-sdk/credential-provider-env";
2
- import { chain, CredentialsProviderError, memoize } from "@smithy/property-provider";
2
+ import { CredentialsProviderError } from "@smithy/property-provider";
3
3
  import { ENV_PROFILE } from "@smithy/shared-ini-file-loader";
4
4
  import { remoteProvider } from "./remoteProvider";
5
+ import { memoizeChain } from "./runtime/memoize-chain";
5
6
  let multipleCredentialSourceWarningEmitted = false;
6
- export const defaultProvider = (init = {}) => memoize(chain(async () => {
7
- const profile = init.profile ?? process.env[ENV_PROFILE];
8
- if (profile) {
9
- const envStaticCredentialsAreSet = process.env[ENV_KEY] && process.env[ENV_SECRET];
10
- if (envStaticCredentialsAreSet) {
11
- if (!multipleCredentialSourceWarningEmitted) {
12
- const warnFn = init.logger?.warn && init.logger?.constructor?.name !== "NoOpLogger"
13
- ? init.logger.warn.bind(init.logger)
14
- : console.warn;
15
- warnFn(`@aws-sdk/credential-provider-node - defaultProvider::fromEnv WARNING:
7
+ export const defaultProvider = (init = {}) => memoizeChain([
8
+ async () => {
9
+ const profile = init.profile ?? process.env[ENV_PROFILE];
10
+ if (profile) {
11
+ const envStaticCredentialsAreSet = process.env[ENV_KEY] && process.env[ENV_SECRET];
12
+ if (envStaticCredentialsAreSet) {
13
+ if (!multipleCredentialSourceWarningEmitted) {
14
+ const warnFn = init.logger?.warn && init.logger?.constructor?.name !== "NoOpLogger"
15
+ ? init.logger.warn.bind(init.logger)
16
+ : console.warn;
17
+ warnFn(`@aws-sdk/credential-provider-node - defaultProvider::fromEnv WARNING:
16
18
  Multiple credential sources detected:
17
19
  Both AWS_PROFILE and the pair AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY static credentials are set.
18
20
  This SDK will proceed with the AWS_PROFILE value.
@@ -21,44 +23,51 @@ export const defaultProvider = (init = {}) => memoize(chain(async () => {
21
23
  Please ensure that your environment only sets either the AWS_PROFILE or the
22
24
  AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY pair.
23
25
  `);
24
- multipleCredentialSourceWarningEmitted = true;
26
+ multipleCredentialSourceWarningEmitted = true;
27
+ }
25
28
  }
29
+ throw new CredentialsProviderError("AWS_PROFILE is set, skipping fromEnv provider.", {
30
+ logger: init.logger,
31
+ tryNextLink: true,
32
+ });
26
33
  }
27
- throw new CredentialsProviderError("AWS_PROFILE is set, skipping fromEnv provider.", {
34
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromEnv");
35
+ return fromEnv(init)();
36
+ },
37
+ async (awsIdentityProperties) => {
38
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromSSO");
39
+ const { ssoStartUrl, ssoAccountId, ssoRegion, ssoRoleName, ssoSession } = init;
40
+ if (!ssoStartUrl && !ssoAccountId && !ssoRegion && !ssoRoleName && !ssoSession) {
41
+ throw new CredentialsProviderError("Skipping SSO provider in default chain (inputs do not include SSO fields).", { logger: init.logger });
42
+ }
43
+ const { fromSSO } = await import("@aws-sdk/credential-provider-sso");
44
+ return fromSSO(init)(awsIdentityProperties);
45
+ },
46
+ async (awsIdentityProperties) => {
47
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromIni");
48
+ const { fromIni } = await import("@aws-sdk/credential-provider-ini");
49
+ return fromIni(init)(awsIdentityProperties);
50
+ },
51
+ async (awsIdentityProperties) => {
52
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromProcess");
53
+ const { fromProcess } = await import("@aws-sdk/credential-provider-process");
54
+ return fromProcess(init)(awsIdentityProperties);
55
+ },
56
+ async (awsIdentityProperties) => {
57
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromTokenFile");
58
+ const { fromTokenFile } = await import("@aws-sdk/credential-provider-web-identity");
59
+ return fromTokenFile(init)(awsIdentityProperties);
60
+ },
61
+ async () => {
62
+ init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::remoteProvider");
63
+ return (await remoteProvider(init))();
64
+ },
65
+ async () => {
66
+ throw new CredentialsProviderError("Could not load credentials from any providers", {
67
+ tryNextLink: false,
28
68
  logger: init.logger,
29
- tryNextLink: true,
30
69
  });
31
- }
32
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromEnv");
33
- return fromEnv(init)();
34
- }, async () => {
35
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromSSO");
36
- const { ssoStartUrl, ssoAccountId, ssoRegion, ssoRoleName, ssoSession } = init;
37
- if (!ssoStartUrl && !ssoAccountId && !ssoRegion && !ssoRoleName && !ssoSession) {
38
- throw new CredentialsProviderError("Skipping SSO provider in default chain (inputs do not include SSO fields).", { logger: init.logger });
39
- }
40
- const { fromSSO } = await import("@aws-sdk/credential-provider-sso");
41
- return fromSSO(init)();
42
- }, async () => {
43
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromIni");
44
- const { fromIni } = await import("@aws-sdk/credential-provider-ini");
45
- return fromIni(init)();
46
- }, async () => {
47
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromProcess");
48
- const { fromProcess } = await import("@aws-sdk/credential-provider-process");
49
- return fromProcess(init)();
50
- }, async () => {
51
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::fromTokenFile");
52
- const { fromTokenFile } = await import("@aws-sdk/credential-provider-web-identity");
53
- return fromTokenFile(init)();
54
- }, async () => {
55
- init.logger?.debug("@aws-sdk/credential-provider-node - defaultProvider::remoteProvider");
56
- return (await remoteProvider(init))();
57
- }, async () => {
58
- throw new CredentialsProviderError("Could not load credentials from any providers", {
59
- tryNextLink: false,
60
- logger: init.logger,
61
- });
62
- }), credentialsTreatedAsExpired, credentialsWillNeedRefresh);
70
+ },
71
+ ], credentialsTreatedAsExpired);
63
72
  export const credentialsWillNeedRefresh = (credentials) => credentials?.expiration !== undefined;
64
73
  export const credentialsTreatedAsExpired = (credentials) => credentials?.expiration !== undefined && credentials.expiration.getTime() - Date.now() < 300000;
@@ -0,0 +1,54 @@
1
+ export function memoizeChain(providers, treatAsExpired) {
2
+ const chain = internalCreateChain(providers);
3
+ let activeLock;
4
+ let passiveLock;
5
+ let credentials;
6
+ const provider = async (options) => {
7
+ if (options?.forceRefresh) {
8
+ return await chain(options);
9
+ }
10
+ if (credentials?.expiration) {
11
+ if (credentials?.expiration?.getTime() < Date.now()) {
12
+ credentials = undefined;
13
+ }
14
+ }
15
+ if (activeLock) {
16
+ await activeLock;
17
+ }
18
+ else if (!credentials || treatAsExpired?.(credentials)) {
19
+ if (credentials) {
20
+ if (!passiveLock) {
21
+ passiveLock = chain(options).then((c) => {
22
+ credentials = c;
23
+ passiveLock = undefined;
24
+ });
25
+ }
26
+ }
27
+ else {
28
+ activeLock = chain(options).then((c) => {
29
+ credentials = c;
30
+ activeLock = undefined;
31
+ });
32
+ return provider(options);
33
+ }
34
+ }
35
+ return credentials;
36
+ };
37
+ return provider;
38
+ }
39
+ export const internalCreateChain = (providers) => async (awsIdentityProperties) => {
40
+ let lastProviderError;
41
+ for (const provider of providers) {
42
+ try {
43
+ return await provider(awsIdentityProperties);
44
+ }
45
+ catch (err) {
46
+ lastProviderError = err;
47
+ if (err?.tryNextLink) {
48
+ continue;
49
+ }
50
+ throw err;
51
+ }
52
+ }
53
+ throw lastProviderError;
54
+ };
@@ -4,7 +4,8 @@ import type { FromProcessInit } from "@aws-sdk/credential-provider-process";
4
4
  import type { FromSSOInit, SsoCredentialsParameters } from "@aws-sdk/credential-provider-sso";
5
5
  import type { FromTokenFileInit } from "@aws-sdk/credential-provider-web-identity";
6
6
  import type { RemoteProviderInit } from "@smithy/credential-provider-imds";
7
- import { AwsCredentialIdentity, MemoizedProvider } from "@smithy/types";
7
+ import type { AwsCredentialIdentity } from "@smithy/types";
8
+ import { type MemoizedRuntimeConfigAwsCredentialIdentityProvider } from "./runtime/memoize-chain";
8
9
  /**
9
10
  * @public
10
11
  */
@@ -43,7 +44,7 @@ export type DefaultProviderInit = FromIniInit & FromHttpOptions & RemoteProvider
43
44
  * @see {@link fromContainerMetadata} The function used to source credentials from the
44
45
  * ECS Container Metadata Service.
45
46
  */
46
- export declare const defaultProvider: (init?: DefaultProviderInit) => MemoizedProvider<AwsCredentialIdentity>;
47
+ export declare const defaultProvider: (init?: DefaultProviderInit) => MemoizedRuntimeConfigAwsCredentialIdentityProvider;
47
48
  /**
48
49
  * @internal
49
50
  *
@@ -0,0 +1,18 @@
1
+ import type { AwsCredentialIdentity, AwsIdentityProperties, RuntimeConfigAwsCredentialIdentityProvider } from "@aws-sdk/types";
2
+ /**
3
+ * Memoized provider chain for AWS credentials.
4
+ * The options are only reevaluated if forceRefresh=true is passed or a natural
5
+ * refresh occurs.
6
+ *
7
+ * @public
8
+ */
9
+ export interface MemoizedRuntimeConfigAwsCredentialIdentityProvider {
10
+ (options?: AwsIdentityProperties & {
11
+ forceRefresh?: boolean;
12
+ }): Promise<AwsCredentialIdentity>;
13
+ }
14
+ /**
15
+ * @internal
16
+ */
17
+ export declare function memoizeChain(providers: RuntimeConfigAwsCredentialIdentityProvider[], treatAsExpired: (resolved: AwsCredentialIdentity) => boolean): MemoizedRuntimeConfigAwsCredentialIdentityProvider;
18
+ export declare const internalCreateChain: (providers: RuntimeConfigAwsCredentialIdentityProvider[]) => RuntimeConfigAwsCredentialIdentityProvider;
@@ -7,7 +7,8 @@ import {
7
7
  } from "@aws-sdk/credential-provider-sso";
8
8
  import { FromTokenFileInit } from "@aws-sdk/credential-provider-web-identity";
9
9
  import { RemoteProviderInit } from "@smithy/credential-provider-imds";
10
- import { AwsCredentialIdentity, MemoizedProvider } from "@smithy/types";
10
+ import { AwsCredentialIdentity } from "@smithy/types";
11
+ import { MemoizedRuntimeConfigAwsCredentialIdentityProvider } from "./runtime/memoize-chain";
11
12
  export type DefaultProviderInit = FromIniInit &
12
13
  FromHttpOptions &
13
14
  RemoteProviderInit &
@@ -16,7 +17,7 @@ export type DefaultProviderInit = FromIniInit &
16
17
  FromTokenFileInit;
17
18
  export declare const defaultProvider: (
18
19
  init?: DefaultProviderInit
19
- ) => MemoizedProvider<AwsCredentialIdentity>;
20
+ ) => MemoizedRuntimeConfigAwsCredentialIdentityProvider;
20
21
  export declare const credentialsWillNeedRefresh: (
21
22
  credentials: AwsCredentialIdentity
22
23
  ) => boolean;
@@ -0,0 +1,19 @@
1
+ import {
2
+ AwsCredentialIdentity,
3
+ AwsIdentityProperties,
4
+ RuntimeConfigAwsCredentialIdentityProvider,
5
+ } from "@aws-sdk/types";
6
+ export interface MemoizedRuntimeConfigAwsCredentialIdentityProvider {
7
+ (
8
+ options?: AwsIdentityProperties & {
9
+ forceRefresh?: boolean;
10
+ }
11
+ ): Promise<AwsCredentialIdentity>;
12
+ }
13
+ export declare function memoizeChain(
14
+ providers: RuntimeConfigAwsCredentialIdentityProvider[],
15
+ treatAsExpired: (resolved: AwsCredentialIdentity) => boolean
16
+ ): MemoizedRuntimeConfigAwsCredentialIdentityProvider;
17
+ export declare const internalCreateChain: (
18
+ providers: RuntimeConfigAwsCredentialIdentityProvider[]
19
+ ) => RuntimeConfigAwsCredentialIdentityProvider;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/credential-provider-node",
3
- "version": "3.916.0",
3
+ "version": "3.922.0",
4
4
  "description": "AWS credential provider that sources credentials from a Node.JS environment. ",
5
5
  "engines": {
6
6
  "node": ">=18.0.0"
@@ -15,7 +15,7 @@
15
15
  "build:types": "tsc -p tsconfig.types.json",
16
16
  "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
17
17
  "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
18
- "test": "yarn g:vitest run",
18
+ "test": "yarn g:vitest run --reporter verbose",
19
19
  "test:watch": "yarn g:vitest watch",
20
20
  "test:integration": "yarn g:vitest run -c vitest.config.integ.mts",
21
21
  "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
@@ -31,17 +31,17 @@
31
31
  },
32
32
  "license": "Apache-2.0",
33
33
  "dependencies": {
34
- "@aws-sdk/credential-provider-env": "3.916.0",
35
- "@aws-sdk/credential-provider-http": "3.916.0",
36
- "@aws-sdk/credential-provider-ini": "3.916.0",
37
- "@aws-sdk/credential-provider-process": "3.916.0",
38
- "@aws-sdk/credential-provider-sso": "3.916.0",
39
- "@aws-sdk/credential-provider-web-identity": "3.916.0",
40
- "@aws-sdk/types": "3.914.0",
41
- "@smithy/credential-provider-imds": "^4.2.3",
42
- "@smithy/property-provider": "^4.2.3",
43
- "@smithy/shared-ini-file-loader": "^4.3.3",
44
- "@smithy/types": "^4.8.0",
34
+ "@aws-sdk/credential-provider-env": "3.922.0",
35
+ "@aws-sdk/credential-provider-http": "3.922.0",
36
+ "@aws-sdk/credential-provider-ini": "3.922.0",
37
+ "@aws-sdk/credential-provider-process": "3.922.0",
38
+ "@aws-sdk/credential-provider-sso": "3.922.0",
39
+ "@aws-sdk/credential-provider-web-identity": "3.922.0",
40
+ "@aws-sdk/types": "3.922.0",
41
+ "@smithy/credential-provider-imds": "^4.2.4",
42
+ "@smithy/property-provider": "^4.2.4",
43
+ "@smithy/shared-ini-file-loader": "^4.3.4",
44
+ "@smithy/types": "^4.8.1",
45
45
  "tslib": "^2.6.2"
46
46
  },
47
47
  "devDependencies": {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/credential-provider-process",
3
- "version": "3.916.0",
3
+ "version": "3.922.0",
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",
@@ -26,11 +26,11 @@
26
26
  },
27
27
  "license": "Apache-2.0",
28
28
  "dependencies": {
29
- "@aws-sdk/core": "3.916.0",
30
- "@aws-sdk/types": "3.914.0",
31
- "@smithy/property-provider": "^4.2.3",
32
- "@smithy/shared-ini-file-loader": "^4.3.3",
33
- "@smithy/types": "^4.8.0",
29
+ "@aws-sdk/core": "3.922.0",
30
+ "@aws-sdk/types": "3.922.0",
31
+ "@smithy/property-provider": "^4.2.4",
32
+ "@smithy/shared-ini-file-loader": "^4.3.4",
33
+ "@smithy/types": "^4.8.1",
34
34
  "tslib": "^2.6.2"
35
35
  },
36
36
  "devDependencies": {
@@ -59,6 +59,7 @@ const resolveSSOCredentials = async ({ ssoStartUrl, ssoSession, ssoAccountId, ss
59
59
  new SSOClient(Object.assign({}, clientConfig ?? {}, {
60
60
  logger: clientConfig?.logger ?? parentClientConfig?.logger,
61
61
  region: clientConfig?.region ?? ssoRegion,
62
+ userAgentAppId: clientConfig?.userAgentAppId ?? parentClientConfig?.userAgentAppId,
62
63
  }));
63
64
  let ssoResp;
64
65
  try {
@@ -49,6 +49,7 @@ export const resolveSSOCredentials = async ({ ssoStartUrl, ssoSession, ssoAccoun
49
49
  new SSOClient(Object.assign({}, clientConfig ?? {}, {
50
50
  logger: clientConfig?.logger ?? parentClientConfig?.logger,
51
51
  region: clientConfig?.region ?? ssoRegion,
52
+ userAgentAppId: clientConfig?.userAgentAppId ?? parentClientConfig?.userAgentAppId,
52
53
  }));
53
54
  let ssoResp;
54
55
  try {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-sdk/credential-provider-sso",
3
- "version": "3.916.0",
3
+ "version": "3.922.0",
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",
@@ -26,13 +26,13 @@
26
26
  },
27
27
  "license": "Apache-2.0",
28
28
  "dependencies": {
29
- "@aws-sdk/client-sso": "3.916.0",
30
- "@aws-sdk/core": "3.916.0",
31
- "@aws-sdk/token-providers": "3.916.0",
32
- "@aws-sdk/types": "3.914.0",
33
- "@smithy/property-provider": "^4.2.3",
34
- "@smithy/shared-ini-file-loader": "^4.3.3",
35
- "@smithy/types": "^4.8.0",
29
+ "@aws-sdk/client-sso": "3.922.0",
30
+ "@aws-sdk/core": "3.922.0",
31
+ "@aws-sdk/token-providers": "3.922.0",
32
+ "@aws-sdk/types": "3.922.0",
33
+ "@smithy/property-provider": "^4.2.4",
34
+ "@smithy/shared-ini-file-loader": "^4.3.4",
35
+ "@smithy/types": "^4.8.1",
36
36
  "tslib": "^2.6.2"
37
37
  },
38
38
  "devDependencies": {
@@ -9,7 +9,7 @@ const fromWebToken_1 = require("./fromWebToken");
9
9
  const ENV_TOKEN_FILE = "AWS_WEB_IDENTITY_TOKEN_FILE";
10
10
  const ENV_ROLE_ARN = "AWS_ROLE_ARN";
11
11
  const ENV_ROLE_SESSION_NAME = "AWS_ROLE_SESSION_NAME";
12
- const fromTokenFile = (init = {}) => async () => {
12
+ const fromTokenFile = (init = {}) => async (awsIdentityProperties) => {
13
13
  init.logger?.debug("@aws-sdk/credential-provider-web-identity - fromTokenFile");
14
14
  const webIdentityTokenFile = init?.webIdentityTokenFile ?? process.env[ENV_TOKEN_FILE];
15
15
  const roleArn = init?.roleArn ?? process.env[ENV_ROLE_ARN];
@@ -25,7 +25,7 @@ const fromTokenFile = (init = {}) => async () => {
25
25
  (0, fs_1.readFileSync)(webIdentityTokenFile, { encoding: "ascii" }),
26
26
  roleArn,
27
27
  roleSessionName,
28
- })();
28
+ })(awsIdentityProperties);
29
29
  if (webIdentityTokenFile === process.env[ENV_TOKEN_FILE]) {
30
30
  (0, client_1.setCredentialFeature)(credentials, "CREDENTIALS_ENV_VARS_STS_WEB_ID_TOKEN", "h");
31
31
  }
@@ -6,7 +6,7 @@ import { fromWebToken } from "./fromWebToken";
6
6
  const ENV_TOKEN_FILE = "AWS_WEB_IDENTITY_TOKEN_FILE";
7
7
  const ENV_ROLE_ARN = "AWS_ROLE_ARN";
8
8
  const ENV_ROLE_SESSION_NAME = "AWS_ROLE_SESSION_NAME";
9
- export const fromTokenFile = (init = {}) => async () => {
9
+ export const fromTokenFile = (init = {}) => async (awsIdentityProperties) => {
10
10
  init.logger?.debug("@aws-sdk/credential-provider-web-identity - fromTokenFile");
11
11
  const webIdentityTokenFile = init?.webIdentityTokenFile ?? process.env[ENV_TOKEN_FILE];
12
12
  const roleArn = init?.roleArn ?? process.env[ENV_ROLE_ARN];
@@ -22,7 +22,7 @@ export const fromTokenFile = (init = {}) => async () => {
22
22
  readFileSync(webIdentityTokenFile, { encoding: "ascii" }),
23
23
  roleArn,
24
24
  roleSessionName,
25
- })();
25
+ })(awsIdentityProperties);
26
26
  if (webIdentityTokenFile === process.env[ENV_TOKEN_FILE]) {
27
27
  setCredentialFeature(credentials, "CREDENTIALS_ENV_VARS_STS_WEB_ID_TOKEN", "h");
28
28
  }
@@ -1,5 +1,4 @@
1
- import { CredentialProviderOptions } from "@aws-sdk/types";
2
- import type { AwsCredentialIdentityProvider } from "@smithy/types";
1
+ import type { CredentialProviderOptions, RuntimeConfigAwsCredentialIdentityProvider } from "@aws-sdk/types";
3
2
  import { FromWebTokenInit } from "./fromWebToken";
4
3
  /**
5
4
  * @public
@@ -15,4 +14,4 @@ export interface FromTokenFileInit extends Partial<Omit<FromWebTokenInit, "webId
15
14
  *
16
15
  * Represents OIDC credentials from a file on disk.
17
16
  */
18
- export declare const fromTokenFile: (init?: FromTokenFileInit) => AwsCredentialIdentityProvider;
17
+ export declare const fromTokenFile: (init?: FromTokenFileInit) => RuntimeConfigAwsCredentialIdentityProvider;