Merge pull request #73 from adadouche/main

Various updates

Author: thomas-roos

lib/build-image-data.ts

@@ -37,8 +37,10 @@ export class BuildImageDataStack extends cdk.Stack {
    */
   private createDeploymentBucket(bucketName: string): s3.IBucket {
     const accessLoggingBucket = new s3.Bucket(this, 'LoggingBucket', {
-      versioned: true,
+      versioned: false,
       enforceSSL: true,
+      autoDeleteObjects: true,
+      removalPolicy: RemovalPolicy.DESTROY,
     });
 
     const encryptionKey = new kms.Key(this, 'PipelineArtifactKey', {
@@ -49,12 +51,12 @@ export class BuildImageDataStack extends cdk.Stack {
     // Create a bucket, then allow a deployment Lambda to upload to it.
     const dataBucket = new s3.Bucket(this, 'BuildImageDataBucket', {
       bucketName,
-      versioned: true,
+      versioned: false,
       encryptionKey: encryptionKey,
-      removalPolicy: cdk.RemovalPolicy.DESTROY,
-      autoDeleteObjects: true,
       enforceSSL: true,
       serverAccessLogsBucket: accessLoggingBucket,
+      autoDeleteObjects: true,
+      removalPolicy: RemovalPolicy.DESTROY,
     });
 
     const cwPolicy = new iam.PolicyDocument({

lib/build-image-pipeline.ts

@@ -111,8 +111,10 @@ export class BuildImagePipelineStack extends cdk.Stack {
       accessLoggingBucket = props.accessLoggingBucket;
     } else {
      accessLoggingBucket = new s3.Bucket(this, 'ArtifactAccessLogging', {
-        versioned: true,
+        versioned: false,
         enforceSSL: true,
+        autoDeleteObjects: true,
+        removalPolicy: RemovalPolicy.DESTROY,
       });
     }
 
@@ -126,7 +128,7 @@ export class BuildImagePipelineStack extends cdk.Stack {
        enableKeyRotation: true,
      });
       artifactBucket = new s3.Bucket(this, 'PipelineArtifacts', {
-        versioned: true,
+        versioned: false,
         enforceSSL: true,
         serverAccessLogsBucket: accessLoggingBucket,
         serverAccessLogsPrefix: props.serverAccessLogsPrefix,
@@ -135,12 +137,15 @@ export class BuildImagePipelineStack extends cdk.Stack {
         blockPublicAccess: new s3.BlockPublicAccess(
           s3.BlockPublicAccess.BLOCK_ALL
         ),
+        autoDeleteObjects: true,
+        removalPolicy: RemovalPolicy.DESTROY,
       });
     }
 
     const pipeline = new codepipeline.Pipeline(this, 'BuildImagePipeline', {
       artifactBucket,
       pipelineName: `${props.imageKind}BuildImagePipeline`,
+      pipelineType: codepipeline.PipelineType.V1,
       stages: [
         {
           stageName: 'Source',

lib/embedded-linux-codebuild-project.ts

@@ -94,8 +94,10 @@ export class EmbeddedLinuxCodebuildProjectStack extends cdk.Stack {
       accessLoggingBucket = props.accessLoggingBucket;
     } else {
       accessLoggingBucket = new s3.Bucket(this, "ArtifactAccessLogging", {
-        versioned: true,
+        versioned: false,
         enforceSSL: true,
+        autoDeleteObjects: true,
+        removalPolicy: RemovalPolicy.DESTROY,
       });
     }
 

lib/embedded-linux-pipeline.ts

@@ -96,8 +96,10 @@ export class EmbeddedLinuxPipelineStack extends cdk.Stack {
       accessLoggingBucket = props.accessLoggingBucket;
     } else {
      accessLoggingBucket = new s3.Bucket(this, 'ArtifactAccessLogging', {
-        versioned: true,
+        versioned: false,
         enforceSSL: true,
+        autoDeleteObjects: true,
+        removalPolicy: RemovalPolicy.DESTROY,
       });
     }
 
@@ -114,6 +116,7 @@ export class EmbeddedLinuxPipelineStack extends cdk.Stack {
           enableKeyRotation: true,
         }
       );
+
       if (props.outputBucket){
         outputBucket = props.outputBucket;
       } else {
@@ -124,6 +127,8 @@ export class EmbeddedLinuxPipelineStack extends cdk.Stack {
           encryptionKeyArn: outputBucketEncryptionKey.keyArn,
           serverAccessLogsBucket: accessLoggingBucket,
           serverAccessLogsPrefix: props.serverAccessLogsPrefix,
+          autoDeleteObjects: true,
+          removalPolicy: RemovalPolicy.DESTROY,
         });
       }
       environmentVariables = {
@@ -145,9 +150,11 @@ export class EmbeddedLinuxPipelineStack extends cdk.Stack {
         outputBucket = props.outputBucket;
       } else {
         outputBucket = new s3.Bucket(this, 'PipelineOutput', {
-          versioned: true,
+          versioned: false,
           enforceSSL: true,
           serverAccessLogsBucket: accessLoggingBucket,
+          autoDeleteObjects: true,
+          removalPolicy: RemovalPolicy.DESTROY,
         });
       }
     }
@@ -162,14 +169,16 @@ export class EmbeddedLinuxPipelineStack extends cdk.Stack {
        enableKeyRotation: true,
      });
       artifactBucket = new s3.Bucket(this, 'PipelineArtifacts', {
-        versioned: true,
+        versioned: false,
         enforceSSL: true,
         serverAccessLogsBucket: accessLoggingBucket,
         encryptionKey,
         encryption: s3.BucketEncryption.KMS,
         blockPublicAccess: new s3.BlockPublicAccess(
           s3.BlockPublicAccess.BLOCK_ALL
         ),
+        autoDeleteObjects: true,
+        removalPolicy: RemovalPolicy.DESTROY,
       });
     }
 
@@ -335,6 +344,7 @@ def handler(event, context):
     const pipeline = new codepipeline.Pipeline(this, 'EmbeddedLinuxPipeline', {
       artifactBucket,
       restartExecutionOnUpdate: true,
+      pipelineType: codepipeline.PipelineType.V1,
       stages: [
         {
           stageName: 'Source',

lib/network.ts

@@ -12,9 +12,8 @@ import { LogGroup, RetentionDays } from 'aws-cdk-lib/aws-logs';
 export class PipelineNetworkStack extends cdk.Stack {
   /** The VPC for the pipeline to reside in. */
   public readonly vpc: ec2.IVpc;
-
-  constructor(scope: Construct, props?: cdk.StackProps) {
-    super(scope, 'PipelineNetwork', props);
+  constructor(scope: Construct, id: string, props?: cdk.StackProps) {
+    super(scope, id, props);
 
     // We will create a VPC with 3 Private and Public subnets for AWS
     // Resources that have network interfaces (e.g. Connecting and EFS