Fixes and updates (#55)

Co-authored-by: Srijit Mitra <[email protected]>

Author: srijitm

bin/cicd.ts

@@ -32,9 +32,9 @@ let cicdRoleName = config.deployment['cicdRoleName']
 
 const app = new cdk.App()
 
-new S3Stack(app, 'AWS-Simple-CICD-S3', { prefix, ssmRoot })
-new EmailHandlerStack(app, 'AWS-Simple-CICD-EmailHandler', { prefix, ssmRoot })
-new SemverHandlerStack(app, 'AWS-Simple-CICD-SemverHandler', { prefix, ssmRoot })
-new CicdStack(app, 'AWS-Simple-CICD', { prefix, ssmRoot, cicdRoleName, repos: config.simpleCicd})
+new S3Stack(app, 'AWS-Simple-CICD-01-S3', { prefix, ssmRoot })
+new EmailHandlerStack(app, 'AWS-Simple-CICD-02-EmailHandler', { prefix, ssmRoot })
+new SemverHandlerStack(app, 'AWS-Simple-CICD-03-SemverHandler', { prefix, ssmRoot })
+new CicdStack(app, 'AWS-Simple-CICD-04-SeedPipeline', { prefix, ssmRoot, cicdRoleName, repos: config.seedPipeline})
 new CicdStack(app, 'AWS-Simple-CICD-TeamOne', { prefix, ssmRoot, cicdRoleName, repos: config.teamOne})
 //new CicdStack(app, 'TeamTWo-CICD', { prefix, ssmRoot, repos: config.teamTwo})

config/config.ts

@@ -72,7 +72,7 @@ export interface ProjectConfig {
     test: string,
     prod: string
   },
-  simpleCicd: Array<ProjectRepo>,
+  seedPipeline: Array<ProjectRepo>,
   teamOne:  Array<ProjectRepo>
 }
 

lib/cicd-stack.ts

@@ -67,7 +67,7 @@ export class CicdStack extends cdk.Stack {
       const pipelineName = `${props.prefix}-${repo.pipelineName}-${repo.branch}`.replace(/\/|_/g, '-')
       const modulePipelineRole = new PipelineRole(this, `${pipelineName}PipelineRole`)
 
-      new SimpleCicdPipeline(this, `${pipelineName}-pipeline`, {
+      new SimpleCicdPipeline(this, `${pipelineName}`, {
         artifactsBucket,
         prefix: props.prefix,
         ssmRoot: props.ssmRoot,

lib/iam/code-build-role.ts

@@ -66,7 +66,8 @@ export default class CodeBuildRole extends iam.Role {
           'ecr:UploadLayerPart',
           'ecr:InitiateLayerUpload',
           'ecr:CompleteLayerUpload',
-          'ecr:BatchCheckLayerAvailability'
+          'ecr:BatchCheckLayerAvailability',
+          'ssm:GetParameters'
         ],
         resources: ['*']
       })

lib/pipelines/simple-cicd-pipeline.ts

@@ -78,8 +78,8 @@ export class SimpleCicdPipeline extends Pipeline {
 
     // Provision SNS Topic for notifications
     const notificationTopic = new sns.Topic(this, 'Topic', {
-      displayName: `${prefix}-${repoName}-${repoBranch}-cicd-topic` ,
-      topicName: `${prefix}-${repoName}-${repoBranch}-cicd-topic`
+      displayName: `${pipelineName}-cicd-topic` ,
+      topicName: `${pipelineName}-cicd-topic`
     })
 
     new ssm.StringParameter(this, 'SnsTopicArn', {
@@ -141,14 +141,14 @@ export class SimpleCicdPipeline extends Pipeline {
     const buildOutputArtifact = new Artifact('BuildArtifact')
     const buildRole = new CodeBuildRole(this, 'buildRole')
 
-    const buildProject = new BuildProject(this, `${prefix}-${repoName}-${repoBranch}-build`, {
+    const buildProject = new BuildProject(this, `${pipelineName}-build`, {
         repoName: repoName,
         role: buildRole,
         bucketArn: artifactsBucket.bucketArn,
         bucketName: artifactsBucket.bucketName
     })
 
-    buildProject.onStateChange('buildStatus', {
+    buildProject.onStateChange('build', {
       target: new targets.LambdaFunction(emailHandler)
     })
 
@@ -174,18 +174,27 @@ export class SimpleCicdPipeline extends Pipeline {
       actions: [buildAction, semverAction]
     })
 
+    // Push SemVer to Parameter Store
+    let semverParam = `${ssmRoot}/simple-cicd/${repoName}/${repoBranch}/version`
+    new ssm.StringParameter(this, `${repoName}${repoBranch}Version`, {
+      description: `Version number of ${repoName}/${repoBranch}`,
+      parameterName: semverParam,
+      stringValue: '0.1.0'
+    })
+
     // Testing Stage
     const testOutputArtifact = new Artifact('TestArtifact')
     const testRole = new CodeBuildRole(this, 'testRole')
 
-    const testProject = new TestProject(this, `${prefix}-${repoName}-${repoBranch}-test`, {
+    const testProject = new TestProject(this, `${pipelineName}-test`, {
         repoName: repoName,
         role: testRole,
         bucketArn: artifactsBucket.bucketArn,
-        bucketName: artifactsBucket.bucketName
+        bucketName: artifactsBucket.bucketName,
+        semverParameter: semverParam
     })
 
-    testProject.onStateChange('testStatus', {
+    testProject.onStateChange('test', {
       target: new targets.LambdaFunction(emailHandler)
     })
 
@@ -216,16 +225,17 @@ export class SimpleCicdPipeline extends Pipeline {
         const deployRole = new CodeBuildRole(this, `${stageName}DeployRole`, { stageName })
         const deployProject = new DeployProject(
           this,
-          `${prefix}-${repoName}-${repoBranch}-${stageName}-deploy`,
+          `${pipelineName}-${stageName}-deploy`,
           {
             repoName: repoName,
             stageName: stageName,
             role: deployRole,
             bucketArn: artifactsBucket.bucketArn,
-            bucketName: artifactsBucket.bucketName
+            bucketName: artifactsBucket.bucketName,
+            semverParameter: semverParam
           }
         )
-        deployProject.onStateChange('deploymentStatus', {
+        deployProject.onStateChange('deploy', {
           target: new targets.LambdaFunction(emailHandler)
         })
 
@@ -262,10 +272,5 @@ export class SimpleCicdPipeline extends Pipeline {
       cwRule.addTarget(new targets.CodePipeline(this))
     }
 
-    new ssm.StringParameter(this, `${repoName}${repoBranch}Version`, {
-      description: `Version number of ${repoName}/${repoBranch}`,
-      parameterName: `${ssmRoot}/codecommit/${repoName}/${repoBranch}/version`,
-      stringValue: '0.1.0'
-    })
   }
 }

lib/projects/deploy-project.ts

@@ -30,6 +30,7 @@ export interface DeployProjectProps {
   bucketName: string
   bucketArn: string
   role: Role
+  semverParameter: string
 }
 
 export class DeployProject extends PipelineProject {
@@ -43,7 +44,10 @@ export class DeployProject extends PipelineProject {
       buildSpec: BuildSpec.fromObject({
         version: '0.2',
         env: {
-          shell: 'bash'
+          shell: 'bash',
+          'parameter-store': {
+            SEMVER: props.semverParameter
+          }
         },
         phases: {
           install: {

lib/projects/test-project.ts

@@ -28,6 +28,7 @@ export interface BuildProjectProps extends ProjectProps {
   bucketName: string
   bucketArn: string
   role: Role
+  semverParameter: string
 }
 
 export class TestProject extends PipelineProject {
@@ -41,7 +42,10 @@ export class TestProject extends PipelineProject {
       buildSpec: BuildSpec.fromObject({
         version: '0.2',
         env: {
-          shell: 'bash'
+          shell: 'bash',
+          'parameter-store': {
+              SEMVER: props.semverParameter
+          }
         },
         phases: {
           install: {

project-config.sample.json

@@ -24,7 +24,7 @@
     "test": "ca-central-1",
     "prod": "ca-central-1"
   },
-  "simpleCicd": [
+  "seedPipeline": [
     {
       "pipelineName": "simple-cicd",
       "repository": "aws-simple-cicd",

scripts/build.sh

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+echo "Nothing to build"

scripts/deploy.sh

@@ -0,0 +1,18 @@
+#! /bin/bash
+
+set -e
+set -u
+set -o pipefail
+
+# Running CDK Project
+
+# Install CDK 
+npm install -g aws-cdk
+
+# Install Dependencies
+npm install
+npm run build
+
+# Deploy
+cdk bootstrap
+cdk deploy --all --require-approval never

scripts/test.sh

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+echo "Nothing to test"