Skip to content

Proposal: Respect AWS_REGION Environment Variable in STS Region Resolution #7455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Proposal: Respect AWS_REGION Environment Variable in STS Region Resolution #7455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions clients/client-sts/src/defaultStsRoleAssumers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const getAccountIdFromAssumedRoleUser = (assumedRoleUser?: AssumedRoleUser) => {
/**
* @internal
*
* Default to the parent client region or us-east-1 if no region is specified.
* Default to the parent client region, AWS_REGION environment variable, or us-east-1 if no region is specified.
*/
const resolveRegion = async (
_region: string | Provider<string> | undefined,
Expand All @@ -67,15 +67,17 @@ const resolveRegion = async (
): Promise<string> => {
const region: string | undefined = typeof _region === "function" ? await _region() : _region;
const parentRegion: string | undefined = typeof _parentRegion === "function" ? await _parentRegion() : _parentRegion;
const envRegion = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;

credentialProviderLogger?.debug?.(
"@aws-sdk/client-sts::resolveRegion",
"accepting first of:",
`${region} (provider)`,
`${parentRegion} (parent client)`,
`${envRegion} (environment)`,
`${ASSUME_ROLE_DEFAULT_REGION} (STS default)`
);
return region ?? parentRegion ?? ASSUME_ROLE_DEFAULT_REGION;
return region ?? parentRegion ?? envRegion ?? ASSUME_ROLE_DEFAULT_REGION;
};

/**
Expand Down
6 changes: 4 additions & 2 deletions ...ources/software/amazon/smithy/aws/typescript/codegen/sts-client-defaultStsRoleAssumers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const getAccountIdFromAssumedRoleUser = (assumedRoleUser?: AssumedRoleUser) => {
/**
* @internal
*
* Default to the parent client region or us-east-1 if no region is specified.
* Default to the parent client region, AWS_REGION environment variable, or us-east-1 if no region is specified.
*/
const resolveRegion = async (
_region: string | Provider<string> | undefined,
Expand All @@ -64,15 +64,17 @@ const resolveRegion = async (
): Promise<string> => {
const region: string | undefined = typeof _region === "function" ? await _region() : _region;
const parentRegion: string | undefined = typeof _parentRegion === "function" ? await _parentRegion() : _parentRegion;
const envRegion = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;

credentialProviderLogger?.debug?.(
"@aws-sdk/client-sts::resolveRegion",
"accepting first of:",
`${region} (provider)`,
`${parentRegion} (parent client)`,
`${envRegion} (environment)`,
`${ASSUME_ROLE_DEFAULT_REGION} (STS default)`
);
return region ?? parentRegion ?? ASSUME_ROLE_DEFAULT_REGION;
return region ?? parentRegion ?? envRegion ?? ASSUME_ROLE_DEFAULT_REGION;
};

/**
Expand Down
6 changes: 4 additions & 2 deletions packages/nested-clients/src/submodules/sts/defaultStsRoleAssumers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const getAccountIdFromAssumedRoleUser = (assumedRoleUser?: AssumedRoleUser) => {
/**
* @internal
*
* Default to the parent client region or us-east-1 if no region is specified.
* Default to the parent client region, AWS_REGION environment variable, or us-east-1 if no region is specified.
*/
const resolveRegion = async (
_region: string | Provider<string> | undefined,
Expand All @@ -67,15 +67,17 @@ const resolveRegion = async (
): Promise<string> => {
const region: string | undefined = typeof _region === "function" ? await _region() : _region;
const parentRegion: string | undefined = typeof _parentRegion === "function" ? await _parentRegion() : _parentRegion;
const envRegion = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;

credentialProviderLogger?.debug?.(
"@aws-sdk/client-sts::resolveRegion",
"accepting first of:",
`${region} (provider)`,
`${parentRegion} (parent client)`,
`${envRegion} (environment)`,
`${ASSUME_ROLE_DEFAULT_REGION} (STS default)`
);
return region ?? parentRegion ?? ASSUME_ROLE_DEFAULT_REGION;
return region ?? parentRegion ?? envRegion ?? ASSUME_ROLE_DEFAULT_REGION;
};

/**
Expand Down