quidproquo-deploy-awscdk 0.0.43 → 0.0.44

package/lib/QPQPrototypeSingleServiceStack.d.ts

@@ -3,7 +3,6 @@ import { Stack } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 export interface QPQPrototypeStackProps extends DeploymentSettings {
     account: string;
-    region: string;
     apiBuildPath: string;
     webBuildPath: string;
     lambdaAPIGatewayEventPath?: string;

package/lib/QPQPrototypeSingleServiceStack.js

@@ -24,10 +24,31 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QPQPrototypeSingleServiceStack = void 0;
+const path = __importStar(require("path"));
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const cdk = __importStar(require("aws-cdk-lib"));
 const quidproquo_core_1 = require("quidproquo-core");
 const quidproquo_webserver_1 = require("quidproquo-webserver");
+const grantReadToOwnedResources = (ownedResourceSettings, identity) => {
+    ownedResourceSettings.ownedBuckets.forEach((b) => b.bucket.grantReadWrite(identity));
+    ownedResourceSettings.ownedSecrets.forEach((os) => os.secret.grantRead(identity));
+    ownedResourceSettings.ownedParameters.forEach((os) => os.parameter.grantRead(identity));
+};
+const getParameterName = (parameterKey, service, environment) => `${parameterKey}-${service}-${environment}`;
+const createServiceParameter = (stack, id, service, environment, parameterKey, value) => {
+    const realParameterName = getParameterName(parameterKey, service, environment);
+    return {
+        parameterName: parameterKey,
+        realName: realParameterName,
+        parameter: new aws_cdk_lib_1.aws_ssm.StringParameter(stack, `${id}-parameter-${parameterKey}`, {
+            parameterName: realParameterName,
+            description: `${environment}-${service}`,
+            stringValue: value,
+            // No additional costs ~ 4k max size
+            tier: aws_cdk_lib_1.aws_ssm.ParameterTier.STANDARD,
+        }),
+    };
+};
 const createApiDomainName = (stack, id, stackProps) => {
     const apexDomain = quidproquo_webserver_1.qpqWebServerUtils.getFeatureDomainName(stackProps.qpqConfig);
     const apiDomainName = `api.${apexDomain}`;
@@ -52,7 +73,7 @@ const createApiDomainName = (stack, id, stackProps) => {
     });
     return domainName;
 };
-const createWebDistribution = (stack, id, stackProps) => {
+const createWebDistribution = (stack, id, stackProps, ownedResourceSettings) => {
     const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(stackProps.qpqConfig);
     const apexDomain = quidproquo_webserver_1.qpqWebServerUtils.getFeatureDomainName(stackProps.qpqConfig);
     const serviceName = quidproquo_core_1.qpqCoreUtils.getAppName(stackProps.qpqConfig);
@@ -92,8 +113,52 @@ const createWebDistribution = (stack, id, stackProps) => {
         sources: [aws_cdk_lib_1.aws_s3_deployment.Source.asset(stackProps.webBuildPath)],
         destinationBucket: staticWebFilesBucket,
     });
+    const cloudFrontBehaviors = quidproquo_webserver_1.qpqWebServerUtils
+        .getAllSeo(stackProps.qpqConfig)
+        .map((seo, index) => {
+        const edgeFunctionVR = new aws_cdk_lib_1.aws_cloudfront.experimental.EdgeFunction(stack, `${id}-SEO-${index}-${seo.runtime}-VR`, {
+            functionName: `SEO-VR-${index}-${seo.runtime}-${environment}-${serviceName}`,
+            timeout: cdk.Duration.seconds(5),
+            runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
+            code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(stackProps.apiBuildPath, 'lambdaEventViewerRequest')),
+            handler: 'index.executeEventViewerRequest',
+        });
+        const edgeFunctionOR = new aws_cdk_lib_1.aws_cloudfront.experimental.EdgeFunction(stack, `${id}-SEO-${index}-${seo.runtime}-OR`, {
+            functionName: `SEO-OR-${index}-${seo.runtime}-${environment}-${serviceName}`,
+            timeout: cdk.Duration.seconds(30),
+            runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
+            memorySize: 1024,
+            code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(stackProps.apiBuildPath, 'lambdaEventOriginRequest')),
+            handler: 'index.executeEventOriginRequest',
+        });
+        // We don't need access to anything in the VR
+        grantReadToOwnedResources(ownedResourceSettings, edgeFunctionOR);
+        const wildcardPath = seo.path.replaceAll(/{(.+?)}/g, '*');
+        return {
+            pathPattern: wildcardPath,
+            // Update this to 24 hours
+            maxTtl: cdk.Duration.seconds(0),
+            minTtl: cdk.Duration.seconds(0),
+            defaultTtl: cdk.Duration.seconds(0),
+            lambdaFunctionAssociations: [
+                {
+                    includeBody: true,
+                    eventType: aws_cdk_lib_1.aws_cloudfront.LambdaEdgeEventType.ORIGIN_REQUEST,
+                    lambdaFunction: edgeFunctionOR.currentVersion,
+                },
+                {
+                    includeBody: false,
+                    eventType: aws_cdk_lib_1.aws_cloudfront.LambdaEdgeEventType.VIEWER_REQUEST,
+                    lambdaFunction: edgeFunctionVR.currentVersion,
+                },
+            ],
+        };
+    });
     // Create a cloud front distribution
     // TODO: use aws_cloudfront.Distribution
+    // TODO: Somehow expose query strings: Note ~
+    // (Lambda@Edge only) To access the query string in an origin request or origin response function,
+    // your cache policy or origin request policy must be set to All for Query strings.
     const distribution = new aws_cdk_lib_1.aws_cloudfront.CloudFrontWebDistribution(stack, 'cf-distribution', {
         originConfigs: [
             {
@@ -102,16 +167,7 @@ const createWebDistribution = (stack, id, stackProps) => {
                     originAccessIdentity: websiteOAI,
                 },
                 behaviors: [
-                    ...[
-                        '/remoteEntry.js',
-                        '/index.js',
-                        '/index.html', // Add this if we need it
-                    ].map((pp) => ({
-                        pathPattern: pp,
-                        maxTtl: cdk.Duration.seconds(0),
-                        minTtl: cdk.Duration.seconds(0),
-                        defaultTtl: cdk.Duration.seconds(0),
-                    })),
+                    ...cloudFrontBehaviors,
                     {
                         isDefaultBehavior: true,
                     },
@@ -140,7 +196,7 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
         super(scope, id, {
             env: {
                 account: props.account,
-                region: props.region,
+                region: quidproquo_webserver_1.qpqWebServerUtils.getDeployRegion(props.qpqConfig),
             },
         });
         const settings = {
@@ -148,7 +204,6 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
             service: quidproquo_core_1.qpqCoreUtils.getAppName(props.qpqConfig),
         };
         const domainName = createApiDomainName(this, id, props);
-        createWebDistribution(this, `${id}-web-dist`, props);
         const resourceName = (name) => {
             return `${settings.service}-${settings.environment}-${name}`;
         };
@@ -164,21 +219,10 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
                 }),
             };
         });
-        const ownedParameters = quidproquo_core_1.qpqCoreUtils.getOwnedParameters(props.qpqConfig).map((parameter) => {
-            const realParameterName = `${parameter.key}-${settings.service}-${settings.environment}`;
-            return {
-                parameterName: parameter.key,
-                realName: realParameterName,
-                parameter: new aws_cdk_lib_1.aws_ssm.StringParameter(this, `${id}-parameter-${parameter.key}`, {
-                    parameterName: realParameterName,
-                    description: `${settings.environment}-${settings.service}`,
-                    stringValue: parameter.value,
-                    // No additional costs ~ 4k max size
-                    tier: aws_cdk_lib_1.aws_ssm.ParameterTier.STANDARD,
-                }),
-            };
-        });
-        const buckets = quidproquo_core_1.qpqCoreUtils.getStorageDriveNames(props.qpqConfig).map((driveName) => {
+        const ownedParameters = quidproquo_core_1.qpqCoreUtils
+            .getOwnedParameters(props.qpqConfig)
+            .map((parameter) => createServiceParameter(this, id, settings.service, settings.environment, parameter.key, parameter.value));
+        const ownedBuckets = quidproquo_core_1.qpqCoreUtils.getStorageDriveNames(props.qpqConfig).map((driveName) => {
             const bucketName = resourceName(driveName);
             const bucket = new aws_cdk_lib_1.aws_s3.Bucket(this, bucketName, {
                 bucketName: resourceName(driveName),
@@ -199,25 +243,35 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
         const runtimeConfigLambdaConfig = {
             qpqConfig: props.qpqConfig,
             secretNameMap: ownedSecrets.reduce((acc, os) => (Object.assign(Object.assign({}, acc), { [os.secretName]: os.realName })), {}),
-            parameterNameMap: ownedParameters.reduce((acc, os) => (Object.assign(Object.assign({}, acc), { [os.parameterName]: os.realName })), {}),
-            resourceNameMap: buckets.reduce((acc, b) => (Object.assign(Object.assign({}, acc), { [b.driveName]: b.bucketName })), {}),
+            parameterNameMap: Object.assign(Object.assign({}, ownedParameters.reduce((acc, os) => (Object.assign(Object.assign({}, acc), { [os.parameterName]: os.realName })), {})), { ['qpqRuntimeConfig']: getParameterName('qpqRuntimeConfig', settings.service, settings.environment) }),
+            resourceNameMap: ownedBuckets.reduce((acc, b) => (Object.assign(Object.assign({}, acc), { [b.driveName]: b.bucketName })), {}),
+        };
+        // Build the param that stores the config
+        // Note: The mapping was done manually previously inside the value
+        ownedParameters.push(createServiceParameter(this, id, settings.service, settings.environment, 'qpqRuntimeConfig', JSON.stringify(runtimeConfigLambdaConfig)));
+        const ownedResourceSettings = {
+            ownedBuckets,
+            ownedParameters,
+            ownedSecrets,
         };
+        ////////////////////////////////////////////////////////////////////////////////////
+        // Finished building resources, now we can build the lambdas
+        ////////////////////////////////////////////////////////////////////////////////////
+        createWebDistribution(this, `${id}-web-dist`, props, ownedResourceSettings);
         const lambdaHandler = new aws_cdk_lib_1.aws_lambda.Function(this, `${settings.environment}-${settings.service}-lambda-rest`, {
             functionName: `lambda-rest-${settings.service}-${settings.environment}`,
             timeout: cdk.Duration.seconds(25),
             runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
             memorySize: 1024,
-            code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(props.apiBuildPath),
-            handler: 'lambdaAPIGatewayEvent.executeAPIGatewayEvent',
+            code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaAPIGatewayEvent')),
+            handler: 'index.executeAPIGatewayEvent',
             environment: {
                 TABLES: JSON.stringify([]),
                 lambdaRuntimeConfig: JSON.stringify(runtimeConfigLambdaConfig),
             },
         });
         // Grant access to the lambda
-        buckets.forEach((b) => b.bucket.grantReadWrite(lambdaHandler));
-        ownedSecrets.forEach((os) => os.secret.grantRead(lambdaHandler));
-        ownedParameters.forEach((os) => os.parameter.grantRead(lambdaHandler));
+        grantReadToOwnedResources(ownedResourceSettings, lambdaHandler);
         // Create a rest api
         const api = new aws_cdk_lib_1.aws_apigateway.LambdaRestApi(this, `${settings.environment}-${settings.service}-http-api`, {
             restApiName: `${settings.environment}-${settings.service}-http-api`,
@@ -241,8 +295,8 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
                 timeout: cdk.Duration.minutes(15),
                 runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
                 memorySize: 1024,
-                code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(props.apiBuildPath),
-                handler: 'lambdaEventBridgeEvent.executeEventBridgeEvent',
+                code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaEventBridgeEvent')),
+                handler: 'index.executeEventBridgeEvent',
                 environment: {
                     TABLES: JSON.stringify([]),
                     lambdaRuntimeConfig: JSON.stringify(Object.assign(Object.assign({}, runtimeConfigLambdaConfig), { lambdaRuntimeConfig: {
@@ -251,9 +305,7 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
                         } })),
                 },
             });
-            buckets.forEach((b) => b.bucket.grantReadWrite(schedulerFunction));
-            ownedSecrets.forEach((os) => os.secret.grantRead(schedulerFunction));
-            ownedParameters.forEach((os) => os.parameter.grantRead(schedulerFunction));
+            grantReadToOwnedResources(ownedResourceSettings, schedulerFunction);
             // EventBridge rule which runs every five minutes
             const cronRule = new aws_cdk_lib_1.aws_events.Rule(this, `${id}-se-cronrule-${index}`, {
                 schedule: aws_cdk_lib_1.aws_events.Schedule.expression(`cron(${se.cronExpression})`),

package/lib/lambdas/actionProcessorListResolver.d.ts

@@ -0,0 +1,3 @@
+import { ActionProcessorList } from 'quidproquo-core';
+import { QPQAWSLambdaConfig } from 'quidproquo-actionprocessor-awslambda';
+export type ActionProcessorListResolver = (lambdaRuntimeConfig: QPQAWSLambdaConfig) => ActionProcessorList;

package/lib/lambdas/actionProcessorListResolver.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/lambdas/awsLambdaMissingTypes.d.ts

@@ -0,0 +1,51 @@
+interface CloudFrontConfig {
+    distributionDomainName: string;
+    distributionId: string;
+    eventType: string;
+    requestId: string;
+}
+interface Body {
+    action: string;
+    data: string;
+    encoding: string;
+    inputTruncated: boolean;
+}
+interface KeyValueHeader {
+    key: string;
+    value: string;
+}
+interface Headers {
+    [key: string]: KeyValueHeader[];
+}
+interface CustomHeaders {
+}
+interface S3 {
+    authMethod: string;
+    customHeaders: CustomHeaders;
+    domainName: string;
+    path: string;
+    region: string;
+}
+interface Origin {
+    s3: S3;
+}
+interface CloudFrontOriginRequest {
+    body?: Body;
+    clientIp: string;
+    headers: Headers;
+    method: string;
+    origin: Origin;
+    querystring: string;
+    uri: string;
+}
+interface CloudFrontOriginConfigRequest {
+    config: CloudFrontConfig;
+    request: CloudFrontOriginRequest;
+}
+interface CloudFrontRecord {
+    cf: CloudFrontOriginConfigRequest;
+}
+export interface CloudFrontOriginRequestEvent {
+    Records: CloudFrontRecord[];
+}
+export {};

package/lib/lambdas/awsLambdaMissingTypes.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/lambdas/lambdaAPIGatewayEvent.d.ts

@@ -1,6 +1,6 @@
 import { DynamicModuleLoader } from 'quidproquo-actionprocessor-awslambda';
 import { Context } from 'aws-lambda';
-import { ActionProcessorListResolver } from './lambdaConfig';
+import { ActionProcessorListResolver } from './actionProcessorListResolver';
 export declare const getAPIGatewayEventExecutor: (dynamicModuleLoader: DynamicModuleLoader, getCustomActionProcessors?: ActionProcessorListResolver) => (event: import("aws-lambda").APIGatewayProxyEvent, context: Context) => Promise<{
     statusCode: any;
     body: string;

package/lib/lambdas/lambdaAPIGatewayEvent.js

@@ -63,7 +63,6 @@ const getAPIGatewayEventExecutor = (dynamicModuleLoader, getCustomActionProcesso
                 headers: result.result.headers,
             };
         }
-        console.log(JSON.stringify(result));
         const code = ErrorTypeHttpResponseMap[result.error.errorType];
         return {
             statusCode: code || 500,

package/lib/lambdas/lambdaConfig copy.d.ts

@@ -0,0 +1,4 @@
+import { ActionProcessorList } from 'quidproquo-core';
+import { QPQAWSLambdaConfig } from 'quidproquo-actionprocessor-awslambda';
+export declare const lambdaRuntimeConfig: QPQAWSLambdaConfig;
+export type ActionProcessorListResolver = (lambdaRuntimeConfig: QPQAWSLambdaConfig) => ActionProcessorList;

package/lib/lambdas/lambdaConfig copy.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.lambdaRuntimeConfig = void 0;
+exports.lambdaRuntimeConfig = JSON.parse(process.env.lambdaRuntimeConfig || '{}');

package/lib/lambdas/lambdaConfig.d.ts

@@ -1,4 +1,2 @@
-import { ActionProcessorList } from 'quidproquo-core';
 import { QPQAWSLambdaConfig } from 'quidproquo-actionprocessor-awslambda';
 export declare const lambdaRuntimeConfig: QPQAWSLambdaConfig;
-export type ActionProcessorListResolver = (lambdaRuntimeConfig: QPQAWSLambdaConfig) => ActionProcessorList;

package/lib/lambdas/lambdaEventBridgeEvent.d.ts

@@ -1,5 +1,5 @@
 import { DynamicModuleLoader } from 'quidproquo-actionprocessor-awslambda';
 import { EventBridgeEvent, Context } from 'aws-lambda';
-import { ActionProcessorListResolver } from './lambdaConfig';
+import { ActionProcessorListResolver } from './actionProcessorListResolver';
 export declare const getEventBridgeEventExecutor: (dynamicModuleLoader: DynamicModuleLoader, getCustomActionProcessors?: ActionProcessorListResolver) => (event: EventBridgeEvent<string, void>, context: Context) => Promise<void>;
 export declare const executeEventBridgeEvent: (event: EventBridgeEvent<string, void>, context: Context) => Promise<void>;

package/lib/lambdas/lambdaEventOriginRequest copy.d.ts

@@ -0,0 +1,5 @@
+import { DynamicModuleLoader } from 'quidproquo-actionprocessor-awslambda';
+import { CloudFrontRequestEvent, Context } from 'aws-lambda';
+import { ActionProcessorListResolver } from './actionProcessorListResolver';
+export declare const getOriginRequestEventExecutor: (dynamicModuleLoader: DynamicModuleLoader, getCustomActionProcessors?: ActionProcessorListResolver) => (event: CloudFrontRequestEvent, context: Context) => Promise<any>;
+export declare const executeEventOriginRequest: (event: CloudFrontRequestEvent, context: Context) => Promise<any>;

package/lib/lambdas/lambdaEventOriginRequest copy.js

@@ -0,0 +1,74 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeEventOriginRequest = exports.getOriginRequestEventExecutor = void 0;
+const quidproquo_actionprocessor_node_1 = require("quidproquo-actionprocessor-node");
+const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
+const quidproquo_core_1 = require("quidproquo-core");
+// @ts-ignore - Special webpack loader
+const qpq_dynamic_loader_1 = __importDefault(require("qpq-dynamic-loader!"));
+// @ts-ignore - Special webpack loader
+// import qpqConfig from 'qpq-config-loader!';
+// TODO: Make this a util or something based on server time or something..
+const getDateNow = () => new Date().toISOString();
+const ErrorTypeHttpResponseMap = {
+    [quidproquo_core_1.ErrorTypeEnum.NoContent]: 204,
+    [quidproquo_core_1.ErrorTypeEnum.BadRequest]: 400,
+    [quidproquo_core_1.ErrorTypeEnum.Unauthorized]: 401,
+    [quidproquo_core_1.ErrorTypeEnum.PaymentRequired]: 402,
+    [quidproquo_core_1.ErrorTypeEnum.Forbidden]: 403,
+    [quidproquo_core_1.ErrorTypeEnum.NotFound]: 404,
+    [quidproquo_core_1.ErrorTypeEnum.TimeOut]: 408,
+    [quidproquo_core_1.ErrorTypeEnum.UnsupportedMediaType]: 415,
+    [quidproquo_core_1.ErrorTypeEnum.Invalid]: 422,
+    [quidproquo_core_1.ErrorTypeEnum.OutOfResources]: 500,
+    [quidproquo_core_1.ErrorTypeEnum.GenericError]: 500,
+    [quidproquo_core_1.ErrorTypeEnum.NotImplemented]: 501,
+};
+const getOriginRequestEventExecutor = (dynamicModuleLoader, getCustomActionProcessors = () => ({})) => {
+    return (event, context) => __awaiter(void 0, void 0, void 0, function* () {
+        console.log('AAAAAAAAAAAAAAAAA');
+        // TODO: Make this error safe
+        const param = yield (0, quidproquo_actionprocessor_awslambda_1.getParameter)('qpqRuntimeConfig-theconspiracytest-development');
+        const lambdaRuntimeConfig = JSON.parse(param);
+        // //////////////////////////
+        console.log('BBBBBBBBBB');
+        // 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({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getCloudFrontOriginRequestEventActionProcessor)(lambdaRuntimeConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(lambdaRuntimeConfig)), getCustomActionProcessors(lambdaRuntimeConfig));
+        console.log('CCCCCCCCCCCCCCC');
+        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);
+        console.log('DDDDDDDDDDDD');
+        const result = yield resolveStory(quidproquo_core_1.askProcessEvent, [event, context]);
+        console.log('EEEEEEEEEEEEEE');
+        console.log(JSON.stringify(result));
+        // Run the callback
+        if (!result.error) {
+            return result.result;
+        }
+        console.log('FFFFFFFFFFFFFFFFFFF');
+        const code = ErrorTypeHttpResponseMap[result.error.errorType];
+        return {
+            statusCode: code || 500,
+            statusDescription: result.error.errorType,
+            body: JSON.stringify(result.error),
+            headers: {},
+        };
+    });
+};
+exports.getOriginRequestEventExecutor = getOriginRequestEventExecutor;
+// Default executor
+exports.executeEventOriginRequest = (0, exports.getOriginRequestEventExecutor)(qpq_dynamic_loader_1.default);

package/lib/lambdas/lambdaEventOriginRequest.d.ts

@@ -0,0 +1,15 @@
+import { DynamicModuleLoader } from 'quidproquo-actionprocessor-awslambda';
+import { CloudFrontRequestEvent, Context } from 'aws-lambda';
+import { ActionProcessorListResolver } from './actionProcessorListResolver';
+export declare const getOriginRequestEventExecutor: (dynamicModuleLoader: DynamicModuleLoader, getCustomActionProcessors?: ActionProcessorListResolver) => (event: CloudFrontRequestEvent, context: Context) => Promise<import("aws-lambda").CloudFrontRequest | {
+    status: string;
+    statusDescription: string;
+    body: any;
+    headers: {};
+}>;
+export declare const executeEventOriginRequest: (event: CloudFrontRequestEvent, context: Context) => Promise<import("aws-lambda").CloudFrontRequest | {
+    status: string;
+    statusDescription: string;
+    body: any;
+    headers: {};
+}>;

package/lib/lambdas/lambdaEventOriginRequest.js

@@ -0,0 +1,75 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeEventOriginRequest = exports.getOriginRequestEventExecutor = void 0;
+const quidproquo_actionprocessor_node_1 = require("quidproquo-actionprocessor-node");
+const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
+const quidproquo_webserver_1 = require("quidproquo-webserver");
+const quidproquo_core_1 = require("quidproquo-core");
+// @ts-ignore - Special webpack loader
+const qpq_dynamic_loader_1 = __importDefault(require("qpq-dynamic-loader!"));
+// @ts-ignore - Special webpack loader
+const qpq_config_loader_1 = __importDefault(require("qpq-config-loader!"));
+// TODO: Make this a util or something based on server time or something..
+const getDateNow = () => new Date().toISOString();
+const getOriginRequestEventExecutor = (dynamicModuleLoader, getCustomActionProcessors = () => ({})) => {
+    return (event, context) => __awaiter(void 0, void 0, void 0, function* () {
+        // Don't run the lambda if we are not a bot
+        if (event.Records[0].cf.request.headers['x-qpq-is-bot'][0].value !== 'true') {
+            return event.Records[0].cf.request;
+        }
+        // TODO: Make this error safe
+        const service = quidproquo_core_1.qpqCoreUtils.getAppName(qpq_config_loader_1.default);
+        const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(qpq_config_loader_1.default);
+        const param = yield (0, quidproquo_actionprocessor_awslambda_1.getParameter)(`qpqRuntimeConfig-${service}-${environment}`, quidproquo_webserver_1.qpqWebServerUtils.getDeployRegion(qpq_config_loader_1.default));
+        const lambdaRuntimeConfig = JSON.parse(param);
+        // //////////////////////////
+        // 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({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getCloudFrontOriginRequestEventActionProcessor)(lambdaRuntimeConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(lambdaRuntimeConfig)), getCustomActionProcessors(lambdaRuntimeConfig));
+        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);
+        const result = yield resolveStory(quidproquo_core_1.askProcessEvent, [event, context]);
+        // Run the callback
+        if (!result.error) {
+            // TODO: Get typing to work here.
+            if (result.result.fallbackToCDN) {
+                // to forward the result to the origin, just return the request
+                // it has the origin details.
+                return event.Records[0].cf.request;
+            }
+            const headers = result.result.headers || {};
+            const responseHeaders = Object.keys(headers).reduce((acc, header) => (Object.assign(Object.assign({}, acc), { [header]: [{ value: headers[header] }] })), {});
+            return {
+                status: `${result.result.status}`,
+                statusDescription: 'OK',
+                body: result.result.body,
+                headers: responseHeaders,
+            };
+        }
+        // CloudFront seems to throw an error when you send back a 404 or something, so we will just hit the normal origin
+        return event.Records[0].cf.request;
+        // const code = ErrorTypeHttpResponseMap[result.error.errorType];
+        // return {
+        //   statusCode: code || 500,
+        //   statusDescription: result.error.errorType,
+        //   body: JSON.stringify(result.error),
+        //   headers: {},
+        // };
+    });
+};
+exports.getOriginRequestEventExecutor = getOriginRequestEventExecutor;
+// Default executor
+exports.executeEventOriginRequest = (0, exports.getOriginRequestEventExecutor)(qpq_dynamic_loader_1.default);

package/lib/lambdas/lambdaEventViewerRequest.d.ts

@@ -0,0 +1,39 @@
+import { CloudFrontRequestEvent, Context } from 'aws-lambda';
+export declare const getViewerRequestEventExecutor: () => (event: CloudFrontRequestEvent, context: Context) => Promise<{
+    headers: {
+        "x-qpq-is-bot": {
+            key: string;
+            value: string;
+        }[];
+    };
+    body?: {
+        action: "read-only" | "replace";
+        data: string;
+        encoding: "base64" | "text";
+        readonly inputTruncated: boolean;
+    } | undefined;
+    clientIp: string;
+    method: string;
+    uri: string;
+    querystring: string;
+    origin?: import("aws-lambda").CloudFrontOrigin | undefined;
+}>;
+export declare const executeEventViewerRequest: (event: CloudFrontRequestEvent, context: Context) => Promise<{
+    headers: {
+        "x-qpq-is-bot": {
+            key: string;
+            value: string;
+        }[];
+    };
+    body?: {
+        action: "read-only" | "replace";
+        data: string;
+        encoding: "base64" | "text";
+        readonly inputTruncated: boolean;
+    } | undefined;
+    clientIp: string;
+    method: string;
+    uri: string;
+    querystring: string;
+    origin?: import("aws-lambda").CloudFrontOrigin | undefined;
+}>;

package/lib/lambdas/lambdaEventViewerRequest.js

@@ -0,0 +1,31 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeEventViewerRequest = exports.getViewerRequestEventExecutor = void 0;
+const getViewerRequestEventExecutor = () => {
+    return (event, context) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const request = event.Records[0].cf.request;
+        const headers = request.headers;
+        const customUserAgentHeaderName = 'x-qpq-is-bot';
+        const userAgent = ((_a = headers['user-agent'][0]) === null || _a === void 0 ? void 0 : _a.value) || 'unknown';
+        let isBot = userAgent.match(/bot|crawl|spider|slurp|facebot|facebookexternalhit/i);
+        return Object.assign(Object.assign({}, request), { headers: Object.assign(Object.assign({}, request.headers), { [customUserAgentHeaderName]: [
+                    {
+                        key: customUserAgentHeaderName,
+                        value: isBot ? 'true' : 'false',
+                    },
+                ] }) });
+    });
+};
+exports.getViewerRequestEventExecutor = getViewerRequestEventExecutor;
+// Default executor
+exports.executeEventViewerRequest = (0, exports.getViewerRequestEventExecutor)();

package/lib/lambdas/types.d.ts

@@ -0,0 +1,51 @@
+interface CloudFrontConfig {
+    distributionDomainName: string;
+    distributionId: string;
+    eventType: string;
+    requestId: string;
+}
+interface Body {
+    action: string;
+    data: string;
+    encoding: string;
+    inputTruncated: boolean;
+}
+interface KeyValueHeader {
+    key: string;
+    value: string;
+}
+interface Headers {
+    [key: string]: KeyValueHeader[];
+}
+interface CustomHeaders {
+}
+interface S3 {
+    authMethod: string;
+    customHeaders: CustomHeaders;
+    domainName: string;
+    path: string;
+    region: string;
+}
+interface Origin {
+    s3: S3;
+}
+interface CloudFrontOriginRequest {
+    body?: Body;
+    clientIp: string;
+    headers: Headers;
+    method: string;
+    origin: Origin;
+    querystring: string;
+    uri: string;
+}
+interface CloudFrontOriginConfigRequest {
+    config: CloudFrontConfig;
+    request: CloudFrontOriginRequest;
+}
+interface CloudFrontRecord {
+    cf: CloudFrontOriginConfigRequest;
+}
+export interface CloudFrontOriginRequestEvent {
+    Records: CloudFrontRecord[];
+}
+export {};

package/lib/lambdas/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-deploy-awscdk",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",
@@ -12,7 +12,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "npx rimraf lib",
     "build": "",
-    "watch": "npm run clean && tsc -w"
+    "watch": "tsc -w"
   },
   "repository": {
     "type": "git",

package/src/QPQPrototypeSingleServiceStack.ts

@@ -28,7 +28,6 @@ import { qpqWebServerUtils } from 'quidproquo-webserver';
 
 export interface QPQPrototypeStackProps extends DeploymentSettings {
   account: string;
-  region: string;
 
   apiBuildPath: string;
   webBuildPath: string;
@@ -37,6 +36,65 @@ export interface QPQPrototypeStackProps extends DeploymentSettings {
   lambdaEventBridgeEventPath?: string;
 }
 
+interface OwnedBucket {
+  driveName: string;
+  bucketName: string;
+  bucket: aws_s3.Bucket;
+}
+
+interface OwnedSecret {
+  secretName: string;
+  realName: string;
+  secret: aws_secretsmanager.Secret;
+}
+
+interface OwnedParameter {
+  parameterName: string;
+  realName: string;
+  parameter: aws_ssm.StringParameter;
+}
+
+interface OwnedResourceSettings {
+  ownedBuckets: OwnedBucket[];
+  ownedSecrets: OwnedSecret[];
+  ownedParameters: OwnedParameter[];
+}
+
+const grantReadToOwnedResources = (
+  ownedResourceSettings: OwnedResourceSettings,
+  identity: cdk.aws_iam.IGrantable,
+) => {
+  ownedResourceSettings.ownedBuckets.forEach((b) => b.bucket.grantReadWrite(identity));
+  ownedResourceSettings.ownedSecrets.forEach((os) => os.secret.grantRead(identity));
+  ownedResourceSettings.ownedParameters.forEach((os) => os.parameter.grantRead(identity));
+};
+
+const getParameterName = (parameterKey: string, service: string, environment: string) =>
+  `${parameterKey}-${service}-${environment}`;
+
+const createServiceParameter = (
+  stack: cdk.Stack,
+  id: string,
+  service: string,
+  environment: string,
+  parameterKey: string,
+  value: string,
+) => {
+  const realParameterName = getParameterName(parameterKey, service, environment);
+  return {
+    parameterName: parameterKey,
+    realName: realParameterName,
+    parameter: new aws_ssm.StringParameter(stack, `${id}-parameter-${parameterKey}`, {
+      parameterName: realParameterName,
+      description: `${environment}-${service}`,
+      stringValue: value,
+
+      // No additional costs ~ 4k max size
+      tier: aws_ssm.ParameterTier.STANDARD,
+    }),
+  };
+};
+
 const createApiDomainName = (stack: cdk.Stack, id: string, stackProps: QPQPrototypeStackProps) => {
   const apexDomain = qpqWebServerUtils.getFeatureDomainName(stackProps.qpqConfig);
 
@@ -74,6 +132,7 @@ const createWebDistribution = (
   stack: cdk.Stack,
   id: string,
   stackProps: QPQPrototypeStackProps,
+  ownedResourceSettings: OwnedResourceSettings,
 ) => {
   const environment = qpqCoreUtils.getAppFeature(stackProps.qpqConfig);
   const apexDomain = qpqWebServerUtils.getFeatureDomainName(stackProps.qpqConfig);
@@ -127,8 +186,74 @@ const createWebDistribution = (
     destinationBucket: staticWebFilesBucket,
   });
 
+  const cloudFrontBehaviors = qpqWebServerUtils
+    .getAllSeo(stackProps.qpqConfig)
+    .map((seo, index) => {
+      const edgeFunctionVR = new aws_cloudfront.experimental.EdgeFunction(
+        stack,
+        `${id}-SEO-${index}-${seo.runtime}-VR`,
+        {
+          functionName: `SEO-VR-${index}-${seo.runtime}-${environment}-${serviceName}`,
+          timeout: cdk.Duration.seconds(5),
+          runtime: aws_lambda.Runtime.NODEJS_16_X,
+
+          code: aws_lambda.Code.fromAsset(
+            path.join(stackProps.apiBuildPath, 'lambdaEventViewerRequest'),
+          ),
+          handler: 'index.executeEventViewerRequest',
+        },
+      );
+
+      const edgeFunctionOR = new aws_cloudfront.experimental.EdgeFunction(
+        stack,
+        `${id}-SEO-${index}-${seo.runtime}-OR`,
+        {
+          functionName: `SEO-OR-${index}-${seo.runtime}-${environment}-${serviceName}`,
+          timeout: cdk.Duration.seconds(30),
+          runtime: aws_lambda.Runtime.NODEJS_16_X,
+
+          memorySize: 1024,
+
+          code: aws_lambda.Code.fromAsset(
+            path.join(stackProps.apiBuildPath, 'lambdaEventOriginRequest'),
+          ),
+          handler: 'index.executeEventOriginRequest',
+        },
+      );
+
+      // We don't need access to anything in the VR
+      grantReadToOwnedResources(ownedResourceSettings, edgeFunctionOR);
+
+      const wildcardPath = seo.path.replaceAll(/{(.+?)}/g, '*');
+
+      return {
+        pathPattern: wildcardPath,
+
+        // Update this to 24 hours
+        maxTtl: cdk.Duration.seconds(0),
+        minTtl: cdk.Duration.seconds(0),
+        defaultTtl: cdk.Duration.seconds(0),
+
+        lambdaFunctionAssociations: [
+          {
+            includeBody: true,
+            eventType: aws_cloudfront.LambdaEdgeEventType.ORIGIN_REQUEST,
+            lambdaFunction: edgeFunctionOR.currentVersion,
+          },
+          {
+            includeBody: false,
+            eventType: aws_cloudfront.LambdaEdgeEventType.VIEWER_REQUEST,
+            lambdaFunction: edgeFunctionVR.currentVersion,
+          },
+        ],
+      };
+    });
+
   // Create a cloud front distribution
   // TODO: use aws_cloudfront.Distribution
+  // TODO: Somehow expose query strings: Note ~
+  // (Lambda@Edge only) To access the query string in an origin request or origin response function,
+  // your cache policy or origin request policy must be set to All for Query strings.
   const distribution = new aws_cloudfront.CloudFrontWebDistribution(stack, 'cf-distribution', {
     originConfigs: [
       {
@@ -137,16 +262,7 @@ const createWebDistribution = (
           originAccessIdentity: websiteOAI,
         },
         behaviors: [
-          ...[
-            '/remoteEntry.js',
-            '/index.js', // Add this if we need it
-            '/index.html', // Add this if we need it
-          ].map((pp) => ({
-            pathPattern: pp,
-            maxTtl: cdk.Duration.seconds(0),
-            minTtl: cdk.Duration.seconds(0),
-            defaultTtl: cdk.Duration.seconds(0),
-          })),
+          ...cloudFrontBehaviors,
           {
             isDefaultBehavior: true,
           },
@@ -180,7 +296,7 @@ export class QPQPrototypeSingleServiceStack extends Stack {
     super(scope, id, {
       env: {
         account: props.account,
-        region: props.region,
+        region: qpqWebServerUtils.getDeployRegion(props.qpqConfig),
       },
     });
 
@@ -191,8 +307,6 @@ export class QPQPrototypeSingleServiceStack extends Stack {
 
     const domainName = createApiDomainName(this, id, props);
 
-    createWebDistribution(this, `${id}-web-dist`, props);
-
     const resourceName = (name: string) => {
       return `${settings.service}-${settings.environment}-${name}`;
     };
@@ -210,23 +324,20 @@ export class QPQPrototypeSingleServiceStack extends Stack {
       };
     });
 
-    const ownedParameters = qpqCoreUtils.getOwnedParameters(props.qpqConfig).map((parameter) => {
-      const realParameterName = `${parameter.key}-${settings.service}-${settings.environment}`;
-      return {
-        parameterName: parameter.key,
-        realName: realParameterName,
-        parameter: new aws_ssm.StringParameter(this, `${id}-parameter-${parameter.key}`, {
-          parameterName: realParameterName,
-          description: `${settings.environment}-${settings.service}`,
-          stringValue: parameter.value,
-
-          // No additional costs ~ 4k max size
-          tier: aws_ssm.ParameterTier.STANDARD,
-        }),
-      };
-    });
+    const ownedParameters = qpqCoreUtils
+      .getOwnedParameters(props.qpqConfig)
+      .map((parameter) =>
+        createServiceParameter(
+          this,
+          id,
+          settings.service,
+          settings.environment,
+          parameter.key,
+          parameter.value,
+        ),
+      );
 
-    const buckets = qpqCoreUtils.getStorageDriveNames(props.qpqConfig).map((driveName) => {
+    const ownedBuckets = qpqCoreUtils.getStorageDriveNames(props.qpqConfig).map((driveName) => {
       const bucketName = resourceName(driveName);
 
       const bucket = new aws_s3.Bucket(this, bucketName, {
@@ -258,14 +369,21 @@ export class QPQPrototypeSingleServiceStack extends Stack {
         }),
         {},
       ),
-      parameterNameMap: ownedParameters.reduce(
-        (acc, os) => ({
-          ...acc,
-          [os.parameterName]: os.realName,
-        }),
-        {},
-      ),
-      resourceNameMap: buckets.reduce(
+      parameterNameMap: {
+        ...ownedParameters.reduce(
+          (acc, os) => ({
+            ...acc,
+            [os.parameterName]: os.realName,
+          }),
+          {},
+        ),
+        ['qpqRuntimeConfig']: getParameterName(
+          'qpqRuntimeConfig',
+          settings.service,
+          settings.environment,
+        ),
+      },
+      resourceNameMap: ownedBuckets.reduce(
         (acc, b) => ({
           ...acc,
           [b.driveName]: b.bucketName,
@@ -274,6 +392,31 @@ export class QPQPrototypeSingleServiceStack extends Stack {
       ),
     };
 
+    // Build the param that stores the config
+    // Note: The mapping was done manually previously inside the value
+    ownedParameters.push(
+      createServiceParameter(
+        this,
+        id,
+        settings.service,
+        settings.environment,
+        'qpqRuntimeConfig',
+        JSON.stringify(runtimeConfigLambdaConfig),
+      ),
+    );
+
+    const ownedResourceSettings: OwnedResourceSettings = {
+      ownedBuckets,
+      ownedParameters,
+      ownedSecrets,
+    };
+
+    ////////////////////////////////////////////////////////////////////////////////////
+    // Finished building resources, now we can build the lambdas
+    ////////////////////////////////////////////////////////////////////////////////////
+
+    createWebDistribution(this, `${id}-web-dist`, props, ownedResourceSettings);
+
     const lambdaHandler = new aws_lambda.Function(
       this,
       `${settings.environment}-${settings.service}-lambda-rest`,
@@ -284,8 +427,8 @@ export class QPQPrototypeSingleServiceStack extends Stack {
         runtime: aws_lambda.Runtime.NODEJS_16_X,
         memorySize: 1024,
 
-        code: aws_lambda.Code.fromAsset(props.apiBuildPath),
-        handler: 'lambdaAPIGatewayEvent.executeAPIGatewayEvent',
+        code: aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaAPIGatewayEvent')),
+        handler: 'index.executeAPIGatewayEvent',
 
         environment: {
           TABLES: JSON.stringify([]),
@@ -295,9 +438,7 @@ export class QPQPrototypeSingleServiceStack extends Stack {
     );
 
     // Grant access to the lambda
-    buckets.forEach((b) => b.bucket.grantReadWrite(lambdaHandler));
-    ownedSecrets.forEach((os) => os.secret.grantRead(lambdaHandler));
-    ownedParameters.forEach((os) => os.parameter.grantRead(lambdaHandler));
+    grantReadToOwnedResources(ownedResourceSettings, lambdaHandler);
 
     // Create a rest api
     const api = new aws_apigateway.LambdaRestApi(
@@ -334,8 +475,8 @@ export class QPQPrototypeSingleServiceStack extends Stack {
           runtime: aws_lambda.Runtime.NODEJS_16_X,
           memorySize: 1024,
 
-          code: aws_lambda.Code.fromAsset(props.apiBuildPath),
-          handler: 'lambdaEventBridgeEvent.executeEventBridgeEvent',
+          code: aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaEventBridgeEvent')),
+          handler: 'index.executeEventBridgeEvent',
 
           environment: {
             TABLES: JSON.stringify([]),
@@ -350,9 +491,7 @@ export class QPQPrototypeSingleServiceStack extends Stack {
         },
       );
 
-      buckets.forEach((b) => b.bucket.grantReadWrite(schedulerFunction));
-      ownedSecrets.forEach((os) => os.secret.grantRead(schedulerFunction));
-      ownedParameters.forEach((os) => os.parameter.grantRead(schedulerFunction));
+      grantReadToOwnedResources(ownedResourceSettings, schedulerFunction);
 
       // EventBridge rule which runs every five minutes
       const cronRule = new aws_events.Rule(this, `${id}-se-cronrule-${index}`, {

package/src/lambdas/actionProcessorListResolver.ts

@@ -0,0 +1,6 @@
+import { ActionProcessorList } from 'quidproquo-core';
+import { QPQAWSLambdaConfig } from 'quidproquo-actionprocessor-awslambda';
+
+export type ActionProcessorListResolver = (
+  lambdaRuntimeConfig: QPQAWSLambdaConfig,
+) => ActionProcessorList;

package/src/lambdas/lambdaAPIGatewayEvent.ts

@@ -17,7 +17,8 @@ import { createRuntime, askProcessEvent, ErrorTypeEnum } from 'quidproquo-core';
 
 import { APIGatewayEvent, Context } from 'aws-lambda';
 
-import { lambdaRuntimeConfig, ActionProcessorListResolver } from './lambdaConfig';
+import { lambdaRuntimeConfig } from './lambdaConfig';
+import { ActionProcessorListResolver } from './actionProcessorListResolver';
 
 // @ts-ignore - Special webpack loader
 import qpqDynamicModuleLoader from 'qpq-dynamic-loader!';
@@ -94,7 +95,6 @@ export const getAPIGatewayEventExecutor = (
       };
     }
 
-    console.log(JSON.stringify(result));
     const code = ErrorTypeHttpResponseMap[result.error.errorType];
     return {
       statusCode: code || 500,

package/src/lambdas/lambdaConfig.ts

@@ -1,10 +1,5 @@
-import { ActionProcessorList } from 'quidproquo-core';
 import { QPQAWSLambdaConfig } from 'quidproquo-actionprocessor-awslambda';
 
 export const lambdaRuntimeConfig = JSON.parse(
   process.env.lambdaRuntimeConfig || '{}',
 ) as QPQAWSLambdaConfig;
-
-export type ActionProcessorListResolver = (
-  lambdaRuntimeConfig: QPQAWSLambdaConfig,
-) => ActionProcessorList;

package/src/lambdas/lambdaEventBridgeEvent.ts

@@ -14,7 +14,8 @@ import { createRuntime, askProcessEvent } from 'quidproquo-core';
 
 import { EventBridgeEvent, Context } from 'aws-lambda';
 
-import { lambdaRuntimeConfig, ActionProcessorListResolver } from './lambdaConfig';
+import { lambdaRuntimeConfig } from './lambdaConfig';
+import { ActionProcessorListResolver } from './actionProcessorListResolver';
 
 // @ts-ignore - Special webpack loader
 import qpqDynamicModuleLoader from 'qpq-dynamic-loader!';

package/src/lambdas/lambdaEventOriginRequest.ts

@@ -0,0 +1,120 @@
+import { coreActionProcessor, webserverActionProcessor } from 'quidproquo-actionprocessor-node';
+
+import {
+  getCloudFrontOriginRequestEventActionProcessor,
+  getSystemActionProcessor,
+  getFileActionProcessor,
+  getConfigGetSecretActionProcessor,
+  getConfigGetParameterActionProcessor,
+  getConfigGetParametersActionProcessor,
+  awsLambdaUtils,
+  QPQAWSLambdaConfig,
+  DynamicModuleLoader,
+  getParameter,
+} from 'quidproquo-actionprocessor-awslambda';
+
+import { qpqWebServerUtils } from 'quidproquo-webserver';
+
+import { createRuntime, askProcessEvent, ErrorTypeEnum, qpqCoreUtils } from 'quidproquo-core';
+
+import { CloudFrontRequestEvent, Context } from 'aws-lambda';
+
+import { ActionProcessorListResolver } from './actionProcessorListResolver';
+
+// @ts-ignore - Special webpack loader
+import qpqDynamicModuleLoader from 'qpq-dynamic-loader!';
+
+// @ts-ignore - Special webpack loader
+import qpqConfig from 'qpq-config-loader!';
+
+// TODO: Make this a util or something based on server time or something..
+const getDateNow = () => new Date().toISOString();
+
+export const getOriginRequestEventExecutor = (
+  dynamicModuleLoader: DynamicModuleLoader,
+  getCustomActionProcessors: ActionProcessorListResolver = () => ({}),
+) => {
+  return async (event: CloudFrontRequestEvent, context: Context) => {
+    // Don't run the lambda if we are not a bot
+    if (event.Records[0].cf.request.headers['x-qpq-is-bot'][0].value !== 'true') {
+      return event.Records[0].cf.request;
+    }
+
+    // TODO: Make this error safe
+    const service = qpqCoreUtils.getAppName(qpqConfig);
+    const environment = qpqCoreUtils.getAppFeature(qpqConfig);
+    const param = await getParameter(
+      `qpqRuntimeConfig-${service}-${environment}`,
+      qpqWebServerUtils.getDeployRegion(qpqConfig),
+    );
+    const lambdaRuntimeConfig: QPQAWSLambdaConfig = JSON.parse(param);
+    // //////////////////////////
+
+    // Build a processor for the session and stuff
+    // Remove the non route ones ~ let the story execute action add them
+    const storyActionProcessor = {
+      ...coreActionProcessor,
+      ...webserverActionProcessor,
+
+      ...getCloudFrontOriginRequestEventActionProcessor(lambdaRuntimeConfig.qpqConfig),
+      ...getConfigGetSecretActionProcessor(lambdaRuntimeConfig),
+      ...getConfigGetParameterActionProcessor(lambdaRuntimeConfig),
+      ...getConfigGetParametersActionProcessor(lambdaRuntimeConfig),
+      ...getSystemActionProcessor(dynamicModuleLoader),
+      ...getFileActionProcessor(lambdaRuntimeConfig),
+
+      ...getCustomActionProcessors(lambdaRuntimeConfig),
+    };
+
+    const logger = async (result: any) => {};
+
+    // Run the callback
+
+    const resolveStory = createRuntime(
+      {},
+      storyActionProcessor,
+      getDateNow,
+      logger,
+      awsLambdaUtils.randomGuid,
+    );
+
+    const result = await resolveStory(askProcessEvent, [event, context]);
+
+    // Run the callback
+    if (!result.error) {
+      // TODO: Get typing to work here.
+      if (result.result.fallbackToCDN) {
+        // to forward the result to the origin, just return the request
+        // it has the origin details.
+        return event.Records[0].cf.request;
+      }
+
+      const headers = result.result.headers || {};
+      const responseHeaders = Object.keys(headers).reduce(
+        (acc, header) => ({ ...acc, [header]: [{ value: headers[header] }] }),
+        {},
+      );
+
+      return {
+        status: `${result.result.status}`,
+        statusDescription: 'OK',
+        body: result.result.body,
+        headers: responseHeaders,
+      };
+    }
+
+    // CloudFront seems to throw an error when you send back a 404 or something, so we will just hit the normal origin
+    return event.Records[0].cf.request;
+
+    // const code = ErrorTypeHttpResponseMap[result.error.errorType];
+    // return {
+    //   statusCode: code || 500,
+    //   statusDescription: result.error.errorType,
+    //   body: JSON.stringify(result.error),
+    //   headers: {},
+    // };
+  };
+};
+
+// Default executor
+export const executeEventOriginRequest = getOriginRequestEventExecutor(qpqDynamicModuleLoader);

package/src/lambdas/lambdaEventViewerRequest.ts

@@ -0,0 +1,28 @@
+import { CloudFrontRequestEvent, Context } from 'aws-lambda';
+
+export const getViewerRequestEventExecutor = () => {
+  return async (event: CloudFrontRequestEvent, context: Context) => {
+    const request = event.Records[0].cf.request;
+    const headers = request.headers;
+    const customUserAgentHeaderName = 'x-qpq-is-bot';
+    const userAgent = headers['user-agent'][0]?.value || 'unknown';
+
+    let isBot = userAgent.match(/bot|crawl|spider|slurp|facebot|facebookexternalhit/i);
+
+    return {
+      ...request,
+      headers: {
+        ...request.headers,
+        [customUserAgentHeaderName]: [
+          {
+            key: customUserAgentHeaderName,
+            value: isBot ? 'true' : 'false',
+          },
+        ],
+      },
+    };
+  };
+};
+
+// Default executor
+export const executeEventViewerRequest = getViewerRequestEventExecutor();