use new toolkit from old cli

Author: mrgrain

packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/source-builder.ts

@@ -15,6 +15,7 @@ import type { AssemblyBuilder } from '../source-builder';
 export abstract class CloudAssemblySourceBuilder {
   /**
    * Helper to provide the CloudAssemblySourceBuilder with required toolkit services
+   * @internal
    * @deprecated this should move to the toolkit really.
    */
   protected abstract sourceBuilderServices(): Promise<ToolkitServices>;

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

@@ -91,7 +91,7 @@ export class Toolkit extends CloudAssemblySourceBuilder implements AsyncDisposab
    * The IoHost of this Toolkit
    */
   public readonly ioHost: IIoHost;
-  private _sdkProvider?: SdkProvider;
+  private sdkProviderCache?: SdkProvider;
 
   public constructor(private readonly props: ToolkitOptions = {}) {
     super();
@@ -124,21 +124,23 @@ export class Toolkit extends CloudAssemblySourceBuilder implements AsyncDisposab
 
   /**
    * Access to the AWS SDK
+   * @internal
    */
-  private async sdkProvider(action: ToolkitAction): Promise<SdkProvider> {
+  protected async sdkProvider(action: ToolkitAction): Promise<SdkProvider> {
     // @todo this needs to be different instance per action
-    if (!this._sdkProvider) {
-      this._sdkProvider = await SdkProvider.withAwsCliCompatibleDefaults({
+    if (!this.sdkProviderCache) {
+      this.sdkProviderCache = await SdkProvider.withAwsCliCompatibleDefaults({
         ...this.props.sdkConfig,
         logger: asSdkLogger(asIoHelper(this.ioHost, action)),
       });
     }
 
-    return this._sdkProvider;
+    return this.sdkProviderCache;
   }
 
   /**
    * Helper to provide the CloudAssemblySourceBuilder with required toolkit services
+   * @internal
    */
   protected override async sourceBuilderServices(): Promise<ToolkitServices> {
     return {

packages/aws-cdk/lib/api/cxapp/cloud-executable.ts

@@ -2,6 +2,7 @@ import type * as cxapi from '@aws-cdk/cx-api';
 import { CloudAssembly } from './cloud-assembly';
 import { ToolkitError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { IO, type IoHelper } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api/io/private';
+import type { ICloudAssemblySource } from '../../../../@aws-cdk/toolkit-lib/lib/api/cloud-assembly';
 import type { Configuration } from '../../cli/user-configuration';
 import * as contextproviders from '../../context-providers';
 import type { SdkProvider } from '../aws-auth';
@@ -36,12 +37,16 @@ export interface CloudExecutableProps {
 /**
  * Represent the Cloud Executable and the synthesis we can do on it
  */
-export class CloudExecutable {
+export class CloudExecutable implements ICloudAssemblySource {
   private _cloudAssembly?: CloudAssembly;
 
   constructor(private readonly props: CloudExecutableProps) {
   }
 
+  public async produce(): Promise<cxapi.CloudAssembly> {
+    return (await this.synthesize(true)).assembly;
+  }
+
   /**
    * Return whether there is an app command from the configuration
    */

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

@@ -6,10 +6,14 @@ import * as chokidar from 'chokidar';
 import * as fs from 'fs-extra';
 import * as promptly from 'promptly';
 import * as uuid from 'uuid';
+import { CliIoHost } from './io-host';
 import type { Configuration } from './user-configuration';
 import { PROJECT_CONFIG } from './user-configuration';
+import type { ToolkitAction } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { ToolkitError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 import { asIoHelper } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api/io/private';
+import type { ToolkitOptions } from '../../../@aws-cdk/toolkit-lib/lib/toolkit';
+import { Toolkit } from '../../../@aws-cdk/toolkit-lib/lib/toolkit';
 import { DEFAULT_TOOLKIT_STACK_NAME } from '../api';
 import type { SdkProvider } from '../api/aws-auth';
 import type { BootstrapEnvironmentOptions } from '../api/bootstrap';
@@ -59,7 +63,6 @@ import {
   buildCfnClient,
 } from '../commands/migrate';
 import { result as logResult, debug, error, highlight, info, success, warning } from '../logging';
-import { CliIoHost } from './io-host';
 import { partition, validateSnsTopicArn, formatErrorMessage, deserializeStructure, obscureTemplate, serializeStructure, formatTime } from '../util';
 
 // Must use a require() otherwise esbuild complains about calling a namespace
@@ -145,6 +148,22 @@ export enum AssetBuildTime {
   JUST_IN_TIME = 'just-in-time',
 }
 
+class InternalToolkit extends Toolkit {
+  private readonly _sdkProvider: SdkProvider;
+  public constructor(sdkProvider: SdkProvider, options: ToolkitOptions) {
+    super(options);
+    this._sdkProvider = sdkProvider;
+  }
+
+  /**
+   * Access to the AWS SDK
+   * @internal
+   */
+  protected override async sdkProvider(_action: ToolkitAction): Promise<SdkProvider> {
+    return this._sdkProvider;
+  }
+}
+
 /**
  * Toolkit logic
  *
@@ -154,10 +173,21 @@ export enum AssetBuildTime {
 export class CdkToolkit {
   private ioHost: CliIoHost;
   private toolkitStackName: string;
+  private toolkit: InternalToolkit;
 
   constructor(private readonly props: CdkToolkitProps) {
     this.ioHost = props.ioHost ?? CliIoHost.instance();
     this.toolkitStackName = props.toolkitStackName ?? DEFAULT_TOOLKIT_STACK_NAME;
+
+    this.toolkit = new InternalToolkit(props.sdkProvider, {
+      assemblyFailureAt: this.validateMetadataFailAt(),
+      color: true,
+      emojis: true,
+      ioHost: this.ioHost,
+      sdkConfig: {},
+      toolkitStackName: this.toolkitStackName,
+    });
+    this.toolkit; // aritifical use of this.toolkit to satisfy TS, we want to prepare usage of the new toolkit without using it just yet
   }
 
   public async metadata(stackName: string, json: boolean) {
@@ -1251,6 +1281,11 @@ export class CdkToolkit {
    * Validate the stacks for errors and warnings according to the CLI's current settings
    */
   private async validateStacks(stacks: StackCollection) {
+    const failAt = this.validateMetadataFailAt();
+    await stacks.validateMetadata(failAt, stackMetadataLogger(this.props.verbose));
+  }
+
+  private validateMetadataFailAt(): 'warn' | 'error' | 'none' {
     let failAt: 'warn' | 'error' | 'none' = 'error';
     if (this.props.ignoreErrors) {
       failAt = 'none';
@@ -1259,7 +1294,7 @@ export class CdkToolkit {
       failAt = 'warn';
     }
 
-    await stacks.validateMetadata(failAt, stackMetadataLogger(this.props.verbose));
+    return failAt;
   }
 
   /**

packages/aws-cdk/lib/legacy-exports-source.ts

@@ -8,7 +8,11 @@ export * from './legacy-logging-source';
 export { deepClone, flatten, ifDefined, isArray, isEmpty, numberFromBool, partition, padLeft as leftPad, contentHash, deepMerge, lowerCaseFirstCharacter } from './util';
 export { deployStack } from './api/deployments/deploy-stack';
 export { cli, exec } from './cli/cli';
-export { SdkProvider } from './api/aws-auth';
+export { SdkProvider } from './api/aws-auth/sdk-provider';
+export { setSdkTracing as enableTracing } from './api/aws-auth/tracing';
+export { CredentialPlugins } from './api/aws-auth/credential-plugins';
+export { cached } from './api/aws-auth/cached';
+export { AwsCliCompatible } from './api/aws-auth/awscli-compatible';
 export { PluginHost } from './api/plugin';
 export { Command, Configuration, PROJECT_CONTEXT } from './cli/user-configuration';
 export { Settings } from './api/settings';
@@ -17,13 +21,9 @@ export { CloudExecutable } from './api/cxapp/cloud-executable';
 export { execProgram } from './api/cxapp/exec';
 export { RequireApproval } from './commands/diff';
 export { formatAsBanner } from './cli/util/console-formatters';
-export { setSdkTracing as enableTracing } from './api/aws-auth/tracing';
 export { aliases, command, describe } from './commands/docs';
 export { Deployments } from './api/deployments';
 export { cliRootDir as rootDir } from './cli/root-dir';
 export { latestVersionIfHigher, versionNumber } from './cli/version';
 export { availableInitTemplates } from './commands/init';
-export { cached } from './api/aws-auth/cached';
 export { CfnEvaluationException } from './api/cloudformation/evaluate-cloudformation-template';
-export { CredentialPlugins } from './api/aws-auth/credential-plugins';
-export { AwsCliCompatible } from './api/aws-auth/awscli-compatible';