quidproquo-deploy-awscdk 0.0.48 → 0.0.49

package/lib/QPQPrototypeSingleServiceStack.d.ts

@@ -7,6 +7,7 @@ export interface QPQPrototypeStackProps extends DeploymentSettings {
     webBuildPath: string;
     lambdaAPIGatewayEventPath?: string;
     lambdaEventBridgeEventPath?: string;
+    layers?: string[];
 }
 export declare class QPQPrototypeSingleServiceStack extends Stack {
     constructor(scope: Construct, id: string, props: QPQPrototypeStackProps);

package/lib/QPQPrototypeSingleServiceStack.js

@@ -258,17 +258,20 @@ 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 customLayers = (props.layers || []).map((layer, index) => {
+            const layerName = `${layer.split('/').pop()}-${index}-${settings.environment}-${settings.service}`;
+            return new aws_cdk_lib_1.aws_lambda.LayerVersion(this, `${id}-${layerName}`, {
+                layerVersionName: `${layerName}`,
+                code: new aws_cdk_lib_1.aws_lambda.AssetCode(layer),
+                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],
+            layers: customLayers,
             code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaAPIGatewayEvent')),
             handler: 'index.executeAPIGatewayEvent',
             environment: {
@@ -302,6 +305,7 @@ 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,
+                layers: customLayers,
                 code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaEventBridgeEvent')),
                 handler: 'index.executeEventBridgeEvent',
                 environment: {

package/lib/lambdas/lambdaEventViewerRequest.d.ts

@@ -7,9 +7,9 @@ export declare const getViewerRequestEventExecutor: () => (event: CloudFrontRequ
         }[];
     };
     body?: {
-        action: "read-only" | "replace";
+        action: "replace" | "read-only";
         data: string;
-        encoding: "base64" | "text";
+        encoding: "text" | "base64";
         readonly inputTruncated: boolean;
     } | undefined;
     clientIp: string;
@@ -26,9 +26,9 @@ export declare const executeEventViewerRequest: (event: CloudFrontRequestEvent,
         }[];
     };
     body?: {
-        action: "read-only" | "replace";
+        action: "replace" | "read-only";
         data: string;
-        encoding: "base64" | "text";
+        encoding: "text" | "base64";
         readonly inputTruncated: boolean;
     } | undefined;
     clientIp: string;

package/package.json

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

package/lib/lambdas/awsLambdaMissingTypes.d.ts

@@ -1,51 +0,0 @@
-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

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

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

@@ -1,4 +0,0 @@
-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

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

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

@@ -1,5 +0,0 @@
-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

@@ -1,74 +0,0 @@
-"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/types.d.ts

@@ -1,51 +0,0 @@
-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

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