Skip to content
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

Jump to bottom

fix(cli): region specified in ~/.aws/credentials is ignored #32133

Merged
merged 12 commits into from
Nov 14, 2024
Merged

fix(cli): region specified in ~/.aws/credentials is ignored #32133

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8e68a1f
mid work
iliapolo Nov 14, 2024
32116ba
unit tests
iliapolo Nov 14, 2024
ea4bf96
mid work
iliapolo Nov 14, 2024
125e822
change priorities
iliapolo Nov 14, 2024
4919bf8
mid work
iliapolo Nov 14, 2024
b472ae0
Merge branch 'main' into epolon/cli-region-from-credentials-file
iliapolo Nov 14, 2024
673f5a3
fix(cli): failure to get credentials when session token is not set (#…
otaviomacedo Nov 14, 2024
44bc7b8
fix(cdk): use built-in source map support (#32115)
mrgrain Nov 14, 2024
23ed98a
Merge branch 'main' into epolon/cli-region-from-credentials-file
iliapolo Nov 14, 2024
aa9fb79
fix tests
iliapolo Nov 14, 2024
b3c4571
Merge branch 'main' into epolon/cli-region-from-credentials-file
iliapolo Nov 14, 2024
7663a56
Merge branch 'main' into epolon/cli-region-from-credentials-file
mergify[bot] Nov 14, 2024
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
9 changes: 7 additions & 2 deletions packages/aws-cdk/lib/api/aws-auth/awscli-compatible.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createCredentialChain, fromEnv, fromIni, fromNodeProviderChain } from '
import { MetadataService } from '@aws-sdk/ec2-metadata-service';
import type { NodeHttpHandlerOptions } from '@smithy/node-http-handler';
import { loadSharedConfigFiles } from '@smithy/shared-ini-file-loader';
import { AwsCredentialIdentityProvider, Logger } from '@smithy/types';
import { AwsCredentialIdentityProvider, Logger, ParsedIniData } from '@smithy/types';
import * as promptly from 'promptly';
import type { SdkHttpOptions } from './sdk-provider';
import { readIfPossible } from './util';
Expand Down Expand Up @@ -149,7 +149,12 @@ export class AwsCliCompatible {
*/
async function getRegionFromIni(profile: string): Promise<string | undefined> {
const sharedFiles = await loadSharedConfigFiles({ ignoreCache: true });
return sharedFiles?.configFile?.[profile]?.region || sharedFiles?.configFile?.default?.region;
// https://docs.aws.amazon.com/cli/v1/userguide/cli-configure-files.html
return getRegionFromIniFile(profile, sharedFiles.configFile) ?? getRegionFromIniFile(profile, sharedFiles.credentialsFile);
iliapolo marked this conversation as resolved.
Show resolved Hide resolved
}

function getRegionFromIniFile(profile: string, data?: ParsedIniData) {
return data?.[profile]?.region ?? data?.default?.region;
}

function tryGetCACert(bundlePath?: string) {
Expand Down
Loading