quidproquo-deploy-awscdk 0.0.85 → 0.0.86

package/lib/constructs/basic/Function.js

@@ -64,6 +64,11 @@ class Function extends QpqConstructBlock_1.QpqConstructBlock {
             actions: ['sns:Publish'],
             resources: ['*'],
         }));
+        // Let lambdas publish sns messages.
+        this.lambdaFunction.addToRolePolicy(new aws_cdk_lib_1.aws_iam.PolicyStatement({
+            actions: ['lambda:InvokeFunction'],
+            resources: ['arn:aws:lambda:*:*:function:*sfunc*'],
+        }));
     }
 }
 exports.Function = Function;

package/lib/constructs/feature/webserver/index.d.ts

@@ -2,4 +2,5 @@ export * from './api';
 export * from './apiKey';
 export * from './domain';
 export * from './redirect';
+export * from './serviceFunction';
 export * from './webEntry';

package/lib/constructs/feature/webserver/index.js

@@ -18,4 +18,5 @@ __exportStar(require("./api"), exports);
 __exportStar(require("./apiKey"), exports);
 __exportStar(require("./domain"), exports);
 __exportStar(require("./redirect"), exports);
+__exportStar(require("./serviceFunction"), exports);
 __exportStar(require("./webEntry"), exports);

package/lib/constructs/feature/webserver/serviceFunction/QpqWebserverServiceFunctionConstruct.d.ts

@@ -0,0 +1,11 @@
+import { aws_lambda } from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+import { ServiceFunctionQPQWebServerConfigSetting } from 'quidproquo-webserver';
+import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
+export interface QpqWebserverServiceFunctionConstructProps extends QpqConstructBlockProps {
+    serviceFunctionConfig: ServiceFunctionQPQWebServerConfigSetting;
+    apiLayerVersions?: aws_lambda.ILayerVersion[];
+}
+export declare class QpqWebserverServiceFunctionConstruct extends QpqConstructBlock {
+    constructor(scope: Construct, id: string, props: QpqWebserverServiceFunctionConstructProps);
+}

package/lib/constructs/feature/webserver/serviceFunction/QpqWebserverServiceFunctionConstruct.js

@@ -0,0 +1,50 @@
+"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.QpqWebserverServiceFunctionConstruct = void 0;
+const quidproquo_webserver_1 = require("quidproquo-webserver");
+const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
+const Function_1 = require("../../../basic/Function");
+const qpqDeployAwsCdkUtils = __importStar(require("../../../../utils"));
+class QpqWebserverServiceFunctionConstruct extends QpqConstructBlock_1.QpqConstructBlock {
+    constructor(scope, id, props) {
+        super(scope, id, props);
+        // Build Function
+        const func = new Function_1.Function(this, 'api-function', {
+            buildPath: quidproquo_webserver_1.qpqWebServerUtils.getServiceFunctionFullPath(props.qpqConfig, props.serviceFunctionConfig),
+            functionName: this.resourceName(`${props.serviceFunctionConfig.functionName}-sfunc`),
+            functionType: 'lambdaServiceFunctionExecute',
+            executorName: 'executeServiceFunctionExecuteEvent',
+            qpqConfig: props.qpqConfig,
+            apiLayerVersions: props.apiLayerVersions,
+            awsAccountId: props.awsAccountId,
+        });
+        const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(this, 'grantable', this.qpqConfig, props.awsAccountId);
+        grantables.forEach((g) => {
+            g.grantAll(func.lambdaFunction);
+        });
+    }
+}
+exports.QpqWebserverServiceFunctionConstruct = QpqWebserverServiceFunctionConstruct;

package/lib/constructs/feature/webserver/serviceFunction/index.d.ts

@@ -0,0 +1 @@
+export * from './QpqWebserverServiceFunctionConstruct';

package/lib/constructs/feature/webserver/serviceFunction/index.js

@@ -0,0 +1,17 @@
+"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("./QpqWebserverServiceFunctionConstruct"), exports);

package/lib/lambdas/lambdaAPIGatewayEvent.js

@@ -45,7 +45,7 @@ const getAPIGatewayEventExecutor = (dynamicModuleLoader, getCustomActionProcesso
         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(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)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(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)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getServiceFunctionActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
         const logger = (result) => __awaiter(void 0, void 0, void 0, function* () {
             // addResult(
             //   envConfig.appName,

package/lib/lambdas/lambdaEventBridgeEvent.js

@@ -30,7 +30,7 @@ const getEventBridgeEventExecutor = (dynamicModuleLoader, getCustomActionProcess
         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(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)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(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)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getServiceFunctionActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (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.js

@@ -30,7 +30,7 @@ const getOriginRequestEventExecutor = (dynamicModuleLoader, getCustomActionProce
         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(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)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(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)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getServiceFunctionActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (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/lambdaSQSEvent.js

@@ -28,7 +28,7 @@ const getStoryActionRuntime = (dynamicModuleLoader, getCustomActionProcessors =
     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(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.getSQSEventRecordActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+    const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(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.getSQSEventRecordActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getServiceFunctionActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (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/lambdaServiceFunctionExecute.d.ts

@@ -0,0 +1,6 @@
+import { ExecuteServiceFunctionEvent } from 'quidproquo-webserver';
+import { DynamicModuleLoader } from 'quidproquo-actionprocessor-awslambda';
+import { Context } from 'aws-lambda';
+import { ActionProcessorListResolver } from './actionProcessorListResolver';
+export declare const getServiceFunctionExecuteEventExecutor: (dynamicModuleLoader: DynamicModuleLoader, getCustomActionProcessors?: ActionProcessorListResolver) => (event: ExecuteServiceFunctionEvent<any>, context: Context) => Promise<import("quidproquo-core").StoryResult<any, any>>;
+export declare const executeServiceFunctionExecuteEvent: (event: ExecuteServiceFunctionEvent<any>, context: Context) => Promise<import("quidproquo-core").StoryResult<any, any>>;

package/lib/lambdas/lambdaServiceFunctionExecute.js

@@ -0,0 +1,52 @@
+"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.executeServiceFunctionExecuteEvent = exports.getServiceFunctionExecuteEventExecutor = void 0;
+const quidproquo_actionprocessor_node_1 = require("quidproquo-actionprocessor-node");
+const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
+const quidproquo_actionprocessor_node_2 = require("quidproquo-actionprocessor-node");
+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 getServiceFunctionExecuteEventExecutor = (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(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.getServiceFunctionExecuteEventActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getServiceFunctionActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+        const logger = (result) => __awaiter(void 0, void 0, void 0, function* () {
+            // addResult(
+            //   envConfig.appName,
+            //   getDateNow(),
+            //   doWeCarePath,
+            //   "route-infrastructure",
+            //   "infrastructure",
+            //   "askRoute",
+            //   result
+            // );
+        });
+        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]);
+        // just return the story result
+        return result;
+    });
+};
+exports.getServiceFunctionExecuteEventExecutor = getServiceFunctionExecuteEventExecutor;
+// Default executor
+exports.executeServiceFunctionExecuteEvent = (0, exports.getServiceFunctionExecuteEventExecutor)(qpq_dynamic_loader_1.default);

package/lib/stacks/ApiQpqServiceStack.js

@@ -43,6 +43,13 @@ class ApiQpqServiceStack extends QpqServiceStack_1.QpqServiceStack {
             qpqConfig: props.qpqConfig,
             subdomainRedirectConfig: setting,
         }));
+        // Service Functions
+        const serviceFunctions = quidproquo_webserver_1.qpqWebServerUtils.getAllServiceFunctions(props.qpqConfig).map((setting) => new constructs_1.QpqWebserverServiceFunctionConstruct(this, quidproquo_core_1.qpqCoreUtils.getUniqueKeyForSetting(setting), {
+            awsAccountId: props.awsAccountId,
+            qpqConfig: props.qpqConfig,
+            serviceFunctionConfig: setting,
+            apiLayerVersions: layers.layers,
+        }));
     }
 }
 exports.ApiQpqServiceStack = ApiQpqServiceStack;

package/package.json

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

package/src/constructs/basic/Function.ts

@@ -73,5 +73,13 @@ export class Function extends QpqConstructBlock {
         resources: ['*'],
       }),
     );
+
+    // Let lambdas publish sns messages.
+    this.lambdaFunction.addToRolePolicy(
+      new aws_iam.PolicyStatement({
+        actions: ['lambda:InvokeFunction'],
+        resources: ['arn:aws:lambda:*:*:function:*sfunc*'],
+      }),
+    );
   }
 }

package/src/constructs/feature/webserver/index.ts

@@ -2,4 +2,5 @@ export * from './api';
 export * from './apiKey';
 export * from './domain';
 export * from './redirect';
+export * from './serviceFunction';
 export * from './webEntry';

package/src/constructs/feature/webserver/serviceFunction/QpqWebserverServiceFunctionConstruct.ts

@@ -0,0 +1,49 @@
+import { aws_apigateway, aws_lambda } from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+
+import { ServiceFunctionQPQWebServerConfigSetting, qpqWebServerUtils } from 'quidproquo-webserver';
+
+import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
+
+import { Function } from '../../../basic/Function';
+
+import * as qpqDeployAwsCdkUtils from '../../../../utils';
+
+export interface QpqWebserverServiceFunctionConstructProps extends QpqConstructBlockProps {
+  serviceFunctionConfig: ServiceFunctionQPQWebServerConfigSetting;
+  apiLayerVersions?: aws_lambda.ILayerVersion[];
+}
+
+export class QpqWebserverServiceFunctionConstruct extends QpqConstructBlock {
+  constructor(scope: Construct, id: string, props: QpqWebserverServiceFunctionConstructProps) {
+    super(scope, id, props);
+
+    // Build Function
+    const func = new Function(this, 'api-function', {
+      buildPath: qpqWebServerUtils.getServiceFunctionFullPath(
+        props.qpqConfig,
+        props.serviceFunctionConfig,
+      ),
+      functionName: this.resourceName(`${props.serviceFunctionConfig.functionName}-sfunc`),
+      functionType: 'lambdaServiceFunctionExecute',
+      executorName: 'executeServiceFunctionExecuteEvent',
+
+      qpqConfig: props.qpqConfig,
+
+      apiLayerVersions: props.apiLayerVersions,
+
+      awsAccountId: props.awsAccountId,
+    });
+
+    const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(
+      this,
+      'grantable',
+      this.qpqConfig,
+      props.awsAccountId,
+    );
+
+    grantables.forEach((g) => {
+      g.grantAll(func.lambdaFunction);
+    });
+  }
+}

package/src/constructs/feature/webserver/serviceFunction/index.ts

@@ -0,0 +1 @@
+export * from './QpqWebserverServiceFunctionConstruct';

package/src/lambdas/lambdaAPIGatewayEvent.ts

@@ -11,6 +11,7 @@ import {
   getConfigGetParametersActionProcessor,
   getUserDirectoryActionProcessor,
   getWebEntryActionProcessor,
+  getServiceFunctionActionProcessor,
   awsLambdaUtils,
   DynamicModuleLoader,
 } from 'quidproquo-actionprocessor-awslambda';
@@ -75,6 +76,7 @@ export const getAPIGatewayEventExecutor = (
       ...getEventBusActionProcessor(cdkConfig.qpqConfig),
       ...getUserDirectoryActionProcessor(cdkConfig.qpqConfig),
       ...getWebEntryActionProcessor(cdkConfig.qpqConfig),
+      ...getServiceFunctionActionProcessor(cdkConfig.qpqConfig),
 
       ...getCustomActionProcessors(cdkConfig.qpqConfig),
       ...qpqCustomActionProcessors(),

package/src/lambdas/lambdaEventBridgeEvent.ts

@@ -11,6 +11,7 @@ import {
   getConfigGetSecretActionProcessor,
   getConfigGetParameterActionProcessor,
   getConfigGetParametersActionProcessor,
+  getServiceFunctionActionProcessor,
   awsLambdaUtils,
   DynamicModuleLoader,
   LambdaRuntimeConfig,
@@ -61,6 +62,7 @@ export const getEventBridgeEventExecutor = (
       ...getQueueActionProcessor(cdkConfig.qpqConfig),
       ...getEventBusActionProcessor(cdkConfig.qpqConfig),
       ...getWebEntryActionProcessor(cdkConfig.qpqConfig),
+      ...getServiceFunctionActionProcessor(cdkConfig.qpqConfig),
       ...getUserDirectoryActionProcessor(cdkConfig.qpqConfig),
 
       ...getCustomActionProcessors(cdkConfig.qpqConfig),

package/src/lambdas/lambdaEventOriginRequest.ts

@@ -9,6 +9,7 @@ import {
   getConfigGetParameterActionProcessor,
   getConfigGetParametersActionProcessor,
   getWebEntryActionProcessor,
+  getServiceFunctionActionProcessor,
   awsLambdaUtils,
   DynamicModuleLoader,
 } from 'quidproquo-actionprocessor-awslambda';
@@ -55,6 +56,7 @@ export const getOriginRequestEventExecutor = (
       ...getFileActionProcessor(cdkConfig.qpqConfig),
       ...getConfigActionProcessor(cdkConfig.qpqConfig),
       ...getWebEntryActionProcessor(cdkConfig.qpqConfig),
+      ...getServiceFunctionActionProcessor(cdkConfig.qpqConfig),
 
       // We probably don't want this?
       ...getUserDirectoryActionProcessor(cdkConfig.qpqConfig),

package/src/lambdas/lambdaSQSEvent.ts

@@ -13,6 +13,7 @@ import {
   getConfigGetParametersActionProcessor,
   getUserDirectoryActionProcessor,
   getWebEntryActionProcessor,
+  getServiceFunctionActionProcessor,
   awsLambdaUtils,
   DynamicModuleLoader,
 } from 'quidproquo-actionprocessor-awslambda';
@@ -63,6 +64,7 @@ export const getStoryActionRuntime = async (
     ...getEventBusActionProcessor(cdkConfig.qpqConfig),
     ...getUserDirectoryActionProcessor(cdkConfig.qpqConfig),
     ...getWebEntryActionProcessor(cdkConfig.qpqConfig),
+    ...getServiceFunctionActionProcessor(cdkConfig.qpqConfig),
 
     ...getCustomActionProcessors(cdkConfig.qpqConfig),
     ...qpqCustomActionProcessors(),

package/src/lambdas/lambdaServiceFunctionExecute.ts

@@ -0,0 +1,98 @@
+import { coreActionProcessor, webserverActionProcessor } from 'quidproquo-actionprocessor-node';
+import { ExecuteServiceFunctionEvent } from 'quidproquo-webserver';
+
+import {
+  getServiceFunctionExecuteEventActionProcessor,
+  getSystemActionProcessor,
+  getFileActionProcessor,
+  getQueueActionProcessor,
+  getEventBusActionProcessor,
+  getConfigGetSecretActionProcessor,
+  getConfigGetParameterActionProcessor,
+  getConfigGetParametersActionProcessor,
+  getUserDirectoryActionProcessor,
+  getWebEntryActionProcessor,
+  getServiceFunctionActionProcessor,
+  awsLambdaUtils,
+  DynamicModuleLoader,
+} from 'quidproquo-actionprocessor-awslambda';
+
+import { getConfigActionProcessor } from 'quidproquo-actionprocessor-node';
+
+import { createRuntime, askProcessEvent } from 'quidproquo-core';
+
+import { Context } from 'aws-lambda';
+
+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();
+
+export const getServiceFunctionExecuteEventExecutor = (
+  dynamicModuleLoader: DynamicModuleLoader,
+  getCustomActionProcessors: ActionProcessorListResolver = () => ({}),
+) => {
+  return async (event: ExecuteServiceFunctionEvent<any>, 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,
+
+      ...getServiceFunctionExecuteEventActionProcessor(cdkConfig.qpqConfig),
+
+      ...getConfigGetSecretActionProcessor(cdkConfig.qpqConfig),
+      ...getConfigGetParameterActionProcessor(cdkConfig.qpqConfig),
+      ...getConfigGetParametersActionProcessor(cdkConfig.qpqConfig),
+      ...getSystemActionProcessor(dynamicModuleLoader),
+      ...getFileActionProcessor(cdkConfig.qpqConfig),
+      ...getConfigActionProcessor(cdkConfig.qpqConfig),
+      ...getQueueActionProcessor(cdkConfig.qpqConfig),
+      ...getEventBusActionProcessor(cdkConfig.qpqConfig),
+      ...getUserDirectoryActionProcessor(cdkConfig.qpqConfig),
+      ...getWebEntryActionProcessor(cdkConfig.qpqConfig),
+      ...getServiceFunctionActionProcessor(cdkConfig.qpqConfig),
+
+      ...getCustomActionProcessors(cdkConfig.qpqConfig),
+      ...qpqCustomActionProcessors(),
+    };
+
+    const logger = async (result: any) => {
+      // addResult(
+      //   envConfig.appName,
+      //   getDateNow(),
+      //   doWeCarePath,
+      //   "route-infrastructure",
+      //   "infrastructure",
+      //   "askRoute",
+      //   result
+      // );
+    };
+
+    const resolveStory = createRuntime(
+      {},
+      storyActionProcessor,
+      getDateNow,
+      logger,
+      awsLambdaUtils.randomGuid,
+    );
+
+    const result = await resolveStory(askProcessEvent, [event, context]);
+
+    // just return the story result
+    return result;
+  };
+};
+
+// Default executor
+export const executeServiceFunctionExecuteEvent =
+  getServiceFunctionExecuteEventExecutor(qpqDynamicModuleLoader);

package/src/stacks/ApiQpqServiceStack.ts

@@ -12,6 +12,7 @@ import {
   QpqWebserverApiConstruct,
   QpqApiCoreQueueConstruct,
   QpqWebserverSubdomainRedirectConstruct,
+  QpqWebserverServiceFunctionConstruct,
 } from '../constructs';
 
 export interface ApiQpqServiceStackProps extends QpqServiceStackProps {
@@ -84,5 +85,21 @@ export class ApiQpqServiceStack extends QpqServiceStack {
           },
         ),
     );
+
+    // Service Functions
+    const serviceFunctions = qpqWebServerUtils.getAllServiceFunctions(props.qpqConfig).map(
+      (setting) =>
+        new QpqWebserverServiceFunctionConstruct(
+          this,
+          qpqCoreUtils.getUniqueKeyForSetting(setting),
+          {
+            awsAccountId: props.awsAccountId,
+            qpqConfig: props.qpqConfig,
+
+            serviceFunctionConfig: setting,
+            apiLayerVersions: layers.layers,
+          },
+        ),
+    );
   }
 }