quidproquo-deploy-awscdk 0.0.80 → 0.0.82

package/lib/constructs/basic/Function.js

@@ -54,6 +54,11 @@ class Function extends QpqConstructBlock_1.QpqConstructBlock {
             actions: ['apigateway:GET'],
             resources: ['*'],
         }));
+        // Let lambdas invalidate cache for cloud front
+        this.lambdaFunction.addToRolePolicy(new aws_cdk_lib_1.aws_iam.PolicyStatement({
+            actions: ['cloudfront:CreateInvalidation'],
+            resources: ['*'],
+        }));
     }
 }
 exports.Function = Function;

package/lib/constructs/feature/webserver/webEntry/QpqWebserverWebEntryConstruct.js

@@ -31,6 +31,7 @@ const path_1 = __importDefault(require("path"));
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const cdk = __importStar(require("aws-cdk-lib"));
 const quidproquo_webserver_1 = require("quidproquo-webserver");
+const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
 const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
 const qpqDeployAwsCdkUtils = __importStar(require("../../../../utils"));
 class QpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructBlock {
@@ -104,6 +105,19 @@ class QpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructBloc
             enableAcceptEncodingGzip: true,
             enableAcceptEncodingBrotli: true,
         });
+        const mustRevalidate = false;
+        const responseHeaderPolicy = new aws_cdk_lib_1.aws_cloudfront.ResponseHeadersPolicy(this, `dist-rhp`, {
+            responseHeadersPolicyName: this.resourceName(props.webEntryConfig.name),
+            customHeadersBehavior: {
+                customHeaders: [
+                    {
+                        header: 'Cache-Control',
+                        value: `max-age=${props.webEntryConfig.cache.maxTTLInSeconds}${props.webEntryConfig.cache.mustRevalidate ? ', must-revalidate' : ''}`,
+                        override: true,
+                    },
+                ],
+            },
+        });
         // Create a CloudFront distribution using the S3 bucket as the origin
         const distributionOrigin = new aws_cdk_lib_1.aws_cloudfront_origins.S3Origin(originBucket);
         const distribution = new aws_cdk_lib_1.aws_cloudfront.Distribution(this, 'MyDistribution', {
@@ -111,6 +125,8 @@ class QpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructBloc
                 origin: distributionOrigin,
                 cachePolicy: cachePolicy,
                 viewerProtocolPolicy: aws_cdk_lib_1.aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+                compress: props.webEntryConfig.compressFiles,
+                responseHeadersPolicy: responseHeaderPolicy,
             },
             domainNames: [deployDomain],
             certificate: myCertificate,
@@ -122,11 +138,7 @@ class QpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructBloc
                 responsePagePath: '/',
             })),
         });
-        props.webEntryConfig.ignoreCache.forEach((pathPattern) => {
-            distribution.addBehavior(pathPattern, distributionOrigin, {
-                cachePolicy: aws_cdk_lib_1.aws_cloudfront.CachePolicy.CACHING_DISABLED,
-            });
-        });
+        qpqDeployAwsCdkUtils.exportStackValue(this, quidproquo_actionprocessor_awslambda_1.awsNamingUtils.getCFExportNameDistributionIdArnFromConfig(props.webEntryConfig.name, props.qpqConfig), distribution.distributionId);
         // TODO: Fix this when they add l2 support for origin access control settings
         // Currently distribution don't have support for origin access control settings
         // So we manually add it.
@@ -184,6 +196,9 @@ class QpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructBloc
                 const wildcardPath = seo.path.replaceAll(/{(.+?)}/g, '*');
                 distribution.addBehavior(wildcardPath, distributionOrigin, {
                     cachePolicy: seoCachePolicy,
+                    viewerProtocolPolicy: aws_cdk_lib_1.aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+                    compress: props.webEntryConfig.compressFiles,
+                    responseHeadersPolicy: responseHeaderPolicy,
                     edgeLambdas: [
                         {
                             functionVersion: edgeFunctionVR.currentVersion,
@@ -197,6 +212,26 @@ class QpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructBloc
                 });
             }
         }
+        const ignoreCacheResponseHeaderPolicy = new aws_cdk_lib_1.aws_cloudfront.ResponseHeadersPolicy(this, `dist-rhp-ignore`, {
+            responseHeadersPolicyName: this.qpqResourceName(props.webEntryConfig.name, 'ignore'),
+            customHeadersBehavior: {
+                customHeaders: [
+                    {
+                        header: 'Cache-Control',
+                        value: `max-age=300, must-revalidate`,
+                        override: true,
+                    },
+                ],
+            },
+        });
+        props.webEntryConfig.ignoreCache.forEach((pathPattern) => {
+            distribution.addBehavior(pathPattern, distributionOrigin, {
+                cachePolicy: aws_cdk_lib_1.aws_cloudfront.CachePolicy.CACHING_DISABLED,
+                viewerProtocolPolicy: aws_cdk_lib_1.aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+                compress: props.webEntryConfig.compressFiles,
+                responseHeadersPolicy: ignoreCacheResponseHeaderPolicy,
+            });
+        });
     }
 }
 exports.QpqWebserverWebEntryConstruct = QpqWebserverWebEntryConstruct;

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export * from './qpqApp';
+export * from './QPQApp';
 export * from './constructs';
 export * from './stacks';
 export * as qpqDeployAwsCdkUtils from './utils';

package/lib/index.js

@@ -27,7 +27,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.qpqDeployAwsCdkUtils = void 0;
-__exportStar(require("./qpqApp"), exports);
+__exportStar(require("./QPQApp"), exports);
 __exportStar(require("./constructs"), exports);
 __exportStar(require("./stacks"), exports);
 exports.qpqDeployAwsCdkUtils = __importStar(require("./utils"));

package/lib/lambdas/lambdaAPIGatewayEvent.js

@@ -45,7 +45,7 @@ const getAPIGatewayEventExecutor = (dynamicModuleLoader, getCustomActionProcesso
         const cdkConfig = yield (0, lambdaConfig_1.getLambdaConfigs)();
         // Build a processor for the session and stuff
         // Remove the non route ones ~ let the story execute action add them
-        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getAPIGatewayEventActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getAPIGatewayEventActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
         const logger = (result) => __awaiter(void 0, void 0, void 0, function* () {
             // addResult(
             //   envConfig.appName,

package/lib/lambdas/lambdaEventBridgeEvent.js

@@ -30,7 +30,7 @@ const getEventBridgeEventExecutor = (dynamicModuleLoader, getCustomActionProcess
         const lambdaRuntimeConfig = JSON.parse(process.env.lambdaRuntimeConfig || '{}');
         // Build a processor for the session and stuff
         // Remove the  non event ones
-        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getEventBridgeEventActionProcessor)(lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getEventBridgeEventActionProcessor)(lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
         const logger = (result) => __awaiter(void 0, void 0, void 0, function* () { });
         // Run the callback
         const resolveStory = (0, quidproquo_core_1.createRuntime)({}, storyActionProcessor, getDateNow, logger, quidproquo_actionprocessor_awslambda_1.awsLambdaUtils.randomGuid);

package/lib/lambdas/lambdaEventOriginRequest.js

@@ -30,7 +30,7 @@ const getOriginRequestEventExecutor = (dynamicModuleLoader, getCustomActionProce
         const cdkConfig = yield (0, lambdaConfig_1.getLambdaConfigs)();
         // Build a processor for the session and stuff
         // Remove the non route ones ~ let the story execute action add them
-        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getCloudFrontOriginRequestEventActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getCloudFrontOriginRequestEventActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
         const logger = (result) => __awaiter(void 0, void 0, void 0, function* () { });
         // Run the callback
         const resolveStory = (0, quidproquo_core_1.createRuntime)({}, storyActionProcessor, getDateNow, logger, quidproquo_actionprocessor_awslambda_1.awsLambdaUtils.randomGuid);

package/lib/lambdas/lambdaSQSEvent.js

@@ -28,7 +28,7 @@ const getStoryActionRuntime = (dynamicModuleLoader, getCustomActionProcessors =
     const cdkConfig = yield (0, lambdaConfig_1.getLambdaConfigs)();
     // Build a processor for the session and stuff
     // Remove the non route ones ~ let the story execute action add them
-    const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getSQSEventRecordActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+    const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getSQSEventRecordActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
     const logger = (result) => __awaiter(void 0, void 0, void 0, function* () { });
     // Run the callback
     const resolveStory = (0, quidproquo_core_1.createRuntime)({}, storyActionProcessor, getDateNow, logger, quidproquo_actionprocessor_awslambda_1.awsLambdaUtils.randomGuid);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-deploy-awscdk",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",

package/src/{qpqApp.ts → QPQApp.ts}

@@ -1,5 +1,5 @@
-import * as cdk from 'aws-cdk-lib';
-
-export const createQPQApp = (): cdk.App => {
-  return new cdk.App();
-};
+import * as cdk from 'aws-cdk-lib';
+
+export const createQPQApp = (): cdk.App => {
+  return new cdk.App();
+};

package/src/constructs/basic/Function.ts

@@ -57,5 +57,13 @@ export class Function extends QpqConstructBlock {
         resources: ['*'],
       }),
     );
+
+    // Let lambdas invalidate cache for cloud front
+    this.lambdaFunction.addToRolePolicy(
+      new aws_iam.PolicyStatement({
+        actions: ['cloudfront:CreateInvalidation'],
+        resources: ['*'],
+      }),
+    );
   }
 }

package/src/constructs/feature/webserver/webEntry/QpqWebserverWebEntryConstruct.ts

@@ -18,6 +18,9 @@ import {
   qpqWebServerUtils,
   qpqHeaderIsBot,
 } from 'quidproquo-webserver';
+
+import { awsNamingUtils } from 'quidproquo-actionprocessor-awslambda';
+
 import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
 import { Construct } from 'constructs';
 
@@ -125,6 +128,23 @@ export class QpqWebserverWebEntryConstruct extends QpqConstructBlock {
       enableAcceptEncodingBrotli: true,
     });
 
+    const mustRevalidate = false;
+
+    const responseHeaderPolicy = new aws_cloudfront.ResponseHeadersPolicy(this, `dist-rhp`, {
+      responseHeadersPolicyName: this.resourceName(props.webEntryConfig.name),
+      customHeadersBehavior: {
+        customHeaders: [
+          {
+            header: 'Cache-Control',
+            value: `max-age=${props.webEntryConfig.cache.maxTTLInSeconds}${
+              props.webEntryConfig.cache.mustRevalidate ? ', must-revalidate' : ''
+            }`,
+            override: true,
+          },
+        ],
+      },
+    });
+
     // Create a CloudFront distribution using the S3 bucket as the origin
     const distributionOrigin = new aws_cloudfront_origins.S3Origin(originBucket);
     const distribution = new aws_cloudfront.Distribution(this, 'MyDistribution', {
@@ -132,7 +152,10 @@ export class QpqWebserverWebEntryConstruct extends QpqConstructBlock {
         origin: distributionOrigin,
         cachePolicy: cachePolicy,
         viewerProtocolPolicy: aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+        compress: props.webEntryConfig.compressFiles,
+        responseHeadersPolicy: responseHeaderPolicy,
       },
+
       domainNames: [deployDomain],
       certificate: myCertificate,
       defaultRootObject: props.webEntryConfig.indexRoot,
@@ -145,11 +168,14 @@ export class QpqWebserverWebEntryConstruct extends QpqConstructBlock {
       })),
     });
 
-    props.webEntryConfig.ignoreCache.forEach((pathPattern) => {
-      distribution.addBehavior(pathPattern, distributionOrigin, {
-        cachePolicy: aws_cloudfront.CachePolicy.CACHING_DISABLED,
-      });
-    });
+    qpqDeployAwsCdkUtils.exportStackValue(
+      this,
+      awsNamingUtils.getCFExportNameDistributionIdArnFromConfig(
+        props.webEntryConfig.name,
+        props.qpqConfig,
+      ),
+      distribution.distributionId,
+    );
 
     // TODO: Fix this when they add l2 support for origin access control settings
 
@@ -250,6 +276,9 @@ export class QpqWebserverWebEntryConstruct extends QpqConstructBlock {
         const wildcardPath = seo.path.replaceAll(/{(.+?)}/g, '*');
         distribution.addBehavior(wildcardPath, distributionOrigin, {
           cachePolicy: seoCachePolicy,
+          viewerProtocolPolicy: aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+          compress: props.webEntryConfig.compressFiles,
+          responseHeadersPolicy: responseHeaderPolicy,
           edgeLambdas: [
             {
               functionVersion: edgeFunctionVR.currentVersion,
@@ -263,5 +292,31 @@ export class QpqWebserverWebEntryConstruct extends QpqConstructBlock {
         });
       }
     }
+
+    const ignoreCacheResponseHeaderPolicy = new aws_cloudfront.ResponseHeadersPolicy(
+      this,
+      `dist-rhp-ignore`,
+      {
+        responseHeadersPolicyName: this.qpqResourceName(props.webEntryConfig.name, 'ignore'),
+        customHeadersBehavior: {
+          customHeaders: [
+            {
+              header: 'Cache-Control',
+              value: `max-age=300, must-revalidate`,
+              override: true,
+            },
+          ],
+        },
+      },
+    );
+
+    props.webEntryConfig.ignoreCache.forEach((pathPattern) => {
+      distribution.addBehavior(pathPattern, distributionOrigin, {
+        cachePolicy: aws_cloudfront.CachePolicy.CACHING_DISABLED,
+        viewerProtocolPolicy: aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+        compress: props.webEntryConfig.compressFiles,
+        responseHeadersPolicy: ignoreCacheResponseHeaderPolicy,
+      });
+    });
   }
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './qpqApp';
+export * from './QPQApp';
 export * from './constructs';
 export * from './stacks';
 

package/src/lambdas/lambdaAPIGatewayEvent.ts

@@ -10,6 +10,7 @@ import {
   getConfigGetParameterActionProcessor,
   getConfigGetParametersActionProcessor,
   getUserDirectoryActionProcessor,
+  getWebEntryActionProcessor,
   awsLambdaUtils,
   DynamicModuleLoader,
 } from 'quidproquo-actionprocessor-awslambda';
@@ -73,6 +74,7 @@ export const getAPIGatewayEventExecutor = (
       ...getQueueActionProcessor(cdkConfig.qpqConfig),
       ...getEventBusActionProcessor(cdkConfig.qpqConfig),
       ...getUserDirectoryActionProcessor(cdkConfig.qpqConfig),
+      ...getWebEntryActionProcessor(cdkConfig.qpqConfig),
 
       ...getCustomActionProcessors(cdkConfig.qpqConfig),
       ...qpqCustomActionProcessors(),

package/src/lambdas/lambdaEventBridgeEvent.ts

@@ -6,6 +6,7 @@ import {
   getFileActionProcessor,
   getQueueActionProcessor,
   getEventBusActionProcessor,
+  getWebEntryActionProcessor,
   getUserDirectoryActionProcessor,
   getConfigGetSecretActionProcessor,
   getConfigGetParameterActionProcessor,
@@ -59,6 +60,7 @@ export const getEventBridgeEventExecutor = (
       ...getConfigActionProcessor(cdkConfig.qpqConfig),
       ...getQueueActionProcessor(cdkConfig.qpqConfig),
       ...getEventBusActionProcessor(cdkConfig.qpqConfig),
+      ...getWebEntryActionProcessor(cdkConfig.qpqConfig),
       ...getUserDirectoryActionProcessor(cdkConfig.qpqConfig),
 
       ...getCustomActionProcessors(cdkConfig.qpqConfig),

package/src/lambdas/lambdaEventOriginRequest.ts

@@ -8,6 +8,7 @@ import {
   getConfigGetSecretActionProcessor,
   getConfigGetParameterActionProcessor,
   getConfigGetParametersActionProcessor,
+  getWebEntryActionProcessor,
   awsLambdaUtils,
   DynamicModuleLoader,
 } from 'quidproquo-actionprocessor-awslambda';
@@ -53,6 +54,7 @@ export const getOriginRequestEventExecutor = (
       ...getSystemActionProcessor(dynamicModuleLoader),
       ...getFileActionProcessor(cdkConfig.qpqConfig),
       ...getConfigActionProcessor(cdkConfig.qpqConfig),
+      ...getWebEntryActionProcessor(cdkConfig.qpqConfig),
 
       // We probably don't want this?
       ...getUserDirectoryActionProcessor(cdkConfig.qpqConfig),

package/src/lambdas/lambdaSQSEvent.ts

@@ -12,6 +12,7 @@ import {
   getConfigGetParameterActionProcessor,
   getConfigGetParametersActionProcessor,
   getUserDirectoryActionProcessor,
+  getWebEntryActionProcessor,
   awsLambdaUtils,
   DynamicModuleLoader,
 } from 'quidproquo-actionprocessor-awslambda';
@@ -61,6 +62,7 @@ export const getStoryActionRuntime = async (
     ...getQueueActionProcessor(cdkConfig.qpqConfig),
     ...getEventBusActionProcessor(cdkConfig.qpqConfig),
     ...getUserDirectoryActionProcessor(cdkConfig.qpqConfig),
+    ...getWebEntryActionProcessor(cdkConfig.qpqConfig),
 
     ...getCustomActionProcessors(cdkConfig.qpqConfig),
     ...qpqCustomActionProcessors(),