chore(cli): cli arguments with "count: true" are generated as number …

…types (#32758) Our cli config has the following for `verbose`: `type: boolean, count: true`. That should be a `number` type, but it currently is a `boolean` type. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Jan 7, 2025 · ac3ffa5 · ac3ffa5
1 parent db345c5
commit ac3ffa5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/packages/aws-cdk/lib/cli-arguments.ts b/packages/aws-cdk/lib/cli-arguments.ts
@@ -194,7 +194,7 @@ export interface GlobalOptions {
    *
    * @default - false
    */
-  readonly verbose?: boolean;
+  readonly verbose?: number;
 
   /**
    * Debug the CDK app. Log additional information during synthesis, such as creation stack traces of tokens (sets CDK_DEBUG, will slow down synthesis)

diff --git a/tools/@aws-cdk/cli-args-gen/lib/cli-args-gen.ts b/tools/@aws-cdk/cli-args-gen/lib/cli-args-gen.ts
@@ -43,7 +43,7 @@ export async function renderCliArgsType(config: CliConfig): Promise<string> {
   for (const [optionName, option] of Object.entries(config.globalOptions)) {
     globalOptionType.addProperty({
       name: kebabToCamelCase(optionName),
-      type: convertType(option.type),
+      type: convertType(option.type, option.count),
       docs: {
         default: normalizeDefault(option.default, option.type),
         summary: option.desc,
@@ -77,7 +77,7 @@ export async function renderCliArgsType(config: CliConfig): Promise<string> {
     for (const [optionName, option] of Object.entries(command.options ?? {})) {
       commandType.addProperty({
         name: kebabToCamelCase(optionName),
-        type: convertType(option.type),
+        type: convertType(option.type, option.count),
         docs: {
           // Notification Arns is a special property where undefined and [] mean different things
           default: optionName === 'notification-arns' ? 'undefined' : normalizeDefault(option.default, option.type),
@@ -124,10 +124,10 @@ export async function renderCliArgsType(config: CliConfig): Promise<string> {
   });
 }
 
-function convertType(type: 'string' | 'array' | 'number' | 'boolean' | 'count'): Type {
+function convertType(type: 'string' | 'array' | 'number' | 'boolean' | 'count', count?: boolean): Type {
   switch (type) {
     case 'boolean':
-      return Type.BOOLEAN;
+      return count ? Type.NUMBER : Type.BOOLEAN;
     case 'string':
       return Type.STRING;
     case 'number':

diff --git a/tools/@aws-cdk/cli-args-gen/test/cli-args-gen.test.ts b/tools/@aws-cdk/cli-args-gen/test/cli-args-gen.test.ts
@@ -13,6 +13,11 @@ describe('render', () => {
           desc: 'Enable debug logging',
           default: false,
         },
+        verbose: {
+          type: 'boolean',
+          count: true,
+          desc: 'Increase logging verbosity',
+        },
         context: {
           default: [],
           type: 'array',
@@ -88,6 +93,13 @@ describe('render', () => {
          */
         readonly debug?: boolean;
 
+        /**
+         * Increase logging verbosity
+         *
+         * @default - undefined
+         */
+        readonly verbose?: number;
+
         /**
          * context values
          *