Merge pull request #206 from gammarer/feature/add-props-encryption-wi…

…th-chenge-encryption-default feat: add props encryption with chenge encryption default
gammarers · Feb 28, 2024 · ec19cb8 · ec19cb8
2 parents 142c068 + 1c797ea
commit ec19cb8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/API.md b/API.md
diff --git a/src/index.ts b/src/index.ts
@@ -5,6 +5,7 @@ import { Construct } from 'constructs';
 
 export interface SecureLogBucketProps {
   readonly bucketName?: string;
+  readonly encryption?: SecureBucketEncryption;
   readonly changeClassTransition?: StorageClassTransitionProperty;
   readonly objectOwnership?: SecureObjectOwnership;
 }
@@ -21,7 +22,7 @@ export class SecureLogBucket extends SecureBucket {
   constructor(scope: Construct, id: string, props?: SecureLogBucketProps) {
     super(scope, id, {
       bucketName: props?.bucketName,
-      encryption: SecureBucketEncryption.KMS_MANAGED,
+      encryption: props?.encryption ?? SecureBucketEncryption.S3_MANAGED,
       versioned: true,
       objectOwnership: props?.objectOwnership,
       lifecycleRules: [{

diff --git a/test/__snapshots__/bucket.default.test.ts.snap b/test/__snapshots__/bucket.default.test.ts.snap
diff --git a/test/bucket.default.test.ts b/test/bucket.default.test.ts
@@ -26,7 +26,7 @@ describe('SecureLogBucket default Testing', () => {
         ServerSideEncryptionConfiguration: [
           {
             ServerSideEncryptionByDefault: {
-              SSEAlgorithm: 'aws:kms',
+              SSEAlgorithm: 'AES256',
             },
           },
         ],

diff --git a/test/bucket.specific.test.ts b/test/bucket.specific.test.ts
@@ -1,3 +1,4 @@
+import { SecureBucketEncryption } from '@gammarer/aws-secure-bucket';
 import { App, Stack } from 'aws-cdk-lib';
 import { Match, Template } from 'aws-cdk-lib/assertions';
 import * as s3 from 'aws-cdk-lib/aws-s3';
@@ -14,6 +15,7 @@ describe('SecureLogBucket specific Testing', () => {
 
   const bucket = new SecureLogBucket(stack, 'SecureLogBucket', {
     bucketName: 'example-log-bucket',
+    encryption: SecureBucketEncryption.KMS_MANAGED,
     changeClassTransition: {
       infrequentAccessDays: 20,
       intelligentTieringDays: 40,
@@ -28,7 +30,21 @@ describe('SecureLogBucket specific Testing', () => {
 
   const template = Template.fromStack(stack);
 
-  it('Should match lifecycle', () => {
+  it('Should have specific encryption', () => {
+    template.hasResourceProperties('AWS::S3::Bucket', {
+      BucketEncryption: Match.objectEquals({
+        ServerSideEncryptionConfiguration: [
+          {
+            ServerSideEncryptionByDefault: {
+              SSEAlgorithm: 'aws:kms',
+            },
+          },
+        ],
+      }),
+    });
+  });
+
+  it('Should match specific lifecycle', () => {
     template.hasResourceProperties('AWS::S3::Bucket', {
       LifecycleConfiguration: {
         Rules: Match.arrayEquals([