fix(integ-tests): add integ tests for the toolkit library

Author: rix0rrr

.github/workflows/integ.yml

@@ -1586,11 +1586,16 @@ const cliInteg = configureProject(
     ],
     devDeps: [
       yarnCling,
+      toolkitLib,
       '@types/semver@^7',
       '@types/yargs@^16',
       '@types/fs-extra@^9',
       '@types/glob@^7',
     ],
+    peerDeps: [
+      // Can't use a '*' because projen special-cases that
+      '@aws-cdk/toolkit-lib@>=0',
+    ],
     bin: {
       'run-suite': 'bin/run-suite',
       'download-and-run-old-tests': 'bin/download-and-run-old-tests',

.projenrc.ts

@@ -45,11 +45,12 @@ inject these dependencies into tests. Users can specify component versions, but
 Test Authors are responsible for taking these parameters and using it to set up
 the right environment for the tests.
 
-| Component             | Command-line argument                | Default     | Treatment by runner        | Treatment in test                         |
-|-----------------------|--------------------------------------|-------------|----------------------------|-------------------------------------------|
-| CDK Construct Library | `--framework-version=VERSION`        | Latest      | Nothing                    | `npm install` into temporary project dir. |
-| CDK CLI               | `--cli-version=VERSION`              | Auto source | `npm install` into tempdir | Add to `$PATH`.                           |
+| Component             | Command-line argument                | Default     | Treatment by runner        | Treatment in test                             |
+|-----------------------|--------------------------------------|-------------|----------------------------|-----------------------------------------------|
+| CDK Construct Library | `--framework-version=VERSION`        | Latest      | Nothing                    | `npm install` into temporary project dir.     |
+| CDK CLI               | `--cli-version=VERSION`              | Auto source | `npm install` into tempdir | Add to `$PATH`.                               |
 |                       | `--cli-source=ROOT` or `auto`        | Auto source |                            | Add `<ROOT>/packages/aws-cdk/bin` to `$PATH`. |
+| Toolkit Library       | `--toolkit-lib-version=VERSION`      | Devdep      | Install into its own deps  | Nothing
 
 ### Running a test suite
 

packages/@aws-cdk-testing/cli-integ/.projen/deps.json

@@ -34,6 +34,11 @@ async function main() {
         alias: 'f',
         type: 'string',
       })
+      .options('toolkit-lib-version', {
+        describe: 'Toolkit lib version to use',
+        alias: 'l',
+        type: 'string',
+      })
       .option('use-source', {
         descripton: 'Use TypeScript packages from the given source repository (or "auto")',
         type: 'string',

packages/@aws-cdk-testing/cli-integ/.projen/tasks.json

@@ -0,0 +1,18 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import * as toolkit from '@aws-cdk/toolkit-lib';
+import { assemblyFromCdkAppDir } from './toolkit-helpers';
+import { integTest, withDefaultFixture } from '../../lib';
+
+integTest(
+  'toolkit can cdk deploy',
+  withDefaultFixture(async (fixture) => {
+    const tk = new toolkit.Toolkit();
+
+    const assembly = await assemblyFromCdkAppDir(tk, fixture.integTestDir);
+
+    await tk.deploy(assembly);
+    await tk.destroy(assembly, {
+      stacks: { strategy: toolkit.StackSelectionStrategy.ALL_STACKS },
+    });
+  }),
+);

packages/@aws-cdk-testing/cli-integ/README.md

@@ -0,0 +1,17 @@
+import { promises as fs } from 'fs';
+import * as path from 'path';
+import type * as toolkit from '@aws-cdk/toolkit-lib';
+
+/**
+ * Helper function to convert a CDK app directory into an Assembly Source
+ *
+ * This will eventually become part of the toolkit itself, but isn't yet.
+ */
+export async function assemblyFromCdkAppDir(tk: toolkit.Toolkit, cdkAppDir: string) {
+  const cdkJson = await JSON.parse(await fs.readFile(path.join(cdkAppDir, 'cdk.json'), 'utf-8'));
+  const app = cdkJson.app;
+
+  return tk.fromCdkApp(app, {
+    workingDirectory: cdkAppDir,
+  });
+}