Merge pull request #2 from non-97/feature/log-analytics

🐛 S3サーバーアクセスログを任意のプレフィックスで出力できるように修正
non-97 · Apr 2, 2024 · 0028181 · 0028181
2 parents 26513fe + 092a0cb
commit 0028181
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/construct/bucket-construct.ts b/lib/construct/bucket-construct.ts
@@ -33,7 +33,10 @@ export class BucketConstruct extends Construct {
       autoDeleteObjects: props?.allowDeleteBucketAndObjects ? true : undefined,
       accessControl: props?.accessControl,
       serverAccessLogsBucket: props?.s3ServerAccessLogBucketConstruct?.bucket,
-      serverAccessLogsPrefix: props?.logFilePrefix,
+      serverAccessLogsPrefix:
+        props?.s3ServerAccessLogBucketConstruct?.bucket && props?.logFilePrefix
+          ? `${props?.logFilePrefix}/`
+          : undefined,
     });
 
     props?.lifecycleRules?.forEach((lifecycleRule) => {

diff --git a/lib/website-stack.ts b/lib/website-stack.ts
@@ -30,6 +30,7 @@ export class WebsiteStack extends cdk.Stack {
 
     // Bucket for S3 Server Access Log
     const s3serverAccessLogBucketConstruct = props.s3ServerAccessLog
+      ?.enableAccessLog
       ? new BucketConstruct(this, "S3ServerAccessLogBucketConstruct", {
           allowDeleteBucketAndObjects: props.allowDeleteBucketAndObjects,
           accessControl: cdk.aws_s3.BucketAccessControl.LOG_DELIVERY_WRITE,
@@ -39,6 +40,7 @@ export class WebsiteStack extends cdk.Stack {
 
     // Bucket for CloudFront Access Log
     const cloudFrontAccessLogBucketConstruct = props.cloudFrontAccessLog
+      ?.enableAccessLog
       ? new BucketConstruct(this, "CloudFrontAccessLogBucketConstruct", {
           allowDeleteBucketAndObjects: props.allowDeleteBucketAndObjects,
           accessControl: cdk.aws_s3.BucketAccessControl.LOG_DELIVERY_WRITE,
@@ -53,6 +55,7 @@ export class WebsiteStack extends cdk.Stack {
       {
         s3ServerAccessLogBucketConstruct: s3serverAccessLogBucketConstruct,
         allowDeleteBucketAndObjects: props.allowDeleteBucketAndObjects,
+        logFilePrefix: props.s3ServerAccessLog?.logFilePrefix,
       }
     );