quidproquo-deploy-awscdk 0.0.22 → 0.0.24

package/lib/QPQApp.d.ts

@@ -0,0 +1,2 @@
+import * as cdk from 'aws-cdk-lib';
+export declare const createQPQApp: () => cdk.App;

package/lib/QPQApp.js

@@ -0,0 +1,31 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createQPQApp = void 0;
+const cdk = __importStar(require("aws-cdk-lib"));
+const createQPQApp = () => {
+    return new cdk.App();
+};
+exports.createQPQApp = createQPQApp;

package/lib/QPQPrototypeSingleServiceStack.d.ts

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

package/lib/QPQPrototypeSingleServiceStack.js

@@ -160,11 +160,11 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
         const resourceName = (name) => {
             return `${settings.service}-${settings.environment}-${name}`;
         };
-        const BLLayer = new aws_cdk_lib_1.aws_lambda.LayerVersion(this, `${id}-BLLayer`, {
-            layerVersionName: `${id}-BLLayer`,
-            code: new aws_cdk_lib_1.aws_lambda.AssetCode(props.apiBuildPath),
-            compatibleRuntimes: [aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X],
-        });
+        // const BLLayer = new aws_lambda.LayerVersion(this, `${id}-BLLayer`, {
+        //   layerVersionName: `${id}-BLLayer`,
+        //   code: new aws_lambda.AssetCode(props.apiBuildPath),
+        //   compatibleRuntimes: [aws_lambda.Runtime.NODEJS_16_X],
+        // });
         const ownedSecrets = quidproquo_core_1.qpqCoreUtils.getOwnedSecrets(props.qpqConfig).map((secret) => {
             const realSecretName = `${secret.key}-${settings.service}-${settings.environment}`;
             return {
@@ -177,6 +177,20 @@ 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 bucketName = resourceName(driveName);
             const bucket = new aws_cdk_lib_1.aws_s3.Bucket(this, bucketName, {
@@ -198,15 +212,18 @@ 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 })), {}),
         };
         const lambdaHandler = new aws_cdk_lib_1.aws_lambda_nodejs.NodejsFunction(this, `${settings.environment}-${settings.service}-lambda-rest`, {
             functionName: `lambda-rest-${settings.service}-${settings.environment}`,
-            entry: path.resolve(__dirname, 'lambdas', 'lambdaAPIGatewayEvent.js'),
-            handler: 'execute',
+            entry: props.lambdaAPIGatewayEventPath ||
+                path.resolve(__dirname, 'lambdas', 'lambdaAPIGatewayEvent.js'),
+            handler: 'executeAPIGatewayEvent',
             timeout: cdk.Duration.seconds(25),
             runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
-            layers: [BLLayer],
+            // layers: [BLLayer],
+            memorySize: 1024,
             bundling: {
                 tsconfig: './tsconfig.json',
                 define: {
@@ -220,6 +237,7 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.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));
         // 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`,
@@ -240,12 +258,13 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
         quidproquo_core_1.qpqCoreUtils.getScheduleEvents(props.qpqConfig).forEach((se, index) => {
             const schedulerFunction = new aws_cdk_lib_1.aws_lambda_nodejs.NodejsFunction(this, `${settings.environment}-${settings.service}-SE-${index}`, {
                 functionName: `SE-${index}-${se.runtime}-${settings.environment}-${settings.service}`,
-                entry: path.resolve(__dirname, 'lambdas', 'lambdaEventBridgeEvent.js'),
+                entry: props.lambdaEventBridgeEventPath ||
+                    path.resolve(__dirname, 'lambdas', 'lambdaEventBridgeEvent.js'),
                 handler: 'execute',
                 timeout: cdk.Duration.minutes(15),
                 runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
-                memorySize: 400,
-                layers: [BLLayer],
+                // layers: [BLLayer],
+                memorySize: 1024,
                 bundling: {
                     tsconfig: './tsconfig.json',
                     define: {
@@ -261,6 +280,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));
             // 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/index.d.ts

@@ -1,4 +1,6 @@
 export * from './utils';
 export * from './DeploymentType';
 export * from './DeploymentSettings';
+export * from './QPQApp';
 export * from './QPQPrototypeSingleServiceStack';
+export * from './lambdas';

package/lib/index.js

@@ -17,4 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./utils"), exports);
 __exportStar(require("./DeploymentType"), exports);
 __exportStar(require("./DeploymentSettings"), exports);
+__exportStar(require("./QPQApp"), exports);
 __exportStar(require("./QPQPrototypeSingleServiceStack"), exports);
+__exportStar(require("./lambdas"), exports);

package/lib/lambdas/index.d.ts

@@ -0,0 +1,3 @@
+export * from './lambdaConfig';
+export * from './lambdaAPIGatewayEvent';
+export * from './lambdaEventBridgeEvent';

package/lib/lambdas/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./lambdaConfig"), exports);
+__exportStar(require("./lambdaAPIGatewayEvent"), exports);
+__exportStar(require("./lambdaEventBridgeEvent"), exports);

package/lib/lambdas/lambdaAPIGatewayEvent.d.ts

@@ -1,6 +1,11 @@
 import { Context } from 'aws-lambda';
-export declare const getDateNow: () => string;
-export declare const execute: (event: import("aws-lambda").APIGatewayProxyEvent, context: Context) => Promise<{
+import { ActionProcessorListResolver } from './lambdaConfig';
+export declare const getAPIGatewayEventExecutor: (getCustomActionProcessors?: ActionProcessorListResolver) => (event: import("aws-lambda").APIGatewayProxyEvent, context: Context) => Promise<{
+    statusCode: any;
+    body: string;
+    headers: any;
+}>;
+export declare const executeAPIGatewayEvent: (event: import("aws-lambda").APIGatewayProxyEvent, context: Context) => Promise<{
     statusCode: any;
     body: string;
     headers: any;

package/lib/lambdas/lambdaAPIGatewayEvent.js

@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execute = exports.getDateNow = void 0;
+exports.executeAPIGatewayEvent = exports.getAPIGatewayEventExecutor = 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");
 const lambdaConfig_1 = require("./lambdaConfig");
+// TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
-exports.getDateNow = getDateNow;
 const ErrorTypeHttpResponseMap = {
     [quidproquo_core_1.ErrorTypeEnum.BadRequest]: 400,
     [quidproquo_core_1.ErrorTypeEnum.Unauthorized]: 401,
@@ -28,42 +28,43 @@ const ErrorTypeHttpResponseMap = {
     [quidproquo_core_1.ErrorTypeEnum.GenericError]: 500,
     [quidproquo_core_1.ErrorTypeEnum.NotImplemented]: 501,
     [quidproquo_core_1.ErrorTypeEnum.NoContent]: 204,
+    [quidproquo_core_1.ErrorTypeEnum.Invalid]: 422,
 };
-const execute = (event, context) => __awaiter(void 0, void 0, void 0, function* () {
-    // 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({}, 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.getSystemActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig));
-    // const doWeCarePath = (event.path || "").replace(
-    //   new RegExp(`^(\/${envConfig.appName})/`),
-    //   "/"
-    // );
-    const logger = (result) => __awaiter(void 0, void 0, void 0, function* () {
-        // addResult(
-        //   envConfig.appName,
-        //   getDateNow(),
-        //   doWeCarePath,
-        //   "route-infrastructure",
-        //   "infrastructure",
-        //   "askRoute",
-        //   result
-        // );
-    });
-    //   // Run the callback
-    const resolveStory = (0, quidproquo_core_1.createRuntime)({}, storyActionProcessor, exports.getDateNow, logger, quidproquo_actionprocessor_awslambda_1.awsLambdaUtils.randomGuid);
-    const result = yield resolveStory(quidproquo_core_1.askProcessEvent, [event, context]);
-    // // Run the callback
-    if (!result.error) {
+const getAPIGatewayEventExecutor = (getCustomActionProcessors = () => ({})) => {
+    return (event, context) => __awaiter(void 0, void 0, void 0, function* () {
+        // 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({}, 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.getSystemActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), getCustomActionProcessors(lambdaConfig_1.lambdaRuntimeConfig));
+        const logger = (result) => __awaiter(void 0, void 0, void 0, function* () {
+            // addResult(
+            //   envConfig.appName,
+            //   getDateNow(),
+            //   doWeCarePath,
+            //   "route-infrastructure",
+            //   "infrastructure",
+            //   "askRoute",
+            //   result
+            // );
+        });
+        //   // 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) {
+            return {
+                statusCode: result.result.statusCode,
+                body: JSON.stringify(result.result.body),
+                headers: result.result.headers,
+            };
+        }
+        const code = ErrorTypeHttpResponseMap[result.error.errorType];
         return {
-            statusCode: result.result.statusCode,
-            body: JSON.stringify(result.error ? result.error : result.result.body),
-            headers: result.result.headers,
+            statusCode: code || 500,
+            body: JSON.stringify(result.error),
+            headers: {},
         };
-    }
-    const code = ErrorTypeHttpResponseMap[result.error.errorType];
-    return {
-        statusCode: code || 500,
-        body: JSON.stringify(result.error),
-        headers: {},
-    };
-});
-exports.execute = execute;
+    });
+};
+exports.getAPIGatewayEventExecutor = getAPIGatewayEventExecutor;
+// Default executor
+exports.executeAPIGatewayEvent = (0, exports.getAPIGatewayEventExecutor)();

package/lib/lambdas/lambdaConfig.d.ts

@@ -1,2 +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/lambdaEventBridgeEvent.d.ts

@@ -1,3 +1,4 @@
 import { EventBridgeEvent, Context } from 'aws-lambda';
-export declare const getDateNow: () => string;
-export declare const execute: (event: EventBridgeEvent<string, void>, context: Context) => Promise<void>;
+import { ActionProcessorListResolver } from './lambdaConfig';
+export declare const getEventBridgeEventExecutor: (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/lambdaEventBridgeEvent.js

@@ -9,21 +9,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execute = exports.getDateNow = void 0;
+exports.executeEventBridgeEvent = exports.getEventBridgeEventExecutor = 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");
 const lambdaConfig_1 = require("./lambdaConfig");
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
-exports.getDateNow = getDateNow;
-const execute = (event, context) => __awaiter(void 0, void 0, void 0, function* () {
-    // 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({}, 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)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(lambdaConfig_1.lambdaRuntimeConfig));
-    const logger = (result) => __awaiter(void 0, void 0, void 0, function* () { });
-    // Run the callback
-    const resolveStory = (0, quidproquo_core_1.createRuntime)({}, storyActionProcessor, exports.getDateNow, logger, quidproquo_actionprocessor_awslambda_1.awsLambdaUtils.randomGuid);
-    yield resolveStory(quidproquo_core_1.askProcessEvent, [event, context]);
-});
-exports.execute = execute;
+const getEventBridgeEventExecutor = (getCustomActionProcessors = () => ({})) => {
+    return (event, context) => __awaiter(void 0, void 0, void 0, function* () {
+        // 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({}, 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)(lambdaConfig_1.lambdaRuntimeConfig)), (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)), getCustomActionProcessors(lambdaConfig_1.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);
+        yield resolveStory(quidproquo_core_1.askProcessEvent, [event, context]);
+    });
+};
+exports.getEventBridgeEventExecutor = getEventBridgeEventExecutor;
+exports.executeEventBridgeEvent = (0, exports.getEventBridgeEventExecutor)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-deploy-awscdk",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",
@@ -24,9 +24,9 @@
   },
   "homepage": "https://github.com/joe-coady/quidproquo#readme",
   "dependencies": {
-    "aws-cdk-lib": "2.52.1",
-    "aws-cdk": "2.52.1",
-    "constructs": "^10.0.0",
+    "aws-cdk-lib": "^2.55.1",
+    "aws-cdk": "^2.55.1",
+    "constructs": "^10.1.191",
     "esbuild": "^0.15.16",
     "quidproquo-actionprocessor-awslambda": "*",
     "quidproquo-actionprocessor-node": "*",