diff --git a/packages/aws-cdk/lib/convert-to-user-input.ts b/packages/aws-cdk/lib/convert-to-user-input.ts index f3ffcd4eee611..4b400aa844424 100644 --- a/packages/aws-cdk/lib/convert-to-user-input.ts +++ b/packages/aws-cdk/lib/convert-to-user-input.ts @@ -251,7 +251,7 @@ export function convertYargsToUserInput(args: any): UserInput { break; } const userInput: UserInput = { - _: args._[0], + command: args._[0], globalOptions, [args._[0]]: commandOptions, }; diff --git a/packages/aws-cdk/lib/user-input.ts b/packages/aws-cdk/lib/user-input.ts index 992202dfaec72..369a7fe325515 100644 --- a/packages/aws-cdk/lib/user-input.ts +++ b/packages/aws-cdk/lib/user-input.ts @@ -14,7 +14,7 @@ export interface UserInput { /** * The CLI command name */ - readonly _?: Command; + readonly command?: Command; /** * Global options available to all CLI commands diff --git a/packages/aws-cdk/test/cli-arguments.test.ts b/packages/aws-cdk/test/cli-arguments.test.ts index ad0bfecd0cf74..4158e6569fa80 100644 --- a/packages/aws-cdk/test/cli-arguments.test.ts +++ b/packages/aws-cdk/test/cli-arguments.test.ts @@ -8,7 +8,7 @@ describe('yargs', () => { const result = convertYargsToUserInput(input); expect(result).toEqual({ - _: 'deploy', + command: 'deploy', globalOptions: { app: undefined, assetMetadata: undefined, @@ -73,7 +73,7 @@ describe('yargs', () => { const result = convertYargsToUserInput(input); expect(result).toEqual({ - _: 'deploy', + command: 'deploy', deploy: expect.objectContaining({ STACKS: ['stack1', 'stack2'], }), @@ -87,7 +87,7 @@ describe('yargs', () => { const result = convertYargsToUserInput(input); expect(result).toEqual({ - _: 'acknowledge', + command: 'acknowledge', acknowledge: expect.objectContaining({ ID: 'id1', }), diff --git a/tools/@aws-cdk/user-input-gen/lib/convert-to-user-input-gen.ts b/tools/@aws-cdk/user-input-gen/lib/convert-to-user-input-gen.ts index 1ea751e15afeb..b348059eff33e 100644 --- a/tools/@aws-cdk/user-input-gen/lib/convert-to-user-input-gen.ts +++ b/tools/@aws-cdk/user-input-gen/lib/convert-to-user-input-gen.ts @@ -142,7 +142,7 @@ function buildPositionalArguments(arg: { name: string; variadic: boolean }, argN function buildUserInput(argName: string): string { return [ 'const userInput: UserInput = {', - `_: ${argName}._[0],`, + `command: ${argName}._[0],`, 'globalOptions,', `[${argName}._[0]]: commandOptions`, '}', diff --git a/tools/@aws-cdk/user-input-gen/lib/user-input-gen.ts b/tools/@aws-cdk/user-input-gen/lib/user-input-gen.ts index 1d39585fb0692..e6f97f90e8865 100644 --- a/tools/@aws-cdk/user-input-gen/lib/user-input-gen.ts +++ b/tools/@aws-cdk/user-input-gen/lib/user-input-gen.ts @@ -25,7 +25,7 @@ export async function renderUserInputType(config: CliConfig): Promise { const commandEnum = Type.fromName(scope, 'Command'); userInputType.addProperty({ - name: '_', + name: 'command', type: commandEnum, docs: { summary: 'The CLI command name', diff --git a/tools/@aws-cdk/user-input-gen/test/convert-to-user-input-gen.test.ts b/tools/@aws-cdk/user-input-gen/test/convert-to-user-input-gen.test.ts index 427213e09f37d..6afc40e224592 100644 --- a/tools/@aws-cdk/user-input-gen/test/convert-to-user-input-gen.test.ts +++ b/tools/@aws-cdk/user-input-gen/test/convert-to-user-input-gen.test.ts @@ -71,7 +71,7 @@ describe('render', () => { break; } const userInput: UserInput = { - _: args._[0], + command: args._[0], globalOptions, [args._[0]]: commandOptions, }; diff --git a/tools/@aws-cdk/user-input-gen/test/user-input-gen.test.ts b/tools/@aws-cdk/user-input-gen/test/user-input-gen.test.ts index 0fa06bc261492..f88360f34f1d7 100644 --- a/tools/@aws-cdk/user-input-gen/test/user-input-gen.test.ts +++ b/tools/@aws-cdk/user-input-gen/test/user-input-gen.test.ts @@ -60,7 +60,7 @@ describe('render', () => { /** * The CLI command name */ - readonly _?: Command; + readonly command?: Command; /** * Global options available to all CLI commands @@ -169,7 +169,7 @@ describe('render', () => { /** * The CLI command name */ - readonly _?: Command; + readonly command?: Command; /** * Global options available to all CLI commands @@ -251,7 +251,7 @@ describe('render', () => { /** * The CLI command name */ - readonly _?: Command; + readonly command?: Command; /** * Global options available to all CLI commands