Skip to content

Commit 5d79645

Browse files
AllanZhengYPAllanZhengYP
authored
feat: refactor nodejs region loader (#1437)
* feat(config-resolver): update region resolution * chore: update codegen for region resolution * feat(region-provider): deprecate region-provider in favor of node-config-provider * chore: codegen clients without default region provider
1 parent 90c685a commit 5d79645

File tree

913 files changed

+1660
-2912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

913 files changed

+1660
-2912
lines changed

‎clients/client-accessanalyzer/AccessAnalyzerClient.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ export interface ClientDefaults extends Partial<__SmithyResolvedConfiguration<__
186186
credentialDefaultProvider?: (input: any) => __Provider<__Credentials>;
187187

188188
/**
189-
* Provider function that return promise of a region string
189+
* The AWS region to which this client will send requests
190190
*/
191-
regionDefaultProvider?: (input: any) => __Provider<string>;
191+
region?: string | __Provider<string>;
192192

193193
/**
194194
* Provider function that return promise of a maxAttempts string

‎clients/client-accessanalyzer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"@aws-sdk/middleware-signing": "1.0.0-gamma.5",
4141
"@aws-sdk/middleware-stack": "1.0.0-gamma.5",
4242
"@aws-sdk/middleware-user-agent": "1.0.0-gamma.5",
43+
"@aws-sdk/node-config-provider": "1.0.0-gamma.0",
4344
"@aws-sdk/node-http-handler": "1.0.0-gamma.5",
4445
"@aws-sdk/protocol-http": "1.0.0-gamma.5",
45-
"@aws-sdk/region-provider": "1.0.0-gamma.5",
4646
"@aws-sdk/retry-config-provider": "1.0.0-gamma.4",
4747
"@aws-sdk/smithy-client": "1.0.0-gamma.5",
4848
"@aws-sdk/types": "1.0.0-gamma.4",

‎clients/client-accessanalyzer/runtimeConfig.browser.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const ClientDefaultValues: Required<ClientDefaults> = {
1919
credentialDefaultProvider: invalidFunction("Credential is missing") as any,
2020
defaultUserAgent: defaultUserAgent(name, version),
2121
maxAttemptsDefaultProvider: (() => "3") as any,
22-
regionDefaultProvider: invalidFunction("Region is missing") as any,
22+
region: invalidFunction("Region is missing") as any,
2323
requestHandler: new FetchHttpHandler(),
2424
sha256: Sha256,
2525
streamCollector,

‎clients/client-accessanalyzer/runtimeConfig.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { name, version } from "./package.json";
2+
import { NODE_REGION_CONFIG_FILE_OPTIONS, NODE_REGION_CONFIG_OPTIONS } from "@aws-sdk/config-resolver";
23
import { defaultProvider as credentialDefaultProvider } from "@aws-sdk/credential-provider-node";
34
import { Hash } from "@aws-sdk/hash-node";
5+
import { loadConfig as loadNodeConfig } from "@aws-sdk/node-config-provider";
46
import { NodeHttpHandler, streamCollector } from "@aws-sdk/node-http-handler";
5-
import { defaultProvider as regionDefaultProvider } from "@aws-sdk/region-provider";
67
import { maxAttemptsProvider as maxAttemptsDefaultProvider } from "@aws-sdk/retry-config-provider";
78
import { parseUrl } from "@aws-sdk/url-parser-node";
89
import { fromBase64, toBase64 } from "@aws-sdk/util-base64-node";
@@ -21,7 +22,7 @@ export const ClientDefaultValues: Required<ClientDefaults> = {
2122
credentialDefaultProvider,
2223
defaultUserAgent: defaultUserAgent(name, version),
2324
maxAttemptsDefaultProvider,
24-
regionDefaultProvider,
25+
region: loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
2526
requestHandler: new NodeHttpHandler(),
2627
sha256: Hash.bind(null, "sha256"),
2728
streamCollector,

‎clients/client-acm-pca/ACMPCAClient.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ export interface ClientDefaults extends Partial<__SmithyResolvedConfiguration<__
222222
credentialDefaultProvider?: (input: any) => __Provider<__Credentials>;
223223

224224
/**
225-
* Provider function that return promise of a region string
225+
* The AWS region to which this client will send requests
226226
*/
227-
regionDefaultProvider?: (input: any) => __Provider<string>;
227+
region?: string | __Provider<string>;
228228

229229
/**
230230
* Provider function that return promise of a maxAttempts string

‎clients/client-acm-pca/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"@aws-sdk/middleware-signing": "1.0.0-gamma.5",
4141
"@aws-sdk/middleware-stack": "1.0.0-gamma.5",
4242
"@aws-sdk/middleware-user-agent": "1.0.0-gamma.5",
43+
"@aws-sdk/node-config-provider": "1.0.0-gamma.0",
4344
"@aws-sdk/node-http-handler": "1.0.0-gamma.5",
4445
"@aws-sdk/protocol-http": "1.0.0-gamma.5",
45-
"@aws-sdk/region-provider": "1.0.0-gamma.5",
4646
"@aws-sdk/retry-config-provider": "1.0.0-gamma.4",
4747
"@aws-sdk/smithy-client": "1.0.0-gamma.5",
4848
"@aws-sdk/types": "1.0.0-gamma.4",

‎clients/client-acm-pca/runtimeConfig.browser.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const ClientDefaultValues: Required<ClientDefaults> = {
1919
credentialDefaultProvider: invalidFunction("Credential is missing") as any,
2020
defaultUserAgent: defaultUserAgent(name, version),
2121
maxAttemptsDefaultProvider: (() => "3") as any,
22-
regionDefaultProvider: invalidFunction("Region is missing") as any,
22+
region: invalidFunction("Region is missing") as any,
2323
requestHandler: new FetchHttpHandler(),
2424
sha256: Sha256,
2525
streamCollector,

‎clients/client-acm-pca/runtimeConfig.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { name, version } from "./package.json";
2+
import { NODE_REGION_CONFIG_FILE_OPTIONS, NODE_REGION_CONFIG_OPTIONS } from "@aws-sdk/config-resolver";
23
import { defaultProvider as credentialDefaultProvider } from "@aws-sdk/credential-provider-node";
34
import { Hash } from "@aws-sdk/hash-node";
5+
import { loadConfig as loadNodeConfig } from "@aws-sdk/node-config-provider";
46
import { NodeHttpHandler, streamCollector } from "@aws-sdk/node-http-handler";
5-
import { defaultProvider as regionDefaultProvider } from "@aws-sdk/region-provider";
67
import { maxAttemptsProvider as maxAttemptsDefaultProvider } from "@aws-sdk/retry-config-provider";
78
import { parseUrl } from "@aws-sdk/url-parser-node";
89
import { fromBase64, toBase64 } from "@aws-sdk/util-base64-node";
@@ -21,7 +22,7 @@ export const ClientDefaultValues: Required<ClientDefaults> = {
2122
credentialDefaultProvider,
2223
defaultUserAgent: defaultUserAgent(name, version),
2324
maxAttemptsDefaultProvider,
24-
regionDefaultProvider,
25+
region: loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
2526
requestHandler: new NodeHttpHandler(),
2627
sha256: Hash.bind(null, "sha256"),
2728
streamCollector,

‎clients/client-acm/ACMClient.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ export interface ClientDefaults extends Partial<__SmithyResolvedConfiguration<__
180180
credentialDefaultProvider?: (input: any) => __Provider<__Credentials>;
181181

182182
/**
183-
* Provider function that return promise of a region string
183+
* The AWS region to which this client will send requests
184184
*/
185-
regionDefaultProvider?: (input: any) => __Provider<string>;
185+
region?: string | __Provider<string>;
186186

187187
/**
188188
* Provider function that return promise of a maxAttempts string

‎clients/client-acm/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"@aws-sdk/middleware-signing": "1.0.0-gamma.5",
4141
"@aws-sdk/middleware-stack": "1.0.0-gamma.5",
4242
"@aws-sdk/middleware-user-agent": "1.0.0-gamma.5",
43+
"@aws-sdk/node-config-provider": "1.0.0-gamma.0",
4344
"@aws-sdk/node-http-handler": "1.0.0-gamma.5",
4445
"@aws-sdk/protocol-http": "1.0.0-gamma.5",
45-
"@aws-sdk/region-provider": "1.0.0-gamma.5",
4646
"@aws-sdk/retry-config-provider": "1.0.0-gamma.4",
4747
"@aws-sdk/smithy-client": "1.0.0-gamma.5",
4848
"@aws-sdk/types": "1.0.0-gamma.4",

0 commit comments

Comments
 (0)