quidproquo-deploy-awscdk 0.0.46 → 0.0.48

package/lib/QPQPrototypeSingleServiceStack.js

@@ -29,6 +29,7 @@ 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 qpqResourceMapConfigName = 'qpq-aws-resource-map';
 const grantReadToOwnedResources = (ownedResourceSettings, identity) => {
     ownedResourceSettings.ownedBuckets.forEach((b) => b.bucket.grantReadWrite(identity));
     ownedResourceSettings.ownedSecrets.forEach((os) => os.secret.grantRead(identity));
@@ -241,14 +242,13 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
         });
         // This should be all resource names
         const runtimeConfigLambdaConfig = {
-            qpqConfig: props.qpqConfig,
             secretNameMap: ownedSecrets.reduce((acc, os) => (Object.assign(Object.assign({}, acc), { [os.secretName]: os.realName })), {}),
-            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) }),
+            parameterNameMap: Object.assign(Object.assign({}, ownedParameters.reduce((acc, os) => (Object.assign(Object.assign({}, acc), { [os.parameterName]: os.realName })), {})), { [qpqResourceMapConfigName]: getParameterName(qpqResourceMapConfigName, 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)));
+        ownedParameters.push(createServiceParameter(this, id, settings.service, settings.environment, qpqResourceMapConfigName, JSON.stringify(runtimeConfigLambdaConfig)));
         const ownedResourceSettings = {
             ownedBuckets,
             ownedParameters,
@@ -258,11 +258,17 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
         // Finished building resources, now we can build the lambdas
         ////////////////////////////////////////////////////////////////////////////////////
         createWebDistribution(this, `${id}-web-dist`, props, ownedResourceSettings);
+        const BLLayer = new aws_cdk_lib_1.aws_lambda.LayerVersion(this, `${id}-some-layer`, {
+            layerVersionName: `${id}-some-layer`,
+            code: new aws_cdk_lib_1.aws_lambda.AssetCode(path.join(props.apiBuildPath, '../../layers')),
+            compatibleRuntimes: [aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X],
+        });
         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,
+            layers: [BLLayer],
             code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaAPIGatewayEvent')),
             handler: 'index.executeAPIGatewayEvent',
             environment: {
@@ -280,6 +286,7 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
                 loggingLevel: aws_cdk_lib_1.aws_apigateway.MethodLoggingLevel.INFO,
                 dataTraceEnabled: true,
             },
+            binaryMediaTypes: ['*/*'],
             proxy: true,
         });
         // Map all requests to this service to /serviceName/*
@@ -298,11 +305,10 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
                 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: {
-                            src: se.src,
-                            runtime: se.runtime,
-                        } })),
+                    lambdaRuntimeConfig: JSON.stringify({
+                        src: se.src,
+                        runtime: se.runtime,
+                    }),
                 },
             });
             grantReadToOwnedResources(ownedResourceSettings, schedulerFunction);

package/lib/lambdas/actionProcessorListResolver.d.ts

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

package/lib/lambdas/lambdaAPIGatewayEvent.d.ts

@@ -3,11 +3,21 @@ import { Context } from 'aws-lambda';
 import { ActionProcessorListResolver } from './actionProcessorListResolver';
 export declare const getAPIGatewayEventExecutor: (dynamicModuleLoader: DynamicModuleLoader, getCustomActionProcessors?: ActionProcessorListResolver) => (event: import("aws-lambda").APIGatewayProxyEvent, context: Context) => Promise<{
     statusCode: any;
-    body: string;
+    body: any;
     headers: any;
+    isBase64Encoded: any;
+} | {
+    statusCode: number;
+    body: string;
+    headers: import("quidproquo-webserver").HttpEventHeaders;
 }>;
 export declare const executeAPIGatewayEvent: (event: import("aws-lambda").APIGatewayProxyEvent, context: Context) => Promise<{
     statusCode: any;
-    body: string;
+    body: any;
     headers: any;
+    isBase64Encoded: any;
+} | {
+    statusCode: number;
+    body: string;
+    headers: import("quidproquo-webserver").HttpEventHeaders;
 }>;

package/lib/lambdas/lambdaAPIGatewayEvent.js

@@ -20,6 +20,8 @@ const quidproquo_core_1 = require("quidproquo-core");
 const lambdaConfig_1 = require("./lambdaConfig");
 // @ts-ignore - Special webpack loader
 const qpq_dynamic_loader_1 = __importDefault(require("qpq-dynamic-loader!"));
+// @ts-ignore - Special webpack loader
+const qpq_custom_action_processors_loader_1 = __importDefault(require("qpq-custom-action-processors-loader!"));
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
 const ErrorTypeHttpResponseMap = {
@@ -38,9 +40,10 @@ const ErrorTypeHttpResponseMap = {
 };
 const getAPIGatewayEventExecutor = (dynamicModuleLoader, getCustomActionProcessors = () => ({})) => {
     return (event, context) => __awaiter(void 0, void 0, void 0, function* () {
+        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({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getAPIGatewayEventActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), getCustomActionProcessors(lambdaConfig_1.lambdaRuntimeConfig));
+        const storyActionProcessor = 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, cdkConfig.awsResourceMap)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), getCustomActionProcessors(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), (0, qpq_custom_action_processors_loader_1.default)());
         const logger = (result) => __awaiter(void 0, void 0, void 0, function* () {
             // addResult(
             //   envConfig.appName,
@@ -57,17 +60,19 @@ const getAPIGatewayEventExecutor = (dynamicModuleLoader, getCustomActionProcesso
         const result = yield resolveStory(quidproquo_core_1.askProcessEvent, [event, context]);
         // Run the callback
         if (!result.error) {
-            return {
+            const response = {
                 statusCode: result.result.statusCode,
-                body: JSON.stringify(result.result.body),
+                body: result.result.body,
                 headers: result.result.headers,
+                isBase64Encoded: result.result.isBase64Encoded,
             };
+            return response;
         }
         const code = ErrorTypeHttpResponseMap[result.error.errorType];
         return {
             statusCode: code || 500,
             body: JSON.stringify(result.error),
-            headers: quidproquo_webserver_1.qpqWebServerUtils.getCorsHeaders(lambdaConfig_1.lambdaRuntimeConfig.qpqConfig, {}, event.headers),
+            headers: quidproquo_webserver_1.qpqWebServerUtils.getCorsHeaders(cdkConfig.qpqConfig, {}, event.headers),
         };
     });
 };

package/lib/lambdas/lambdaConfig.d.ts

@@ -1,2 +1,7 @@
-import { QPQAWSLambdaConfig } from 'quidproquo-actionprocessor-awslambda';
-export declare const lambdaRuntimeConfig: QPQAWSLambdaConfig;
+import { QPQConfig } from 'quidproquo-core';
+import { QPQAWSResourceMap } from 'quidproquo-actionprocessor-awslambda';
+export interface QPQCDKConfig {
+    awsResourceMap: QPQAWSResourceMap;
+    qpqConfig: QPQConfig;
+}
+export declare const getLambdaConfigs: () => Promise<QPQCDKConfig>;

package/lib/lambdas/lambdaConfig.js

@@ -1,4 +1,30 @@
 "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.lambdaRuntimeConfig = void 0;
-exports.lambdaRuntimeConfig = JSON.parse(process.env.lambdaRuntimeConfig || '{}');
+exports.getLambdaConfigs = void 0;
+const quidproquo_core_1 = require("quidproquo-core");
+const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
+const quidproquo_webserver_1 = require("quidproquo-webserver");
+// @ts-ignore
+const qpq_config_loader_1 = __importDefault(require("qpq-config-loader!"));
+const getLambdaConfigs = () => __awaiter(void 0, void 0, void 0, function* () {
+    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)(`qpq-aws-resource-map-${service}-${environment}`, quidproquo_webserver_1.qpqWebServerUtils.getDeployRegion(qpq_config_loader_1.default));
+    return {
+        awsResourceMap: JSON.parse(param),
+        qpqConfig: qpq_config_loader_1.default,
+    };
+});
+exports.getLambdaConfigs = getLambdaConfigs;

package/lib/lambdas/lambdaEventBridgeEvent.js

@@ -19,13 +19,17 @@ const quidproquo_core_1 = require("quidproquo-core");
 const lambdaConfig_1 = require("./lambdaConfig");
 // @ts-ignore - Special webpack loader
 const qpq_dynamic_loader_1 = __importDefault(require("qpq-dynamic-loader!"));
+// @ts-ignore - Special webpack loader
+const qpq_custom_action_processors_loader_1 = __importDefault(require("qpq-custom-action-processors-loader!"));
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
 const getEventBridgeEventExecutor = (dynamicModuleLoader, getCustomActionProcessors = () => ({})) => {
     return (event, context) => __awaiter(void 0, void 0, void 0, function* () {
+        const cdkConfig = yield (0, lambdaConfig_1.getLambdaConfigs)();
+        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({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getEventBridgeEventActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), getCustomActionProcessors(lambdaConfig_1.lambdaRuntimeConfig));
+        const storyActionProcessor = 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, cdkConfig.awsResourceMap)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), getCustomActionProcessors(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), (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.d.ts

@@ -1,15 +1,5 @@
 import { DynamicModuleLoader } from 'quidproquo-actionprocessor-awslambda';
-import { CloudFrontRequestEvent, Context } from 'aws-lambda';
+import { CloudFrontRequestEvent, CloudFrontRequestResult, 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: {};
-}>;
+export declare const getOriginRequestEventExecutor: (dynamicModuleLoader: DynamicModuleLoader, getCustomActionProcessors?: ActionProcessorListResolver) => (event: CloudFrontRequestEvent, context: Context) => Promise<CloudFrontRequestResult>;
+export declare const executeEventOriginRequest: (event: CloudFrontRequestEvent, context: Context) => Promise<CloudFrontRequestResult>;

package/lib/lambdas/lambdaEventOriginRequest.js

@@ -15,29 +15,26 @@ 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 lambdaConfig_1 = require("./lambdaConfig");
 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!"));
+const qpq_custom_action_processors_loader_1 = __importDefault(require("qpq-custom-action-processors-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* () {
+        console.log(JSON.stringify(event));
         // 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') {
+        if (!event.Records[0].cf.request.headers['x-qpq-is-bot'] ||
+            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);
-        // //////////////////////////
+        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({}, 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 storyActionProcessor = 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, cdkConfig.awsResourceMap)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), getCustomActionProcessors(cdkConfig.qpqConfig, cdkConfig.awsResourceMap)), (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);
@@ -57,10 +54,16 @@ const getOriginRequestEventExecutor = (dynamicModuleLoader, getCustomActionProce
                 statusDescription: 'OK',
                 body: result.result.body,
                 headers: responseHeaders,
+                bodyEncoding: result.result.bodyEncoding,
             };
         }
         // 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;
+        /*return {
+          status: `200`,
+          statusDescription: 'OK',
+          body: `<pre>${JSON.stringify(result.error, null, 2)}</pre>`,
+        } as CloudFrontRequestResult;*/
         // const code = ErrorTypeHttpResponseMap[result.error.errorType];
         // return {
         //   statusCode: code || 500,

package/lib/lambdas/lambdaEventViewerRequest.js

@@ -13,6 +13,7 @@ exports.executeEventViewerRequest = exports.getViewerRequestEventExecutor = void
 const getViewerRequestEventExecutor = () => {
     return (event, context) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
+        console.log(JSON.stringify(event));
         const request = event.Records[0].cf.request;
         const headers = request.headers;
         const customUserAgentHeaderName = 'x-qpq-is-bot';

package/package.json

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

package/src/QPQPrototypeSingleServiceStack.ts

@@ -21,11 +21,13 @@ import * as cdk from 'aws-cdk-lib';
 
 import { Construct } from 'constructs';
 
-import { QPQAWSLambdaConfig } from 'quidproquo-actionprocessor-awslambda';
+import { QPQAWSResourceMap, LambdaRuntimeConfig } from 'quidproquo-actionprocessor-awslambda';
 
 import { qpqCoreUtils } from 'quidproquo-core';
 import { qpqWebServerUtils } from 'quidproquo-webserver';
 
+const qpqResourceMapConfigName = 'qpq-aws-resource-map';
+
 export interface QPQPrototypeStackProps extends DeploymentSettings {
   account: string;
 
@@ -34,6 +36,8 @@ export interface QPQPrototypeStackProps extends DeploymentSettings {
 
   lambdaAPIGatewayEventPath?: string;
   lambdaEventBridgeEventPath?: string;
+
+  layers?: string[];
 }
 
 interface OwnedBucket {
@@ -360,8 +364,7 @@ export class QPQPrototypeSingleServiceStack extends Stack {
     });
 
     // This should be all resource names
-    const runtimeConfigLambdaConfig: QPQAWSLambdaConfig = {
-      qpqConfig: props.qpqConfig,
+    const runtimeConfigLambdaConfig: QPQAWSResourceMap = {
       secretNameMap: ownedSecrets.reduce(
         (acc, os) => ({
           ...acc,
@@ -377,8 +380,8 @@ export class QPQPrototypeSingleServiceStack extends Stack {
           }),
           {},
         ),
-        ['qpqRuntimeConfig']: getParameterName(
-          'qpqRuntimeConfig',
+        [qpqResourceMapConfigName]: getParameterName(
+          qpqResourceMapConfigName,
           settings.service,
           settings.environment,
         ),
@@ -400,7 +403,7 @@ export class QPQPrototypeSingleServiceStack extends Stack {
         id,
         settings.service,
         settings.environment,
-        'qpqRuntimeConfig',
+        qpqResourceMapConfigName,
         JSON.stringify(runtimeConfigLambdaConfig),
       ),
     );
@@ -417,6 +420,17 @@ export class QPQPrototypeSingleServiceStack extends Stack {
 
     createWebDistribution(this, `${id}-web-dist`, props, ownedResourceSettings);
 
+    const customLayers = (props.layers || []).map((layer, index) => {
+      const layerName = `${layer.split('/').pop()}-${index}-${settings.environment}-${
+        settings.service
+      }`;
+      return new aws_lambda.LayerVersion(this, `${id}-${layerName}`, {
+        layerVersionName: `${layerName}`,
+        code: new aws_lambda.AssetCode(layer),
+        compatibleRuntimes: [aws_lambda.Runtime.NODEJS_16_X],
+      });
+    });
+
     const lambdaHandler = new aws_lambda.Function(
       this,
       `${settings.environment}-${settings.service}-lambda-rest`,
@@ -426,6 +440,7 @@ export class QPQPrototypeSingleServiceStack extends Stack {
 
         runtime: aws_lambda.Runtime.NODEJS_16_X,
         memorySize: 1024,
+        layers: customLayers,
 
         code: aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaAPIGatewayEvent')),
         handler: 'index.executeAPIGatewayEvent',
@@ -451,6 +466,7 @@ export class QPQPrototypeSingleServiceStack extends Stack {
           loggingLevel: aws_apigateway.MethodLoggingLevel.INFO,
           dataTraceEnabled: true,
         },
+        binaryMediaTypes: ['*/*'],
         proxy: true,
       },
     );
@@ -474,19 +490,16 @@ export class QPQPrototypeSingleServiceStack extends Stack {
 
           runtime: aws_lambda.Runtime.NODEJS_16_X,
           memorySize: 1024,
+          layers: customLayers,
 
           code: aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaEventBridgeEvent')),
           handler: 'index.executeEventBridgeEvent',
 
           environment: {
-            TABLES: JSON.stringify([]),
             lambdaRuntimeConfig: JSON.stringify({
-              ...runtimeConfigLambdaConfig,
-              lambdaRuntimeConfig: {
-                src: se.src,
-                runtime: se.runtime,
-              },
-            }),
+              src: se.src,
+              runtime: se.runtime,
+            } as LambdaRuntimeConfig),
           },
         },
       );

package/src/lambdas/actionProcessorListResolver.ts

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

package/src/lambdas/lambdaAPIGatewayEvent.ts

@@ -17,12 +17,15 @@ import { createRuntime, askProcessEvent, ErrorTypeEnum } from 'quidproquo-core';
 
 import { APIGatewayEvent, Context } from 'aws-lambda';
 
-import { lambdaRuntimeConfig } from './lambdaConfig';
+import { getLambdaConfigs } from './lambdaConfig';
 import { ActionProcessorListResolver } from './actionProcessorListResolver';
 
 // @ts-ignore - Special webpack loader
 import qpqDynamicModuleLoader from 'qpq-dynamic-loader!';
 
+// @ts-ignore - Special webpack loader
+import qpqCustomActionProcessors from 'qpq-custom-action-processors-loader!';
+
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
 
@@ -46,20 +49,23 @@ export const getAPIGatewayEventExecutor = (
   getCustomActionProcessors: ActionProcessorListResolver = () => ({}),
 ) => {
   return async (event: APIGatewayEvent, context: Context) => {
+    const cdkConfig = await getLambdaConfigs();
+
     // Build a processor for the session and stuff
     // Remove the non route ones ~ let the story execute action add them
     const storyActionProcessor = {
       ...coreActionProcessor,
       ...webserverActionProcessor,
 
-      ...getAPIGatewayEventActionProcessor(lambdaRuntimeConfig.qpqConfig),
-      ...getConfigGetSecretActionProcessor(lambdaRuntimeConfig),
-      ...getConfigGetParameterActionProcessor(lambdaRuntimeConfig),
-      ...getConfigGetParametersActionProcessor(lambdaRuntimeConfig),
+      ...getAPIGatewayEventActionProcessor(cdkConfig.qpqConfig),
+      ...getConfigGetSecretActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...getConfigGetParameterActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...getConfigGetParametersActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
       ...getSystemActionProcessor(dynamicModuleLoader),
-      ...getFileActionProcessor(lambdaRuntimeConfig),
+      ...getFileActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
 
-      ...getCustomActionProcessors(lambdaRuntimeConfig),
+      ...getCustomActionProcessors(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...qpqCustomActionProcessors(),
     };
 
     const logger = async (result: any) => {
@@ -88,18 +94,20 @@ export const getAPIGatewayEventExecutor = (
 
     // Run the callback
     if (!result.error) {
-      return {
+      const response = {
         statusCode: result.result.statusCode,
-        body: JSON.stringify(result.result.body),
+        body: result.result.body,
         headers: result.result.headers,
+        isBase64Encoded: result.result.isBase64Encoded,
       };
+      return response;
     }
 
     const code = ErrorTypeHttpResponseMap[result.error.errorType];
     return {
       statusCode: code || 500,
       body: JSON.stringify(result.error),
-      headers: qpqWebServerUtils.getCorsHeaders(lambdaRuntimeConfig.qpqConfig, {}, event.headers),
+      headers: qpqWebServerUtils.getCorsHeaders(cdkConfig.qpqConfig, {}, event.headers),
     };
   };
 };

package/src/lambdas/lambdaConfig.ts

@@ -1,5 +1,27 @@
-import { QPQAWSLambdaConfig } from 'quidproquo-actionprocessor-awslambda';
+import { qpqCoreUtils, QPQConfig } from 'quidproquo-core';
+import { QPQAWSResourceMap, getParameter } from 'quidproquo-actionprocessor-awslambda';
 
-export const lambdaRuntimeConfig = JSON.parse(
-  process.env.lambdaRuntimeConfig || '{}',
-) as QPQAWSLambdaConfig;
+import { qpqWebServerUtils } from 'quidproquo-webserver';
+
+// @ts-ignore
+import qpqConfig from 'qpq-config-loader!';
+
+export interface QPQCDKConfig {
+  awsResourceMap: QPQAWSResourceMap;
+  qpqConfig: QPQConfig;
+}
+
+export const getLambdaConfigs = async (): Promise<QPQCDKConfig> => {
+  const service = qpqCoreUtils.getAppName(qpqConfig);
+  const environment = qpqCoreUtils.getAppFeature(qpqConfig);
+
+  const param = await getParameter(
+    `qpq-aws-resource-map-${service}-${environment}`,
+    qpqWebServerUtils.getDeployRegion(qpqConfig),
+  );
+
+  return {
+    awsResourceMap: JSON.parse(param),
+    qpqConfig: qpqConfig,
+  };
+};

package/src/lambdas/lambdaEventBridgeEvent.ts

@@ -9,17 +9,21 @@ import {
   getConfigGetParametersActionProcessor,
   awsLambdaUtils,
   DynamicModuleLoader,
+  LambdaRuntimeConfig,
 } from 'quidproquo-actionprocessor-awslambda';
 import { createRuntime, askProcessEvent } from 'quidproquo-core';
 
 import { EventBridgeEvent, Context } from 'aws-lambda';
 
-import { lambdaRuntimeConfig } from './lambdaConfig';
+import { getLambdaConfigs } from './lambdaConfig';
 import { ActionProcessorListResolver } from './actionProcessorListResolver';
 
 // @ts-ignore - Special webpack loader
 import qpqDynamicModuleLoader from 'qpq-dynamic-loader!';
 
+// @ts-ignore - Special webpack loader
+import qpqCustomActionProcessors from 'qpq-custom-action-processors-loader!';
+
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
 
@@ -28,6 +32,12 @@ export const getEventBridgeEventExecutor = (
   getCustomActionProcessors: ActionProcessorListResolver = () => ({}),
 ) => {
   return async (event: EventBridgeEvent<string, void>, context: Context) => {
+    const cdkConfig = await getLambdaConfigs();
+
+    const lambdaRuntimeConfig: LambdaRuntimeConfig = JSON.parse(
+      process.env.lambdaRuntimeConfig || '{}',
+    );
+
     // Build a processor for the session and stuff
     // Remove the  non event ones
     const storyActionProcessor = {
@@ -36,12 +46,13 @@ export const getEventBridgeEventExecutor = (
 
       ...getEventBridgeEventActionProcessor(lambdaRuntimeConfig),
       ...getSystemActionProcessor(dynamicModuleLoader),
-      ...getFileActionProcessor(lambdaRuntimeConfig),
-      ...getConfigGetSecretActionProcessor(lambdaRuntimeConfig),
-      ...getConfigGetParameterActionProcessor(lambdaRuntimeConfig),
-      ...getConfigGetParametersActionProcessor(lambdaRuntimeConfig),
+      ...getFileActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...getConfigGetSecretActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...getConfigGetParameterActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...getConfigGetParametersActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
 
-      ...getCustomActionProcessors(lambdaRuntimeConfig),
+      ...getCustomActionProcessors(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...qpqCustomActionProcessors(),
     };
 
     const logger = async (result: any) => {};

package/src/lambdas/lambdaEventOriginRequest.ts

@@ -8,16 +8,17 @@ import {
   getConfigGetParameterActionProcessor,
   getConfigGetParametersActionProcessor,
   awsLambdaUtils,
-  QPQAWSLambdaConfig,
   DynamicModuleLoader,
   getParameter,
 } from 'quidproquo-actionprocessor-awslambda';
 
 import { qpqWebServerUtils } from 'quidproquo-webserver';
 
+import { getLambdaConfigs } from './lambdaConfig';
+
 import { createRuntime, askProcessEvent, ErrorTypeEnum, qpqCoreUtils } from 'quidproquo-core';
 
-import { CloudFrontRequestEvent, Context } from 'aws-lambda';
+import { CloudFrontRequestEvent, CloudFrontRequestResult, Context } from 'aws-lambda';
 
 import { ActionProcessorListResolver } from './actionProcessorListResolver';
 
@@ -25,7 +26,7 @@ import { ActionProcessorListResolver } from './actionProcessorListResolver';
 import qpqDynamicModuleLoader from 'qpq-dynamic-loader!';
 
 // @ts-ignore - Special webpack loader
-import qpqConfig from 'qpq-config-loader!';
+import qpqCustomActionProcessors from 'qpq-custom-action-processors-loader!';
 
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
@@ -35,20 +36,17 @@ export const getOriginRequestEventExecutor = (
   getCustomActionProcessors: ActionProcessorListResolver = () => ({}),
 ) => {
   return async (event: CloudFrontRequestEvent, context: Context) => {
+    console.log(JSON.stringify(event));
+
     // 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') {
+    if (
+      !event.Records[0].cf.request.headers['x-qpq-is-bot'] ||
+      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);
-    // //////////////////////////
+    const cdkConfig = await getLambdaConfigs();
 
     // Build a processor for the session and stuff
     // Remove the non route ones ~ let the story execute action add them
@@ -56,14 +54,15 @@ export const getOriginRequestEventExecutor = (
       ...coreActionProcessor,
       ...webserverActionProcessor,
 
-      ...getCloudFrontOriginRequestEventActionProcessor(lambdaRuntimeConfig.qpqConfig),
-      ...getConfigGetSecretActionProcessor(lambdaRuntimeConfig),
-      ...getConfigGetParameterActionProcessor(lambdaRuntimeConfig),
-      ...getConfigGetParametersActionProcessor(lambdaRuntimeConfig),
+      ...getCloudFrontOriginRequestEventActionProcessor(cdkConfig.qpqConfig),
+      ...getConfigGetSecretActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...getConfigGetParameterActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...getConfigGetParametersActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
       ...getSystemActionProcessor(dynamicModuleLoader),
-      ...getFileActionProcessor(lambdaRuntimeConfig),
+      ...getFileActionProcessor(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
 
-      ...getCustomActionProcessors(lambdaRuntimeConfig),
+      ...getCustomActionProcessors(cdkConfig.qpqConfig, cdkConfig.awsResourceMap),
+      ...qpqCustomActionProcessors(),
     };
 
     const logger = async (result: any) => {};
@@ -100,12 +99,19 @@ export const getOriginRequestEventExecutor = (
         statusDescription: 'OK',
         body: result.result.body,
         headers: responseHeaders,
-      };
+        bodyEncoding: result.result.bodyEncoding,
+      } as CloudFrontRequestResult;
     }
 
     // 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;
 
+    /*return {
+      status: `200`,
+      statusDescription: 'OK',
+      body: `<pre>${JSON.stringify(result.error, null, 2)}</pre>`,
+    } as CloudFrontRequestResult;*/
+
     // const code = ErrorTypeHttpResponseMap[result.error.errorType];
     // return {
     //   statusCode: code || 500,

package/src/lambdas/lambdaEventViewerRequest.ts

@@ -2,6 +2,8 @@ import { CloudFrontRequestEvent, Context } from 'aws-lambda';
 
 export const getViewerRequestEventExecutor = () => {
   return async (event: CloudFrontRequestEvent, context: Context) => {
+    console.log(JSON.stringify(event));
+
     const request = event.Records[0].cf.request;
     const headers = request.headers;
     const customUserAgentHeaderName = 'x-qpq-is-bot';