quidproquo-deploy-awscdk 0.0.30 → 0.0.32

package/lib/QPQPrototypeSingleServiceStack.js

@@ -24,7 +24,6 @@ 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");
@@ -153,11 +152,6 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
         const resourceName = (name) => {
             return `${settings.service}-${settings.environment}-${name}`;
         };
-        // 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 {
@@ -208,23 +202,16 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
             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`, {
+        const lambdaHandler = new aws_cdk_lib_1.aws_lambda.Function(this, `${settings.environment}-${settings.service}-lambda-rest`, {
             functionName: `lambda-rest-${settings.service}-${settings.environment}`,
-            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],
             memorySize: 1024,
-            bundling: {
-                tsconfig: './tsconfig.json',
-                define: {
-                    'process.env.lambdaRuntimeConfig': JSON.stringify(JSON.stringify(runtimeConfigLambdaConfig)),
-                },
-            },
+            code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(props.apiBuildPath),
+            handler: 'lambdaAPIGatewayEvent.executeAPIGatewayEvent',
             environment: {
                 TABLES: JSON.stringify([]),
+                lambdaRuntimeConfig: JSON.stringify(runtimeConfigLambdaConfig),
             },
         });
         // Grant access to the lambda
@@ -249,26 +236,19 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
             // basePath: settings.service,
         });
         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}`, {
+            const schedulerFunction = new aws_cdk_lib_1.aws_lambda.Function(this, `${settings.environment}-${settings.service}-SE-${index}`, {
                 functionName: `SE-${index}-${se.runtime}-${settings.environment}-${settings.service}`,
-                entry: props.lambdaEventBridgeEventPath ||
-                    path.resolve(__dirname, 'lambdas', 'lambdaEventBridgeEvent.js'),
-                handler: 'executeEventBridgeEvent',
                 timeout: cdk.Duration.minutes(15),
                 runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
-                // layers: [BLLayer],
                 memorySize: 1024,
-                bundling: {
-                    tsconfig: './tsconfig.json',
-                    define: {
-                        'process.env.lambdaRuntimeConfig': JSON.stringify(JSON.stringify(Object.assign(Object.assign({}, runtimeConfigLambdaConfig), { lambdaRuntimeConfig: {
-                                src: se.src,
-                                runtime: se.runtime,
-                            } }))),
-                    },
-                },
+                code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(props.apiBuildPath),
+                handler: 'lambdaEventBridgeEvent.executeEventBridgeEvent',
                 environment: {
                     TABLES: JSON.stringify([]),
+                    lambdaRuntimeConfig: JSON.stringify(Object.assign(Object.assign({}, runtimeConfigLambdaConfig), { lambdaRuntimeConfig: {
+                            src: se.src,
+                            runtime: se.runtime,
+                        } })),
                 },
             });
             buckets.forEach((b) => b.bucket.grantReadWrite(schedulerFunction));

package/lib/index.d.ts

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

package/lib/index.js

@@ -19,4 +19,3 @@ __exportStar(require("./DeploymentType"), exports);
 __exportStar(require("./DeploymentSettings"), exports);
 __exportStar(require("./QPQApp"), exports);
 __exportStar(require("./QPQPrototypeSingleServiceStack"), exports);
-__exportStar(require("./lambdas"), exports);

package/lib/lambdas/lambdaAPIGatewayEvent.d.ts

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

package/lib/lambdas/lambdaAPIGatewayEvent.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.executeAPIGatewayEvent = exports.getAPIGatewayEventExecutor = void 0;
 const quidproquo_actionprocessor_node_1 = require("quidproquo-actionprocessor-node");
@@ -15,6 +18,8 @@ const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocess
 const quidproquo_webserver_1 = require("quidproquo-webserver");
 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!"));
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
 const ErrorTypeHttpResponseMap = {
@@ -31,11 +36,11 @@ const ErrorTypeHttpResponseMap = {
     [quidproquo_core_1.ErrorTypeEnum.NoContent]: 204,
     [quidproquo_core_1.ErrorTypeEnum.Invalid]: 422,
 };
-const getAPIGatewayEventExecutor = (getCustomActionProcessors = () => ({})) => {
+const getAPIGatewayEventExecutor = (dynamicModuleLoader, 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(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)(lambdaConfig_1.lambdaRuntimeConfig)), (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({}, 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 logger = (result) => __awaiter(void 0, void 0, void 0, function* () {
             // addResult(
             //   envConfig.appName,
@@ -50,7 +55,7 @@ const getAPIGatewayEventExecutor = (getCustomActionProcessors = () => ({})) => {
         //   // 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
+        // Run the callback
         if (!result.error) {
             return {
                 statusCode: result.result.statusCode,
@@ -69,4 +74,4 @@ const getAPIGatewayEventExecutor = (getCustomActionProcessors = () => ({})) => {
 };
 exports.getAPIGatewayEventExecutor = getAPIGatewayEventExecutor;
 // Default executor
-exports.executeAPIGatewayEvent = (0, exports.getAPIGatewayEventExecutor)();
+exports.executeAPIGatewayEvent = (0, exports.getAPIGatewayEventExecutor)(qpq_dynamic_loader_1.default);

package/lib/lambdas/lambdaEventBridgeEvent.d.ts

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

@@ -8,19 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.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");
+// @ts-ignore - Special webpack loader
+const qpq_dynamic_loader_1 = __importDefault(require("qpq-dynamic-loader!"));
 // TODO: Make this a util or something based on server time or something..
 const getDateNow = () => new Date().toISOString();
-const getEventBridgeEventExecutor = (getCustomActionProcessors = () => ({})) => {
+const getEventBridgeEventExecutor = (dynamicModuleLoader, 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(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)), (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({}, 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 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);
@@ -28,4 +33,4 @@ const getEventBridgeEventExecutor = (getCustomActionProcessors = () => ({})) =>
     });
 };
 exports.getEventBridgeEventExecutor = getEventBridgeEventExecutor;
-exports.executeEventBridgeEvent = (0, exports.getEventBridgeEventExecutor)();
+exports.executeEventBridgeEvent = (0, exports.getEventBridgeEventExecutor)(qpq_dynamic_loader_1.default);

package/package.json

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