refactor(cli): re-organize files (#265)

Hopefully the final big code re-org in the CLI before we move code into
the shared package.

This move focuses on moving top-level files into `commands` and `cli`
respectively, to indicate they will stay within the CLI package.
Also removes the `toolkit/error.ts` re-export, which causes many of the
import changes.

Includes a non-consequential bug fix, to the init command and how it's
finding the new `.init-version.json` and
`.recommended-feature-flags.json` files. This was incorrect before and
would happened to work because `init.ts` was in the same directory as
`index.ts`. However because the code is bundled, we need to address the
`init-templates` (and the new files) from the project root location.
This is already done for the templates themselves, but was missed for
`.init-version.json` and `.recommended-feature-flags.json`.

---
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache-2.0 license

Author: mrgrain

.projenrc.ts

@@ -821,8 +821,8 @@ const cli = configureProject(
           '<rootDir>/lib/user-input.ts',
           '<rootDir>/lib/convert-to-user-input.ts',
         ],
-        testEnvironment: './test/jest-bufferedconsole.ts',
-        setupFilesAfterEnv: ['<rootDir>/test/jest-setup-after-env.ts'],
+        testEnvironment: './test/_helpers/jest-bufferedconsole.ts',
+        setupFilesAfterEnv: ['<rootDir>/test/_helpers/jest-setup-after-env.ts'],
       },
     }),
 

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

@@ -30,4 +30,4 @@ export { guessExecutable } from '../../../../aws-cdk/lib/api/cxapp/exec';
 
 // @todo Should not use! investigate how to replace
 export { versionNumber } from '../../../../aws-cdk/lib/cli/version';
-export { CliIoHost } from '../../../../aws-cdk/lib/toolkit/cli-io-host';
+export { CliIoHost } from '../../../../aws-cdk/lib/cli/io-host';

packages/@aws-cdk/user-input-gen/test/user-input-gen.test.ts

@@ -33,10 +33,12 @@ describe('render', () => {
       commands: {
         deploy: {
           description: 'Deploy a stack',
+          aliases: ['ship-it'],
           options: {
             all: {
               type: 'boolean',
               desc: 'Deploy all stacks',
+              alias: 'A',
               default: false,
             },
           },
@@ -70,6 +72,8 @@ describe('render', () => {
 
         /**
          * Deploy a stack
+         *
+         * aliases: ship-it
          */
         readonly deploy?: DeployOptions;
       }
@@ -119,12 +123,16 @@ describe('render', () => {
       /**
        * Deploy a stack
        *
+       * aliases: ship-it
+       *
        * @struct
        */
       export interface DeployOptions {
         /**
          * Deploy all stacks
          *
+         * aliases: A
+         *
          * @default - false
          */
         readonly all?: boolean;

packages/@aws-cdk/user-input-gen/test/yargs-gen.test.ts

@@ -78,6 +78,7 @@ describe('render', () => {
       commands: {
         test: {
           description: 'the action under test',
+          aliases: ['spec'],
           options: {
             one: {
               type: 'boolean',
@@ -104,7 +105,7 @@ describe('render', () => {
         return yargs
           .env('CDK')
           .usage('Usage: cdk -a <cdk-app> COMMAND')
-          .command('test', 'the action under test', (yargs: Argv) =>
+          .command(['test', 'spec'], 'the action under test', (yargs: Argv) =>
             yargs
               .option('one', {
                 default: undefined,

packages/aws-cdk/jest.config.json

@@ -8,8 +8,8 @@ import { ProxyAgent } from 'proxy-agent';
 import { makeCachingProvider } from './provider-caching';
 import type { SdkHttpOptions } from './sdk-provider';
 import { readIfPossible } from './util';
+import { AuthenticationError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { debug } from '../../logging';
-import { AuthenticationError } from '../../toolkit/error';
 
 const DEFAULT_CONNECTION_TIMEOUT = 10000;
 const DEFAULT_TIMEOUT = 300000;

packages/aws-cdk/lib/api/aws-auth/awscli-compatible.ts

@@ -2,8 +2,8 @@ import { inspect } from 'util';
 import type { CredentialProviderSource, ForReading, ForWriting, PluginProviderResult, SDKv2CompatibleCredentials, SDKv3CompatibleCredentialProvider, SDKv3CompatibleCredentials } from '@aws-cdk/cli-plugin-contract';
 import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@smithy/types';
 import { credentialsAboutToExpire, makeCachingProvider } from './provider-caching';
+import { AuthenticationError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { debug, warning } from '../../logging';
-import { AuthenticationError } from '../../toolkit/error';
 import { formatErrorMessage } from '../../util';
 import type { Mode } from '../plugin/mode';
 import { PluginHost } from '../plugin/plugin';

packages/aws-cdk/lib/api/aws-auth/credential-plugins.ts

@@ -12,8 +12,8 @@ import { CredentialPlugins } from './credential-plugins';
 import { makeCachingProvider } from './provider-caching';
 import { SDK } from './sdk';
 import { callTrace, traceMemberMethods } from './tracing';
+import { AuthenticationError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { debug, warning } from '../../logging';
-import { AuthenticationError } from '../../toolkit/error';
 import { formatErrorMessage } from '../../util';
 import { Mode } from '../plugin/mode';
 

packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts

@@ -346,8 +346,8 @@ import { cachedAsync } from './cached';
 import type { Account } from './sdk-provider';
 import { traceMemberMethods } from './tracing';
 import { defaultCliUserAgent } from './user-agent';
+import { AuthenticationError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { debug } from '../../logging';
-import { AuthenticationError } from '../../toolkit/error';
 import { formatErrorMessage } from '../../util';
 
 export interface S3ClientOptions {

packages/aws-cdk/lib/api/aws-auth/sdk.ts

@@ -4,9 +4,9 @@ import type * as cxapi from '@aws-cdk/cx-api';
 import type { BootstrapEnvironmentOptions, BootstrappingParameters } from './bootstrap-props';
 import { BootstrapStack, bootstrapVersionFromTemplate } from './deploy-bootstrap';
 import { legacyBootstrapTemplate } from './legacy-template';
+import { ToolkitError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import type { IoHelper } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api/io/private';
 import { warn } from '../../cli/messages';
-import { ToolkitError } from '../../toolkit/error';
 import { bundledPackageRootDir, loadStructuredFile, serializeStructure } from '../../util';
 import type { SDK, SdkProvider } from '../aws-auth';
 import type { SuccessfulDeployStackResult } from '../deployments';