reverting to versioned buckets

Author: Abdelhalim Dadouche

lib/build-image-data.ts

@@ -37,7 +37,7 @@ export class BuildImageDataStack extends cdk.Stack {
    */
   private createDeploymentBucket(bucketName: string): s3.IBucket {
     const accessLoggingBucket = new s3.Bucket(this, 'LoggingBucket', {
-      versioned: false,
+      versioned: true,
       enforceSSL: true,
       autoDeleteObjects: true,
       removalPolicy: RemovalPolicy.DESTROY,

lib/build-image-pipeline.ts

@@ -111,7 +111,7 @@ export class BuildImagePipelineStack extends cdk.Stack {
       accessLoggingBucket = props.accessLoggingBucket;
     } else {
      accessLoggingBucket = new s3.Bucket(this, 'ArtifactAccessLogging', {
-        versioned: false,
+        versioned: true,
         enforceSSL: true,
         autoDeleteObjects: true,
         removalPolicy: RemovalPolicy.DESTROY,
@@ -128,7 +128,7 @@ export class BuildImagePipelineStack extends cdk.Stack {
        enableKeyRotation: true,
      });
       artifactBucket = new s3.Bucket(this, 'PipelineArtifacts', {
-        versioned: false,
+        versioned: true,
         enforceSSL: true,
         serverAccessLogsBucket: accessLoggingBucket,
         serverAccessLogsPrefix: props.serverAccessLogsPrefix,

lib/embedded-linux-codebuild-project.ts

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

lib/embedded-linux-pipeline.ts

@@ -96,7 +96,7 @@ export class EmbeddedLinuxPipelineStack extends cdk.Stack {
       accessLoggingBucket = props.accessLoggingBucket;
     } else {
      accessLoggingBucket = new s3.Bucket(this, 'ArtifactAccessLogging', {
-        versioned: false,
+        versioned: true,
         enforceSSL: true,
         autoDeleteObjects: true,
         removalPolicy: RemovalPolicy.DESTROY,
@@ -150,7 +150,7 @@ export class EmbeddedLinuxPipelineStack extends cdk.Stack {
         outputBucket = props.outputBucket;
       } else {
         outputBucket = new s3.Bucket(this, 'PipelineOutput', {
-          versioned: false,
+          versioned: true,
           enforceSSL: true,
           serverAccessLogsBucket: accessLoggingBucket,
           autoDeleteObjects: true,
@@ -169,7 +169,7 @@ export class EmbeddedLinuxPipelineStack extends cdk.Stack {
        enableKeyRotation: true,
      });
       artifactBucket = new s3.Bucket(this, 'PipelineArtifacts', {
-        versioned: false,
+        versioned: true,
         enforceSSL: true,
         serverAccessLogsBucket: accessLoggingBucket,
         encryptionKey,

test/build-image-data.test.ts

@@ -11,18 +11,18 @@ describe('Build Image Data', () => {
     env: { account: '111111111111', region: 'eu-central-1' },
   };
 
-  // test('S3 Bucket Has Versioning Disabled', () => {
-  //   const app = new cdk.App();
-  //   const stack = new BuildImageDataStack(app, 'MyTestStack', props);
-  //   const template = Template.fromStack(stack);
-  //   template.hasResourceProperties('AWS::S3::Bucket', {
-  //     BucketName: 'test-bucket',
-  //   });
+  test('S3 Bucket Has Versioning Enabled', () => {
+    const app = new cdk.App();
+    const stack = new BuildImageDataStack(app, 'MyTestStack', props);
+    const template = Template.fromStack(stack);
+    template.hasResourceProperties('AWS::S3::Bucket', {
+      BucketName: 'test-bucket',
+    });
 
-  //   template.allResourcesProperties('AWS::S3::Bucket', {
-  //     VersioningConfiguration: { Status: 'Enabled' },
-  //   });
-  // });
+    template.allResourcesProperties('AWS::S3::Bucket', {
+      VersioningConfiguration: { Status: 'Enabled' },
+    });
+  });
 
   test('Snapshot', () => {
     const app = new cdk.App();

test/build-image-pipeline.test.ts

@@ -30,9 +30,9 @@ describe('Build Image Pipeline', () => {
     template.allResourcesProperties('AWS::Logs::LogGroup', {
       RetentionInDays: 3653,
     });
-    // template.allResourcesProperties('AWS::S3::Bucket', {
-    //   VersioningConfiguration: { Status: 'Enabled' },
-    // });
+    template.allResourcesProperties('AWS::S3::Bucket', {
+      VersioningConfiguration: { Status: 'Enabled' },
+    });
   });
 
   test('Snapshot', () => {

test/embedded-linux-pipeline.test.ts

@@ -27,22 +27,22 @@ describe('Pipeline', () => {
     });
   });
 
-  // test('S3 Bucket Has Versioning Disabled', () => {
-  //   const app = new cdk.App();
-  //   const newStack = new cdk.Stack(app, 'RepoStack', { env });
-  //   const imageRepo = new Repository(newStack, 'Repository', {});
-  //   const vpc = new Vpc(newStack, 'Bucket', {});
+  test('S3 Bucket Has Versioning Enabled', () => {
+    const app = new cdk.App();
+    const newStack = new cdk.Stack(app, 'RepoStack', { env });
+    const imageRepo = new Repository(newStack, 'Repository', {});
+    const vpc = new Vpc(newStack, 'Bucket', {});
 
-  //   const stack = new EmbeddedLinuxPipelineStack(app, 'MyTestStack', {
-  //     env,
-  //     imageRepo,
-  //     vpc,
-  //   });
-  //   const template = Template.fromStack(stack);
-  //   template.allResourcesProperties('AWS::S3::Bucket', {
-  //     VersioningConfiguration: { Status: 'Enabled' },
-  //   });
-  // });
+    const stack = new EmbeddedLinuxPipelineStack(app, 'MyTestStack', {
+      env,
+      imageRepo,
+      vpc,
+    });
+    const template = Template.fromStack(stack);
+    template.allResourcesProperties('AWS::S3::Bucket', {
+      VersioningConfiguration: { Status: 'Enabled' },
+    });
+  });
 
   test('Snapshot Poky Pipeline', () => {
     const app = new cdk.App();