add unit test

Author: hoegertn

packages/@aws-cdk/pipelines/README.md

@@ -205,6 +205,10 @@ const cdkPipeline = new CdkPipeline(app, 'CdkPipeline', {
 });
 ```
 
+If you use assets for files or Docker images, every asset will get its own upload action during the asset stage. 
+By setting the value `singlePublisherPerType` to `true`, only one action for files and one action for 
+Docker images is created that handles all assets of the respective type.
+
 ## Initial pipeline deployment
 
 You provision this pipeline by making sure the target environment has been

packages/@aws-cdk/pipelines/lib/pipeline.ts

@@ -128,6 +128,7 @@ export interface CdkPipelineProps {
    */
   readonly singlePublisherPerType?: boolean;
 
+  /**
    * Whether the pipeline needs to build Docker images in the UpdatePipeline stage.
    *
    * If the UpdatePipeline stage tries to build a Docker image and this flag is not
@@ -341,7 +342,7 @@ export class CdkPipeline extends CoreConstruct {
     return flatMap(this._pipeline.stages, s => s.actions.filter(isDeployAction));
   }
 
-  private* validateDeployOrder(): IterableIterator<string> {
+  private * validateDeployOrder(): IterableIterator<string> {
     const stackActions = this.stackActions;
     for (const stackAction of stackActions) {
       // For every dependency, it must be executed in an action before this one is prepared.
@@ -359,7 +360,7 @@ export class CdkPipeline extends CoreConstruct {
     }
   }
 
-  private* validateRequestedOutputs(): IterableIterator<string> {
+  private * validateRequestedOutputs(): IterableIterator<string> {
     const artifactIds = this.stackActions.map(s => s.stackArtifactId);
 
     for (const artifactId of Object.keys(this._outputArtifacts)) {

packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.expected.json

@@ -293,7 +293,7 @@
                   "ProjectName": {
                     "Ref": "PipelineBuildSynthCdkBuildProject6BEFA8E6"
                   },
-                  "EnvironmentVariables": "[{\"name\":\"_PROJECT_CONFIG_HASH\",\"type\":\"PLAINTEXT\",\"value\":\"a0d828d64c88aa603631eb7a08bc4748769f45d4b84d1b550cc85f41e49dc87e\"}]"
+                  "EnvironmentVariables": "[{\"name\":\"_PROJECT_CONFIG_HASH\",\"type\":\"PLAINTEXT\",\"value\":\"da8c1ee6d645a5802d25355fec94a3f22a961102b74ac3846898d6b14e3a2c30\"}]"
                 },
                 "InputArtifacts": [
                   {
@@ -739,6 +739,13 @@
         },
         "Environment": {
           "ComputeType": "BUILD_GENERAL1_SMALL",
+          "EnvironmentVariables": [
+            {
+              "Name": "NPM_CONFIG_UNSAFE_PERM",
+              "Type": "PLAINTEXT",
+              "Value": "true"
+            }
+          ],
           "Image": "aws/codebuild/standard:5.0",
           "ImagePullCredentialsType": "CODEBUILD",
           "PrivilegedMode": false,

packages/@aws-cdk/pipelines/test/pipeline-assets.test.ts

@@ -11,6 +11,7 @@ import * as cdkp from '../lib';
 import { BucketStack, PIPELINE_ENV, TestApp, TestGitHubAction, TestGitHubNpmPipeline } from './testutil';
 
 const FILE_ASSET_SOURCE_HASH = '8289faf53c7da377bb2b90615999171adef5e1d8f6b88810e5fef75e6ca09ba5';
+const FILE_ASSET_SOURCE_HASH2 = 'ac76997971c3f6ddf37120660003f1ced72b4fc58c498dfd99c78fa77e721e0e';
 
 let app: TestApp;
 let pipelineStack: Stack;
@@ -406,6 +407,53 @@ describe('pipeline with VPC', () => {
   });
 });
 
+describe('pipeline with single asset publisher', () => {
+  beforeEach(() => {
+    app = new TestApp();
+    pipelineStack = new Stack(app, 'PipelineStack', { env: PIPELINE_ENV });
+    pipeline = new TestGitHubNpmPipeline(pipelineStack, 'Cdk', {
+      singlePublisherPerType: true,
+    });
+  });
+
+  afterEach(() => {
+    app.cleanup();
+  });
+
+  test('multiple assets are using the same job in singlePublisherMode', () => {
+    // WHEN
+    pipeline.addApplicationStage(new TwoFileAssetsApp(app, 'FileAssetApp'));
+
+    // THEN
+    expect(pipelineStack).toHaveResourceLike('AWS::CodePipeline::Pipeline', {
+      Stages: arrayWith({
+        Name: 'Assets',
+        Actions: [
+          // Only one file asset action
+          objectLike({ RunOrder: 1, Name: 'FileAsset' }),
+        ],
+      }),
+    });
+    expect(pipelineStack).toHaveResourceLike('AWS::CodeBuild::Project', {
+      Environment: {
+        Image: 'aws/codebuild/standard:5.0',
+      },
+      Source: {
+        BuildSpec: encodedJson(deepObjectLike({
+          phases: {
+            build: {
+              // Both assets are uploaded in the same action
+              commands: arrayWith(
+                `cdk-assets --path "assembly-FileAssetApp/FileAssetAppStackEADD68C5.assets.json" --verbose publish "${FILE_ASSET_SOURCE_HASH}:current_account-current_region"`,
+                `cdk-assets --path "assembly-FileAssetApp/FileAssetAppStackEADD68C5.assets.json" --verbose publish "${FILE_ASSET_SOURCE_HASH2}:current_account-current_region"`,
+              ),
+            },
+          },
+        })),
+      },
+    });
+  });
+});
 class PlainStackApp extends Stage {
   constructor(scope: Construct, id: string, props?: StageProps) {
     super(scope, id, props);