more updates

aws · Jan 13, 2025 · 03fe7d6 · 03fe7d6
1 parent ad76f1f
commit 03fe7d6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/packages/aws-cdk/lib/api/cxapp/cloud-executable.ts b/packages/aws-cdk/lib/api/cxapp/cloud-executable.ts
@@ -41,7 +41,7 @@ export class CloudExecutable {
    * Return whether there is an app command from the configuration
    */
   public get hasApp() {
-    return !!this.props.configuration.settings.get(['app']);
+    return !!this.props.configuration.settings.get(['globalOptions', 'app']);
   }
 
   /**
@@ -106,7 +106,7 @@ export class CloudExecutable {
   }
 
   private get canLookup() {
-    return !!(this.props.configuration.settings.get(['lookups']) ?? true);
+    return !!(this.props.configuration.settings.get(['globalOptions', 'lookups']) ?? true);
   }
 }
 

diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts
@@ -643,7 +643,7 @@ export class CdkToolkit {
     // 2. Any file whose name starts with a dot.
     // 3. Any directory's content whose name starts with a dot.
     // 4. Any node_modules and its content (even if it's not a JS/TS project, you might be using a local aws-cli package)
-    const outputDir = this.props.configuration.settings.get(['output']);
+    const outputDir = this.props.configuration.settings.get(['globalOptions', 'output']);
     const watchExcludes = this.patternsArrayForWatch(watchSettings.exclude, {
       rootDir,
       returnRootDirIfEmpty: false,

diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts
@@ -89,18 +89,18 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
 
   const notices = Notices.create({
     context: configuration.context,
-    output: settings.globalOptions?.output, //  configuration.settings.get(['output']),
-    shouldDisplay: settings.globalOptions?.notices, // configuration.settings.get(['notices']),
+    output: settings.globalOptions?.output,
+    shouldDisplay: settings.globalOptions?.notices,
     includeAcknowledged: cmd === 'notices' ? !settings.notices?.unacknowledged : false,
     httpOptions: {
-      proxyAddress: settings.globalOptions?.proxy, //  configuration.settings.get(['proxy']),
-      caBundlePath: settings.globalOptions?.caBundlePath, // configuration.settings.get(['caBundlePath']),
+      proxyAddress: settings.globalOptions?.proxy,
+      caBundlePath: settings.globalOptions?.caBundlePath,
     },
   });
   await notices.refresh();
 
   const sdkProvider = await SdkProvider.withAwsCliCompatibleDefaults({
-    profile: settings.globalOptions?.profile, // configuration.settings.get(['profile']),
+    profile: settings.globalOptions?.profile,
     httpOptions: {
       proxyAddress: settings.globalOptions?.proxy,
       caBundlePath: settings.globalOptions?.caBundlePath,
@@ -331,23 +331,23 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
           toolkitStackName,
           roleArn: globalOptions.roleArn,
           notificationArns: deployOptions.notificationArns,
-          requireApproval: deployOptions.requireApproval as any, // configuration.settings.get(['requireApproval']),
+          requireApproval: deployOptions.requireApproval as any,
           reuseAssets: deployOptions.buildExclude,
           tags: parseStringTagsListToObject(deployOptions.tags),
           deploymentMethod,
           force: deployOptions.force,
           parameters: parameterMap,
           usePreviousParameters: deployOptions.previousParameters,
-          outputsFile: deployOptions.outputsFile, // configuration.settings.get(['outputsFile']),
-          progress: deployOptions.progress as any, // configuration.settings.get(['progress']),
+          outputsFile: deployOptions.outputsFile,
+          progress: deployOptions.progress as any,
           ci: globalOptions.ci,
-          rollback: deployOptions.rollback, // configuration.settings.get(['rollback']),
+          rollback: deployOptions.rollback,
           hotswap: determineHotswapMode(deployOptions.hotswap, deployOptions.hotswapFallback),
           watch: deployOptions.watch,
           traceLogs: deployOptions.logs,
           concurrency: deployOptions.concurrency,
-          assetParallelism: deployOptions.assetParallelism, // configuration.settings.get(['assetParallelism']),
-          assetBuildTime: deployOptions.assetPrebuild // configuration.settings.get(['assetPrebuild'])
+          assetParallelism: deployOptions.assetParallelism,
+          assetBuildTime: deployOptions.assetPrebuild
             ? AssetBuildTime.ALL_BEFORE_DEPLOY
             : AssetBuildTime.JUST_IN_TIME,
           ignoreNoStacks: deployOptions.ignoreNoStacks,
@@ -376,7 +376,7 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
             changeSetName: importOptions.changeSetName,
           },
           progress: configuration.settings.get(['progress']), // THIS DNE!!!
-          rollback: importOptions.rollback, // configuration.settings.get(['rollback']),
+          rollback: importOptions.rollback,
           recordResourceMapping: importOptions.recordResourceMapping,
           resourceMappingFile: importOptions.resourceMapping,
           force: importOptions.force,
@@ -395,8 +395,8 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
             changeSetName: watchOptions.changeSetName,
           },
           force: watchOptions.force,
-          progress: watchOptions.progress as any, // configuration.settings.get(['progress']),
-          rollback: watchOptions.rollback, // configuration.settings.get(['rollback']),
+          progress: watchOptions.progress as any,
+          rollback: watchOptions.rollback,
           hotswap: determineHotswapMode(watchOptions.hotswap, watchOptions.hotswapFallback, true),
           traceLogs: watchOptions.logs,
           concurrency: watchOptions.concurrency,