refactor code

Author: vivian12300

packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts

@@ -1290,14 +1290,16 @@ export class Toolkit extends CloudAssemblySourceBuilder {
         const properties = report.properties as FeatureFlagReportProperties;
         const moduleName = properties.module;
 
-        return Object.entries(properties.flags).map(([flagName, flagInfo]) => ({
-          module: moduleName,
-          name: flagName,
-          recommendedValue: flagInfo.recommendedValue,
-          userValue: flagInfo.userValue ?? undefined,
-          explanation: flagInfo.explanation ?? '',
-          unconfiguredBehavesLike: flagInfo.unconfiguredBehavesLike,
-        }));
+        return Object.entries(properties.flags).map(([flagName, flagInfo]) => {
+          return {
+            module: moduleName,
+            name: flagName,
+            recommendedValue: isBoolean(flagInfo.recommendedValue) ? toBooleanValue(flagInfo.recommendedValue) : flagInfo.recommendedValue,
+            userValue: isBoolean(flagInfo.userValue) ? toBooleanValue(flagInfo.userValue) : flagInfo.userValue,
+            explanation: flagInfo.explanation ?? '',
+            unconfiguredBehavesLike: flagInfo.unconfiguredBehavesLike,
+          };
+        });
       });
   }
 
@@ -1307,3 +1309,18 @@ export class Toolkit extends CloudAssemblySourceBuilder {
     }
   }
 }
+
+function isBoolean(value: unknown): boolean {
+  return typeof value === 'boolean' || value === 'true' || value === 'false';
+}
+
+function toBooleanValue(value: unknown): boolean {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+  if (typeof value === 'string') {
+    return value.toLowerCase() === 'true';
+  }
+  return false;
+}
+

packages/aws-cdk/lib/cli/cli-config.ts

@@ -126,9 +126,9 @@ export async function makeConfig(): Promise<CliConfig> {
           unconfigured: { type: 'boolean', desc: 'Modify unconfigured feature flags', requiresArg: false },
           recommended: { type: 'boolean', desc: 'Change flags to recommended states', requiresArg: false },
           default: { type: 'boolean', desc: 'Change flags to default state', requiresArg: false },
-          interactive: { type: 'boolean', alias: ['i'], desc: 'Interactive option for the flags command', requiresArg: false },
+          interactive: { type: 'boolean', alias: ['i'], desc: 'Interactive option for the flags command' },
           safe: { type: 'boolean', desc: 'Enable all feature flags that do not impact the user\'s application', requiresArg: false },
-          concurrency: { type: 'number', alias: ['conc'], desc: 'Maximum number of simultaneous synths to execute.', default: 4, requiresArg: true },
+          concurrency: { type: 'number', alias: ['t'], desc: 'Maximum number of simultaneous synths to execute.', default: 4, requiresArg: true },
         },
       },
       'deploy': {

packages/aws-cdk/lib/cli/cli-type-registry.json

@@ -371,8 +371,7 @@
           "alias": [
             "i"
           ],
-          "desc": "Interactive option for the flags command",
-          "requiresArg": false
+          "desc": "Interactive option for the flags command"
         },
         "safe": {
           "type": "boolean",
@@ -382,7 +381,7 @@
         "concurrency": {
           "type": "number",
           "alias": [
-            "conc"
+            "t"
           ],
           "desc": "Maximum number of simultaneous synths to execute.",
           "default": 4,

packages/aws-cdk/lib/cli/cli.ts

@@ -25,7 +25,7 @@ import type { Settings } from '../api/settings';
 import { contextHandler as context } from '../commands/context';
 import { docs } from '../commands/docs';
 import { doctor } from '../commands/doctor';
-import { handleFlags } from '../commands/flag-operations';
+import { DetermineSafeFlags } from '../commands/flag-operations';
 import { cliInit, printAvailableTemplates } from '../commands/init';
 import { getMigrateScanType } from '../commands/migrate';
 import { execProgram, CloudExecutable } from '../cxapp';
@@ -463,7 +463,8 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
           unstableFeatures: configuration.settings.get(['unstable']),
         });
         const flagsData = await toolkit.flags(cloudExecutable);
-        return handleFlags(flagsData, ioHelper, args, toolkit);
+        const handler = new DetermineSafeFlags(flagsData, ioHelper, args, toolkit);
+        return handler.handleFlags();
 
       case 'synthesize':
       case 'synth':

packages/aws-cdk/lib/cli/parse-command-line-arguments.ts

@@ -395,7 +395,6 @@ export function parseCommandLineArguments(args: Array<string>): any {
           type: 'boolean',
           alias: ['i'],
           desc: 'Interactive option for the flags command',
-          requiresArg: false,
         })
         .option('safe', {
           default: undefined,
@@ -406,7 +405,7 @@ export function parseCommandLineArguments(args: Array<string>): any {
         .option('concurrency', {
           default: 4,
           type: 'number',
-          alias: ['conc'],
+          alias: ['t'],
           desc: 'Maximum number of simultaneous synths to execute.',
           requiresArg: true,
         }),

packages/aws-cdk/lib/cli/user-input.ts

@@ -676,7 +676,7 @@ export interface FlagsOptions {
   /**
    * Maximum number of simultaneous synths to execute.
    *
-   * aliases: conc
+   * aliases: t
    *
    * @default - 4
    */