feat(cli): allow to parallelize asset build

Author: go-to-k

packages/@aws-cdk/toolkit-lib/lib/actions/deploy/index.ts

@@ -214,6 +214,15 @@ export interface DeployOptions extends BaseDeployOptions {
    */
   readonly assetParallelism?: boolean;
 
+  /**
+   * Maximum number of asset builds to run in parallel
+   *
+   * This setting only has an effect if `assetParallelism` is set to `true`.
+   *
+   * @default 1
+   */
+  readonly assetBuildConcurrency?: number;
+
   /**
    * When to build assets
    *

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

@@ -823,7 +823,7 @@ export class Toolkit extends CloudAssemblySourceBuilder {
 
     const graphConcurrency: Concurrency = {
       'stack': concurrency,
-      'asset-build': 1, // This will be CPU-bound/memory bound, mostly matters for Docker builds
+      'asset-build': (options.assetParallelism ?? true) ? options.assetBuildConcurrency ?? 1 : 1, // This will be CPU-bound/memory bound, mostly matters for Docker builds
       'asset-publish': (options.assetParallelism ?? true) ? 8 : 1, // This will be I/O-bound, 8 in parallel seems reasonable
     };
 

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

@@ -705,7 +705,7 @@ export class CdkToolkit {
 
     const graphConcurrency: Concurrency = {
       'stack': concurrency,
-      'asset-build': 1, // This will be CPU-bound/memory bound, mostly matters for Docker builds
+      'asset-build': (options.assetParallelism ?? true) ? options.assetBuildConcurrency ?? 1 : 1, // This will be CPU-bound/memory bound, mostly matters for Docker builds
       'asset-publish': (options.assetParallelism ?? true) ? 8 : 1, // This will be I/O-bound, 8 in parallel seems reasonable
     };
 
@@ -1766,6 +1766,15 @@ export interface DeployOptions extends CfnDeployOptions, WatchOptions {
    */
   readonly assetParallelism?: boolean;
 
+  /**
+   * Maximum number of asset builds to run in parallel
+   *
+   * This setting only has an effect if `assetParallelism` is set to `true`.
+   *
+   * @default 1
+   */
+  readonly assetBuildConcurrency?: number;
+
   /**
    * When to build assets
    *

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

@@ -208,6 +208,7 @@ export async function makeConfig(): Promise<CliConfig> {
           },
           'concurrency': { type: 'number', desc: 'Maximum number of simultaneous deployments (dependency permitting) to execute.', default: 1, requiresArg: true },
           'asset-parallelism': { type: 'boolean', desc: 'Whether to build/publish assets in parallel' },
+          'asset-build-concurrency': { type: 'number', desc: 'Maximum number of asset builds to run in parallel', default: 1, requiresArg: true },
           'asset-prebuild': { type: 'boolean', desc: 'Whether to build all assets before deploying the first stack (useful for failing Docker builds)', default: true },
           'ignore-no-stacks': { type: 'boolean', desc: 'Whether to deploy if the app contains no stacks', default: false },
         },

packages/aws-cdk/lib/cli/cli-type-registry.json

@@ -548,6 +548,12 @@
           "type": "boolean",
           "desc": "Whether to build/publish assets in parallel"
         },
+        "asset-build-concurrency": {
+          "type": "number",
+          "desc": "Maximum number of asset builds to run in parallel",
+          "default": 1,
+          "requiresArg": true
+        },
         "asset-prebuild": {
           "type": "boolean",
           "desc": "Whether to build all assets before deploying the first stack (useful for failing Docker builds)",

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

@@ -407,6 +407,7 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise<n
           traceLogs: args.logs,
           concurrency: args.concurrency,
           assetParallelism: configuration.settings.get(['assetParallelism']),
+          assetBuildConcurrency: configuration.settings.get(['assetBuildConcurrency']),
           assetBuildTime: configuration.settings.get(['assetPrebuild'])
             ? AssetBuildTime.ALL_BEFORE_DEPLOY
             : AssetBuildTime.JUST_IN_TIME,

packages/aws-cdk/lib/cli/convert-to-user-input.ts

@@ -140,6 +140,7 @@ export function convertYargsToUserInput(args: any): UserInput {
         logs: args.logs,
         concurrency: args.concurrency,
         assetParallelism: args.assetParallelism,
+        assetBuildConcurrency: args.assetBuildConcurrency,
         assetPrebuild: args.assetPrebuild,
         ignoreNoStacks: args.ignoreNoStacks,
         STACKS: args.STACKS,
@@ -425,6 +426,7 @@ export function convertConfigToUserInput(config: any): UserInput {
     logs: config.deploy?.logs,
     concurrency: config.deploy?.concurrency,
     assetParallelism: config.deploy?.assetParallelism,
+    assetBuildConcurrency: config.deploy?.assetBuildConcurrency,
     assetPrebuild: config.deploy?.assetPrebuild,
     ignoreNoStacks: config.deploy?.ignoreNoStacks,
   };

packages/aws-cdk/lib/cli/parse-command-line-arguments.ts

@@ -584,6 +584,12 @@ export function parseCommandLineArguments(args: Array<string>): any {
           type: 'boolean',
           desc: 'Whether to build/publish assets in parallel',
         })
+        .option('asset-build-concurrency', {
+          default: 1,
+          type: 'number',
+          desc: 'Maximum number of asset builds to run in parallel',
+          requiresArg: true,
+        })
         .option('asset-prebuild', {
           default: true,
           type: 'boolean',

packages/aws-cdk/lib/cli/user-configuration.ts

@@ -321,6 +321,7 @@ export async function commandLineArgumentsToSettings(ioHelper: IoHelper, argv: A
     rollback: argv.rollback,
     notices: argv.notices,
     assetParallelism: argv['asset-parallelism'],
+    assetBuildConcurrency: argv['asset-build-concurrency'],
     assetPrebuild: argv['asset-prebuild'],
     ignoreNoStacks: argv['ignore-no-stacks'],
     hotswap: {

packages/aws-cdk/lib/cli/user-input.ts

@@ -911,6 +911,15 @@ export interface DeployOptions {
    */
   readonly assetParallelism?: boolean;
 
+  /**
+   * Maximum number of asset builds to run in parallel
+   *
+   * This setting only has an effect if `assetParallelism` is set to `true`.
+   *
+   * @default 1
+   */
+  readonly assetBuildConcurrency?: number;
+
   /**
    * Whether to build all assets before deploying the first stack (useful for failing Docker builds)
    *