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

@@ -93,7 +93,7 @@ export class Toolkit extends CloudAssemblySourceBuilder {
   /**
    * Cache of the internal SDK Provider instance
    */
-  private _sdkProvider?: SdkProvider;
+  private sdkProviderCache?: SdkProvider;
 
   public constructor(private readonly props: ToolkitOptions = {}) {
     super();
@@ -113,23 +113,25 @@ export class Toolkit extends CloudAssemblySourceBuilder {
 
   /**
    * 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) {
+    if (!this.sdkProviderCache) {
       const ioHelper = asIoHelper(this.ioHost, action);
-      this._sdkProvider = await SdkProvider.withAwsCliCompatibleDefaults({
+      this.sdkProviderCache = await SdkProvider.withAwsCliCompatibleDefaults({
         ...this.props.sdkConfig,
         ioHelper,
         logger: asSdkLogger(ioHelper),
       });
     }
 
-    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/cli/cdk-toolkit.ts

@@ -9,8 +9,11 @@ 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';
@@ -139,6 +142,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
  *
@@ -148,10 +167,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) {
@@ -1250,6 +1280,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';
@@ -1258,7 +1293,7 @@ export class CdkToolkit {
       failAt = 'warn';
     }
 
-    await stacks.validateMetadata(failAt, stackMetadataLogger(this.props.verbose));
+    return failAt;
   }
 
   /**

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

@@ -36,12 +36,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
    */