fix(cli): CLI ignores profile in cdk.json (#7398)

The profile option was not being passed from cdk.json. Get the values from the merged configuration, instead of using the profile argument directly. Closes #3007
aws · Apr 29, 2020 · 6784dc3 · 6784dc3
1 parent bd9b206
commit 6784dc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/aws-cdk/bin/cdk.ts b/packages/aws-cdk/bin/cdk.ts
@@ -111,18 +111,18 @@ async function initCommandLine() {
   debug('CDK toolkit version:', version.DISPLAY_VERSION);
   debug('Command line arguments:', argv);
 
+  const configuration = new Configuration(argv);
+  await configuration.load();
+
   const sdkProvider = await SdkProvider.withAwsCliCompatibleDefaults({
-    profile: argv.profile,
+    profile: configuration.settings.get(['profile']),
     ec2creds: argv.ec2creds,
     httpOptions: {
       proxyAddress: argv.proxy,
       caBundlePath: argv['ca-bundle-path'],
     },
   });
 
-  const configuration = new Configuration(argv);
-  await configuration.load();
-
   const cloudFormation = new CloudFormationDeployments({ sdkProvider });
 
   const cloudExecutable = new CloudExecutable({

diff --git a/packages/aws-cdk/lib/settings.ts b/packages/aws-cdk/lib/settings.ts
@@ -193,6 +193,7 @@ export class Settings {
       language: argv.language,
       pathMetadata: argv.pathMetadata,
       assetMetadata: argv.assetMetadata,
+      profile: argv.profile,
       plugin: argv.plugin,
       requireApproval: argv.requireApproval,
       toolkitStackName: argv.toolkitStackName,