Use only pipeline projects for CodeBuild

SoManyHs · Oct 21, 2019 · 90f9e8b · 90f9e8b
1 parent 1f77b5c
commit 90f9e8b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/pipelines/src/api-service-pipeline.ts b/pipelines/src/api-service-pipeline.ts
@@ -40,11 +40,7 @@ class TriviaGameBackendPipelineStack extends cdk.Stack {
         });
 
         // Build
-        const buildProject = new codebuild.Project(this, 'BuildProject', {
-            source: codebuild.Source.gitHub({
-                owner: 'aws-samples',
-                repo: 'aws-reinvent-2018-trivia-game'
-            }),
+        const buildProject = new codebuild.PipelineProject(this, 'BuildProject', {
             buildSpec: codebuild.BuildSpec.fromSourceFilename('trivia-backend/infra/cdk/buildspec.yml'),
             environment: {
               buildImage: codebuild.LinuxBuildImage.UBUNTU_14_04_NODEJS_10_1_0,
@@ -54,11 +50,7 @@ class TriviaGameBackendPipelineStack extends cdk.Stack {
                 }
               },
               privileged: true
-            },
-            artifacts: codebuild.Artifacts.s3({
-                bucket: pipeline.artifactBucket,
-                name: 'output.zip'
-            })
+            }
         });
 
         buildProject.addToRolePolicy(new iam.PolicyStatement({

diff --git a/pipelines/src/pipeline.ts b/pipelines/src/pipeline.ts
@@ -41,11 +41,7 @@ export class TriviaGameCfnPipeline extends cdk.Construct {
         this.sourceOutput = sourceOutput;
 
         // Build
-        const buildProject = new codebuild.Project(this, 'BuildProject', {
-            source: codebuild.Source.gitHub({
-                owner: 'aws-samples',
-                repo: 'aws-reinvent-2018-trivia-game'
-            }),
+        const buildProject = new codebuild.PipelineProject(this, 'BuildProject', {
             buildSpec: codebuild.BuildSpec.fromSourceFilename(props.directory + '/buildspec.yml'),
             environment: {
               buildImage: codebuild.LinuxBuildImage.UBUNTU_14_04_NODEJS_10_1_0,
@@ -55,11 +51,7 @@ export class TriviaGameCfnPipeline extends cdk.Construct {
                 }
               },
               privileged: true
-            },
-            artifacts: codebuild.Artifacts.s3({
-                bucket: pipeline.artifactBucket,
-                name: 'output.zip'
-            })
+            }
         });
 
         const buildArtifact = new codepipeline.Artifact('BuildArtifact');

diff --git a/pipelines/tsconfig.json b/pipelines/tsconfig.json
@@ -16,7 +16,8 @@
         "inlineSourceMap": true,
         "inlineSources": true,
         "experimentalDecorators": true,
-        "strictPropertyInitialization":false
+        "strictPropertyInitialization":false,
+        "resolveJsonModule": true,
+        "esModuleInterop": true
     }
 }
-