feat(stepfunctions-tasks): support complete overridings of start buil…

…d of codebuild.

packages/@aws-cdk/aws-codebuild/lib/project.ts

@@ -396,14 +396,10 @@ abstract class ProjectBase extends Resource implements IProject {
   }
 }
 
-export interface CommonProjectProps {
-  /**
-   * A description of the project. Use the description to identify the purpose
-   * of the project.
-   *
-   * @default - No description.
-   */
-  readonly description?: string;
+/**
+ * TODO: add properties `queuedTimeoutInMinutes`, `logsConfig`
+ */
+export interface CommonStartBuildOptions {
 
   /**
    * Filename or contents of buildspec in JSON format.
@@ -413,13 +409,6 @@ export interface CommonProjectProps {
    */
   readonly buildSpec?: BuildSpec;
 
-  /**
-   * Service Role to assume while running the build.
-   *
-   * @default - A role will be created.
-   */
-  readonly role?: iam.IRole;
-
   /**
    * Encryption key to use to read and write artifacts.
    *
@@ -442,13 +431,11 @@ export interface CommonProjectProps {
   readonly environment?: BuildEnvironment;
 
   /**
-   * Indicates whether AWS CodeBuild generates a publicly accessible URL for
-   * your project's build badge. For more information, see Build Badges Sample
-   * in the AWS CodeBuild User Guide.
+   * Service Role to assume while running the build.
    *
-   * @default false
+   * @default - A role will be created.
    */
-  readonly badge?: boolean;
+  readonly role?: iam.IRole;
 
   /**
    * The number of minutes after which AWS CodeBuild stops the build if it's
@@ -465,6 +452,25 @@ export interface CommonProjectProps {
    * @default - No additional environment variables are specified.
    */
   readonly environmentVariables?: { [name: string]: BuildEnvironmentVariable };
+}
+
+export interface CommonProjectProps extends CommonStartBuildOptions {
+  /**
+   * A description of the project. Use the description to identify the purpose
+   * of the project.
+   *
+   * @default - No description.
+   */
+  readonly description?: string;
+
+  /**
+   * Indicates whether AWS CodeBuild generates a publicly accessible URL for
+   * your project's build badge. For more information, see Build Badges Sample
+   * in the AWS CodeBuild User Guide.
+   *
+   * @default false
+   */
+  readonly badge?: boolean;
 
   /**
    * The physical, human-readable name of the CodeBuild Project.
@@ -540,7 +546,7 @@ export interface CommonProjectProps {
   readonly grantReportGroupPermissions?: boolean;
 }
 
-export interface ProjectProps extends CommonProjectProps {
+export interface StartBuildOptions extends CommonStartBuildOptions {
   /**
    * The source of the build.
    * *Note*: if {@link NoSource} is given as the source,
@@ -577,6 +583,9 @@ export interface ProjectProps extends CommonProjectProps {
   readonly secondaryArtifacts?: IArtifacts[];
 }
 
+export interface ProjectProps extends StartBuildOptions, CommonProjectProps {
+}
+
 /**
  * The extra options passed to the {@link IProject.bindToCodePipeline} method.
  */

packages/@aws-cdk/aws-codebuild/package.json

@@ -199,6 +199,8 @@
       "docs-public-apis:@aws-cdk/aws-codebuild.CodeCommitSourceProps.repository",
       "props-default-doc:@aws-cdk/aws-codebuild.CodeCommitSourceProps.cloneDepth",
       "docs-public-apis:@aws-cdk/aws-codebuild.CommonProjectProps",
+      "docs-public-apis:@aws-cdk/aws-codebuild.CommonStartBuildOptions",
+      "docs-public-apis:@aws-cdk/aws-codebuild.StartBuildOptions",
       "props-default-doc:@aws-cdk/aws-codebuild.GitHubEnterpriseSourceProps.cloneDepth",
       "props-default-doc:@aws-cdk/aws-codebuild.GitHubSourceProps.cloneDepth",
       "docs-public-apis:@aws-cdk/aws-codebuild.IProject",

packages/@aws-cdk/aws-stepfunctions-tasks/README.md

@@ -342,11 +342,18 @@ const codebuildProject = new codebuild.Project(stack, 'Project', {
 const task = new tasks.CodeBuildStartBuild(stack, 'Task', {
   project: codebuildProject,
   integrationPattern: sfn.IntegrationPattern.RUN_JOB,
-  environmentVariablesOverride: {
-    ZONE: {
-      type: codebuild.BuildEnvironmentVariableType.PLAINTEXT,
-      value: sfn.JsonPath.stringAt('$.envVariables.zone'),
+  overrides: {
+    environmentVariables: {
+        ZONE: {
+          type: codebuild.BuildEnvironmentVariableType.PLAINTEXT,          
+          value: sfn.JsonPath.stringAt('$.envVariables.zone'),
+        },
     },
+    source: codebuild.Source.gitHub({
+      branchOrRef: sfn.JsonPath.stringAt('$.commitHash'),
+      owner,
+      repo,
+    }),
   },
 });
 ```

packages/@aws-cdk/aws-stepfunctions-tasks/lib/codebuild/start-build.ts

@@ -5,6 +5,26 @@ import * as cdk from '@aws-cdk/core';
 import { Construct } from 'constructs';
 import { integrationResourceArn, validatePatternSupported } from '../private/task-utils';
 
+/**
+ * Override properties for CodeBuildStartBuild
+ *
+ */
+export interface OverrideProjectProps extends codebuild.StartBuildOptions {
+  /**
+   * Specifies if session debugging is enabled for this build.
+   *
+   * @default - the debug session flag specified in the build project.
+   */
+  readonly debugSessionEnabled?: boolean;
+
+  /**
+   * A unique, case sensitive identifier you provide to ensure the idempotency of the StartBuild request.
+   *
+   * @default - no idempotency token.
+   */
+  readonly idempotencyToken?: string;
+}
+
 /**
  * Properties for CodeBuildStartBuild
  */
@@ -13,12 +33,21 @@ export interface CodeBuildStartBuildProps extends sfn.TaskStateBaseProps {
    * CodeBuild project to start
    */
   readonly project: codebuild.IProject;
+
   /**
    * A set of environment variables to be used for this build only.
    *
+   * @deprecated - use {@link OverrideProjectProps.environmentVariables} instead
    * @default - the latest environment variables already defined in the build project.
    */
   readonly environmentVariablesOverride?: { [name: string]: codebuild.BuildEnvironmentVariable };
+
+  /**
+   * Override properties of the build of CodeBuild.
+   *
+   * @default - no override properties.
+   */
+  readonly overrides?: OverrideProjectProps;
 }
 
 /**
@@ -42,6 +71,7 @@ export class CodeBuildStartBuild extends sfn.TaskStateBase {
     this.integrationPattern = props.integrationPattern ?? sfn.IntegrationPattern.REQUEST_RESPONSE;
 
     validatePatternSupported(this.integrationPattern, CodeBuildStartBuild.SUPPORTED_INTEGRATION_PATTERNS);
+    this.validateOverridingParameters(props);
 
     this.taskMetrics = {
       metricPrefixSingular: 'CodeBuildProject',
@@ -91,13 +121,56 @@ export class CodeBuildStartBuild extends sfn.TaskStateBase {
    * @internal
    */
   protected _renderTask(): any {
+    const sourceConfig = this.props.overrides?.source?.bind(this.props.project.stack, this.props.project);
+    const secondarySources = this.props.overrides?.secondarySources?.map(source => source.bind(this.props.project.stack, this.props.project));
     return {
       Resource: integrationResourceArn('codebuild', 'startBuild', this.integrationPattern),
       Parameters: sfn.FieldUtils.renderObject({
+        ArtifactsOverride: this.props.overrides?.artifacts?.bind(this.props.project.stack, this.props.project).artifactsProperty,
+        BuildspecOverride: this.props.overrides?.buildSpec?.toBuildSpec(),
+        BuildStatusConfigOverride: sourceConfig?.sourceProperty.buildStatusConfig,
+        // CacheOverride: , not supported yet
+        // CertificateOverride: , not supported yet
+        ComputeTypeOverride: this.props.overrides?.environment?.computeType,
+        DebugSessionEnabled: this.props.overrides?.debugSessionEnabled,
+        EncryptionKeyOverride: this.props.overrides?.encryptionKey?.keyArn,
+        EnvironmentTypeOverride: this.props.overrides?.environment?.buildImage?.type,
+        EnvironmentVariablesOverride: this.props.overrides?.environmentVariables ?
+          this.serializeEnvVariables(this.props.overrides?.environmentVariables!) :
+          (this.props.environmentVariablesOverride
+            ? this.serializeEnvVariables(this.props.environmentVariablesOverride)
+            : undefined),
+        GitCloneDepthOverride: sourceConfig?.sourceProperty.gitCloneDepth,
+        GitSubmodulesConfigOverride: sourceConfig?.sourceProperty.gitSubmodulesConfig,
+        IdempotencyToken: this.props.overrides?.idempotencyToken,
+        ImageOverride: this.props.overrides?.environment?.buildImage?.imageId,
+        ImagePullCredentialsTypeOverride: this.props.overrides?.environment?.buildImage?.imagePullPrincipalType,
+        InsecureSslOverride: sourceConfig?.sourceProperty.insecureSsl,
+        // LogsConfigOverride: , not supported yet
+        PrivilegedModeOverride: this.props.overrides?.environment?.privileged,
         ProjectName: this.props.project.projectName,
-        EnvironmentVariablesOverride: this.props.environmentVariablesOverride
-          ? this.serializeEnvVariables(this.props.environmentVariablesOverride)
-          : undefined,
+        // QueuedTimeoutInMinutesOverride: , not supported yet
+        RegistryCredentialOverride: this.props.overrides?.environment?.buildImage?.secretsManagerCredentials ? {
+          credentialProvider: 'SECRETS_MANAGER',
+          credential: this.props.overrides!.environment!.buildImage!.secretsManagerCredentials.secretArn,
+        } : undefined,
+        ReportBuildStatusOverride: sourceConfig?.sourceProperty.reportBuildStatus,
+        SecondaryArtifactsOverride: this.props.overrides?.secondaryArtifacts?.map(artifact =>
+          artifact.bind(this.props.project.stack, this.props.project).artifactsProperty,
+        ),
+        SecondarySourcesOverride: secondarySources?.map(source => source.sourceProperty),
+        SecondarySourcesVersionOverride: secondarySources?.map(source => {
+          return {
+            sourceIdentifier: source.sourceProperty.sourceIdentifier,
+            sourceVersion: source.sourceVersion,
+          };
+        }),
+        ServiceRoleOverride: this.props.overrides?.role?.roleArn,
+        SourceAuthOverride: sourceConfig?.sourceProperty.auth,
+        SourceLocationOverride: sourceConfig?.sourceProperty.location,
+        SourceTypeOverride: this.props.overrides?.source?.type,
+        SourceVersion: sourceConfig?.sourceVersion,
+        TimeoutInMinutesOverride: this.props.overrides?.timeout?.toMinutes(),
       }),
     };
   }
@@ -109,4 +182,17 @@ export class CodeBuildStartBuild extends sfn.TaskStateBase {
       Value: environmentVariables[name].value,
     }));
   }
+
+  private validateOverridingParameters(props: CodeBuildStartBuildProps) {
+    if (props.overrides?.secondaryArtifacts && props.overrides!.secondaryArtifacts!.length > 12) {
+      throw new Error('The maximum array length of override property "secondaryArtifacts" is 12.');
+    }
+    if (props.overrides?.secondarySources && props.overrides!.secondarySources!.length > 12) {
+      throw new Error('The maximum array length of override property "secondarySources" is 12.');
+    }
+    if (props.overrides?.timeout && (props.overrides!.timeout!.toMinutes() < 5
+      || props.overrides!.timeout!.toMinutes() > 480)) {
+      throw new Error('The value of override property "timeout" must be between 5 and 480 minutes.');
+    }
+  }
 }

packages/@aws-cdk/aws-stepfunctions-tasks/test/codebuild/integ.start-build.expected.json

@@ -152,8 +152,11 @@
         },
         "Source": {
           "BuildSpec": "{\n  \"version\": \"0.2\",\n  \"phases\": {\n    \"build\": {\n      \"commands\": [\n        \"echo \\\"Hello, CodeBuild!\\\"\"\n      ]\n    }\n  }\n}",
-          "Type": "NO_SOURCE"
+          "Type": "GITHUB",
+          "Location": "https://github.com/aws/aws-cdk.git",
+          "ReportBuildStatus": true
         },
+        "SourceVersion": "master",
         "Name": "MyTestProject",
         "EncryptionKey": "alias/aws/s3"
       }
@@ -234,11 +237,11 @@
               {
                 "Ref": "AWS::Partition"
               },
-              ":states:::codebuild:startBuild\",\"Parameters\":{\"ProjectName\":\"",
+              ":states:::codebuild:startBuild\",\"Parameters\":{\"ComputeTypeOverride\":\"BUILD_GENERAL1_2XLARGE\",\"EnvironmentVariablesOverride\":[{\"Name\":\"ZONE\",\"Type\":\"PLAINTEXT\",\"Value.$\":\"$.envVariables.zone\"}],\"ProjectName\":\"",
               {
                 "Ref": "ProjectC78D97AD"
               },
-              "\",\"EnvironmentVariablesOverride\":[{\"Name\":\"ZONE\",\"Type\":\"PLAINTEXT\",\"Value.$\":\"$.envVariables.zone\"}]}}}}"
+              "\",\"ReportBuildStatusOverride\":true,\"SourceLocationOverride\":\"https://github.com/aws/aws-cdk.git\",\"SourceTypeOverride\":\"GITHUB\",\"SourceVersion.$\":\"$.sourceCommit\"}}}}"
             ]
           ]
         }

packages/@aws-cdk/aws-stepfunctions-tasks/test/codebuild/integ.start-build.ts

@@ -16,8 +16,17 @@ class StartBuildStack extends cdk.Stack {
   constructor(scope: cdk.App, id: string, props: cdk.StackProps = {}) {
     super(scope, id, props);
 
+    const owner = 'aws';
+    const repo = 'aws-cdk';
+    const source = codebuild.Source.gitHub({
+      owner,
+      repo,
+      branchOrRef: 'master',
+    });
+
     let project = new codebuild.Project(this, 'Project', {
       projectName: 'MyTestProject',
+      source,
       buildSpec: codebuild.BuildSpec.fromObject({
         version: '0.2',
         phases: {
@@ -36,12 +45,23 @@ class StartBuildStack extends cdk.Stack {
       },
     });
 
+    const sourceOverride = codebuild.Source.gitHub({
+      branchOrRef: sfn.JsonPath.stringAt('$.sourceCommit'),
+      owner,
+      repo,
+    });
     let startBuild = new tasks.CodeBuildStartBuild(this, 'build-task', {
       project: project,
-      environmentVariablesOverride: {
-        ZONE: {
-          type: codebuild.BuildEnvironmentVariableType.PLAINTEXT,
-          value: sfn.JsonPath.stringAt('$.envVariables.zone'),
+      overrides: {
+        source: sourceOverride,
+        environment: {
+          computeType: codebuild.ComputeType.X2_LARGE,
+        },
+        environmentVariables: {
+          ZONE: {
+            type: codebuild.BuildEnvironmentVariableType.PLAINTEXT,
+            value: sfn.JsonPath.stringAt('$.envVariables.zone'),
+          },
         },
       },
     });