Merge branch 'main' into mrgrain/refactor/modern-messaging

Author: mrgrain

.github/workflows/build.yml

@@ -70,7 +70,7 @@ function configureProject<A extends pj.typescript.TypeScriptProject>(x: A): A {
   return x;
 }
 
-const POWERFUL_RUNNER = 'aws-cdk_ubuntu-latest_4-core';
+const POWERFUL_RUNNER = 'aws-cdk_ubuntu-latest_16-core';
 
 const workflowRunsOn = [
   POWERFUL_RUNNER,
@@ -199,6 +199,7 @@ const repoProject = new yarn.Monorepo({
     includeRootWorkspace: true,
   },
   nx: true,
+  buildWithNx: true,
 
   eslintOptions: {
     dirs: ['lib'],

.github/workflows/integ.yml

@@ -146,7 +146,7 @@ describe('cloud assembly manifest reader', () => {
 
     // THEN
     const newManifest = Manifest.loadAssetManifest(manifestFile);
-    expect(newManifest).toEqual({
+    expect(newManifest).toMatchObject({
       version: expect.any(String),
       artifacts: expect.objectContaining({
         'Tree': {
@@ -193,7 +193,7 @@ describe('cloud assembly manifest reader', () => {
 
     // THEN
     const newManifest = Manifest.loadAssetManifest(manifestFile);
-    expect(newManifest).toEqual({
+    expect(newManifest).toMatchObject({
       version: expect.any(String),
       artifacts: expect.objectContaining({
         'Tree': {
@@ -241,7 +241,7 @@ describe('cloud assembly manifest reader', () => {
 
     // THEN
     const newManifest = Manifest.loadAssetManifest(manifestFile);
-    expect(newManifest).toEqual({
+    expect(newManifest).toMatchObject({
       version: expect.any(String),
       artifacts: expect.objectContaining({
         'Tree': {

.github/workflows/release.yml

@@ -169,6 +169,17 @@ export interface BootstrapParameters {
   readonly customPermissionsBoundary?: string;
 }
 
+export interface EnvironmentBootstrapResult {
+  environment: cxapi.Environment;
+  status: 'success' | 'no-op';
+  duration: number;
+}
+
+export interface BootstrapResult {
+  environments: EnvironmentBootstrapResult[];
+  duration: number;
+}
+
 /**
  * Parameters of the bootstrapping template with flexible configuration options
  */

.projen/tasks.json

@@ -5,7 +5,7 @@ import * as chokidar from 'chokidar';
 import * as fs from 'fs-extra';
 import type { ToolkitServices } from './private';
 import { assemblyFromSource } from './private';
-import type { BootstrapEnvironments, BootstrapOptions } from '../actions/bootstrap';
+import type { BootstrapEnvironments, BootstrapOptions, BootstrapResult, EnvironmentBootstrapResult } from '../actions/bootstrap';
 import { BootstrapSource } from '../actions/bootstrap';
 import { AssetBuildTime, type DeployOptions } from '../actions/deploy';
 import { type ExtendedDeployOptions, buildParameterMap, createHotswapPropertyOverrides, removePublishedAssets } from '../actions/deploy/private';
@@ -147,7 +147,10 @@ export class Toolkit extends CloudAssemblySourceBuilder implements AsyncDisposab
   /**
    * Bootstrap Action
    */
-  public async bootstrap(environments: BootstrapEnvironments, options: BootstrapOptions): Promise<void> {
+  public async bootstrap(environments: BootstrapEnvironments, options: BootstrapOptions): Promise<BootstrapResult> {
+    const startTime = Date.now();
+    const results: EnvironmentBootstrapResult[] = [];
+
     const ioHelper = asIoHelper(this.ioHost, 'bootstrap');
     const bootstrapEnvironments = await environments.getEnvironments();
     const source = options.source ?? BootstrapSource.default();
@@ -177,17 +180,29 @@ export class Toolkit extends CloudAssemblySourceBuilder implements AsyncDisposab
             usePreviousParameters: parameters?.keepExistingParameters,
           },
         );
+
         const message = bootstrapResult.noOp
           ? ` ✅  ${environment.name} (no changes)`
           : ` ✅  ${environment.name}`;
 
         await ioHelper.notify(IO.CDK_TOOLKIT_I9900.msg(chalk.green('\n' + message), { environment }));
-        await bootstrapSpan.end();
+        const envTime = await bootstrapSpan.end();
+        const result: EnvironmentBootstrapResult = {
+          environment,
+          status: bootstrapResult.noOp ? 'no-op' : 'success',
+          duration: envTime.asMs,
+        };
+        results.push(result);
       } catch (e: any) {
         await ioHelper.notify(IO.CDK_TOOLKIT_E9900.msg(`\n ❌  ${chalk.bold(environment.name)} failed: ${formatErrorMessage(e)}`, { error: e }));
         throw e;
       }
     })));
+
+    return {
+      environments: results,
+      duration: Date.now() - startTime,
+    };
   }
 
   /**