@jaypie/constructs 1.1.62-rc.2 → 1.1.62-rc.3

package/dist/esm/JaypieDistribution.d.ts

@@ -3,6 +3,8 @@ import * as acm from "aws-cdk-lib/aws-certificatemanager";
 import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as route53 from "aws-cdk-lib/aws-route53";
+import * as s3 from "aws-cdk-lib/aws-s3";
+import { LambdaDestination } from "aws-cdk-lib/aws-s3-notifications";
 import { Construct } from "constructs";
 export interface JaypieDistributionProps extends Omit<cloudfront.DistributionProps, "certificate" | "defaultBehavior"> {
     /**
@@ -14,6 +16,14 @@ export interface JaypieDistributionProps extends Omit<cloudfront.DistributionPro
      * Override default behavior (optional if handler is provided)
      */
     defaultBehavior?: cloudfront.BehaviorOptions;
+    /**
+     * Log destination configuration for CloudFront access logs
+     * - LambdaDestination: Use a specific Lambda destination for S3 notifications
+     * - true: Use Datadog forwarder for S3 notifications (default)
+     * - false: Disable logging entirely
+     * @default true
+     */
+    destination?: LambdaDestination | boolean;
     /**
      * The origin handler - can be an IOrigin, IFunctionUrl, or IFunction
      * If IFunction, a FunctionUrl will be created with auth NONE
@@ -49,6 +59,7 @@ export declare class JaypieDistribution extends Construct implements cloudfront.
     readonly domainName: string;
     readonly functionUrl?: lambda.FunctionUrl;
     readonly host?: string;
+    readonly logBucket?: s3.IBucket;
     constructor(scope: Construct, id: string, props: JaypieDistributionProps);
     private isIOrigin;
     private isIFunctionUrl;

package/dist/esm/index.js

@@ -1635,7 +1635,7 @@ class JaypieDatadogForwarder extends Construct {
 class JaypieDistribution extends Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const { certificate: certificateProp = true, handler, host: propsHost, invokeMode = lambda.InvokeMode.BUFFERED, roleTag = CDK$2.ROLE.API, zone: propsZone, defaultBehavior: propsDefaultBehavior, ...distributionProps } = props;
+        const { certificate: certificateProp = true, defaultBehavior: propsDefaultBehavior, destination: destinationProp = true, handler, host: propsHost, invokeMode = lambda.InvokeMode.BUFFERED, roleTag = CDK$2.ROLE.API, zone: propsZone, ...distributionProps } = props;
         // Validate environment variables
         if (process.env.CDK_ENV_API_SUBDOMAIN &&
             !isValidSubdomain(process.env.CDK_ENV_API_SUBDOMAIN)) {
@@ -1701,9 +1701,10 @@ class JaypieDistribution extends Construct {
         }
         else if (origin) {
             defaultBehavior = {
+                allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
                 cachePolicy: cloudfront.CachePolicy.CACHING_DISABLED,
                 origin,
-                originRequestPolicy: cloudfront.OriginRequestPolicy.ALL_VIEWER,
+                originRequestPolicy: cloudfront.OriginRequestPolicy.ALL_VIEWER_EXCEPT_HOST_HEADER,
                 viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
             };
         }
@@ -1728,6 +1729,33 @@ class JaypieDistribution extends Construct {
             }
             this.certificate = certificateToUse;
         }
+        // Create log bucket if logging is enabled
+        let logBucket;
+        if (destinationProp !== false) {
+            logBucket = new s3.Bucket(this, constructEnvName("LogBucket"), {
+                objectOwnership: s3.ObjectOwnership.OBJECT_WRITER,
+                removalPolicy: RemovalPolicy.DESTROY,
+                autoDeleteObjects: true,
+                lifecycleRules: [
+                    {
+                        expiration: Duration.days(90),
+                        transitions: [
+                            {
+                                storageClass: s3.StorageClass.INFREQUENT_ACCESS,
+                                transitionAfter: Duration.days(30),
+                            },
+                        ],
+                    },
+                ],
+            });
+            Tags.of(logBucket).add(CDK$2.TAG.ROLE, CDK$2.ROLE.STORAGE);
+            // Add S3 notification to Datadog forwarder
+            const lambdaDestination = destinationProp === true
+                ? new LambdaDestination(resolveDatadogForwarderFunction(this))
+                : destinationProp;
+            logBucket.addEventNotification(s3.EventType.OBJECT_CREATED, lambdaDestination);
+            this.logBucket = logBucket;
+        }
         // Create the CloudFront distribution
         this.distribution = new cloudfront.Distribution(this, constructEnvName("Distribution"), {
             defaultBehavior,
@@ -1737,6 +1765,13 @@ class JaypieDistribution extends Construct {
                     domainNames: [host],
                 }
                 : {}),
+            ...(logBucket
+                ? {
+                    enableLogging: true,
+                    logBucket,
+                    logFilePrefix: "cloudfront-logs/",
+                }
+                : {}),
             ...distributionProps,
         });
         Tags.of(this.distribution).add(CDK$2.TAG.ROLE, roleTag);