quidproquo-actionprocessor-awslambda 0.0.52 → 0.0.54

package/lib/awsLambdaUtils.d.ts

@@ -1,8 +1,6 @@
-import { QPQConfig } from 'quidproquo-core';
 export declare const randomGuid: () => string;
 export interface UrlMatch {
     didMatch: boolean;
     params: Record<string, string> | null;
 }
 export declare const matchUrl: (path: string, url: string) => UrlMatch;
-export declare const getRuntimeResourceName: (resourceName: string, qpqConfig: QPQConfig, resourceType?: string) => string;

package/lib/awsLambdaUtils.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimeResourceName = exports.matchUrl = exports.randomGuid = void 0;
+exports.matchUrl = exports.randomGuid = void 0;
 const crypto_1 = require("crypto");
 const node_match_path_1 = require("node-match-path");
-const quidproquo_core_1 = require("quidproquo-core");
 const randomGuid = () => {
     return (0, crypto_1.randomUUID)();
 };
@@ -18,9 +17,3 @@ const matchUrl = (path, url) => {
     };
 };
 exports.matchUrl = matchUrl;
-const getRuntimeResourceName = (resourceName, qpqConfig, resourceType = '') => {
-    const service = quidproquo_core_1.qpqCoreUtils.getAppName(qpqConfig);
-    const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(qpqConfig);
-    return `${resourceName}-${service}-${environment}${resourceType}`;
-};
-exports.getRuntimeResourceName = getRuntimeResourceName;

package/lib/awsNamingUtils.d.ts

@@ -0,0 +1,3 @@
+import { QPQConfig } from 'quidproquo-core';
+export declare const getConfigRuntimeResourceName: (resourceName: string, qpqConfig: QPQConfig, resourceType?: string) => string;
+export declare const getQpqRuntimeResourceName: (resourceName: string, qpqConfig: QPQConfig, resourceType?: string) => string;

package/lib/awsNamingUtils.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getQpqRuntimeResourceName = exports.getConfigRuntimeResourceName = void 0;
+const quidproquo_core_1 = require("quidproquo-core");
+const getConfigRuntimeResourceName = (resourceName, qpqConfig, resourceType = '') => {
+    const service = quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
+    const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
+    if (feature) {
+        return `${resourceName}-${service}-${environment}-${feature}`;
+    }
+    return `${resourceName}-${service}-${environment}`;
+};
+exports.getConfigRuntimeResourceName = getConfigRuntimeResourceName;
+const getQpqRuntimeResourceName = (resourceName, qpqConfig, resourceType = '') => {
+    const name = (0, exports.getConfigRuntimeResourceName)(resourceName, qpqConfig, resourceType);
+    return `${name}-qpq`;
+};
+exports.getQpqRuntimeResourceName = getQpqRuntimeResourceName;

package/lib/getActionProcessor/core/config/getConfigGetParameterActionProcessor.js

@@ -15,7 +15,7 @@ const getParameter_1 = require("../../../logic/parametersManager/getParameter");
 const getProcessConfigGetParameter = (qpqConfig) => {
     return ({ parameterName }) => __awaiter(void 0, void 0, void 0, function* () {
         const awsParameterKey = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveParameterKey)(parameterName, qpqConfig);
-        const parameterValue = yield (0, getParameter_1.getParameter)(awsParameterKey, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig));
+        const parameterValue = yield (0, getParameter_1.getParameter)(awsParameterKey, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig));
         return (0, quidproquo_core_1.actionResult)(parameterValue);
     });
 };

package/lib/getActionProcessor/core/config/getConfigGetParametersActionProcessor.js

@@ -15,7 +15,7 @@ const getParameters_1 = require("../../../logic/parametersManager/getParameters"
 const getProcessConfigGetParameters = (qpqConfig) => {
     return ({ parameterNames }) => __awaiter(void 0, void 0, void 0, function* () {
         const awsParameterKeys = parameterNames.map((pn) => (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveParameterKey)(pn, qpqConfig));
-        const parameterValues = yield (0, getParameters_1.getParameters)(awsParameterKeys, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig));
+        const parameterValues = yield (0, getParameters_1.getParameters)(awsParameterKeys, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig));
         return (0, quidproquo_core_1.actionResult)(parameterValues);
     });
 };

package/lib/getActionProcessor/core/config/getConfigGetSecretActionProcessor.js

@@ -15,7 +15,7 @@ const getSecret_1 = require("../../../logic/secretsManager/getSecret");
 const getProcessConfigActionType = (qpqConfig) => {
     return ({ secretName }) => __awaiter(void 0, void 0, void 0, function* () {
         const awsSecretKey = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveSecretKey)(secretName, qpqConfig);
-        const secretValue = yield (0, getSecret_1.getSecret)(awsSecretKey, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig));
+        const secretValue = yield (0, getSecret_1.getSecret)(awsSecretKey, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig));
         return (0, quidproquo_core_1.actionResult)(secretValue);
     });
 };

package/lib/getActionProcessor/core/event/getAPIGatewayEventActionProcessor.js

@@ -12,9 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const quidproquo_core_1 = require("quidproquo-core");
 const quidproquo_webserver_1 = require("quidproquo-webserver");
 const awsLambdaUtils_1 = require("../../../awsLambdaUtils");
-const getProcessTransformEventParams = (appName) => {
+const getProcessTransformEventParams = (serviceName) => {
     return ({ eventParams: [apiGatewayEvent, context] }) => __awaiter(void 0, void 0, void 0, function* () {
-        const path = (apiGatewayEvent.path || '').replace(new RegExp(`^(\/${appName})/`), '/');
+        const path = (apiGatewayEvent.path || '').replace(new RegExp(`^(\/${serviceName})/`), '/');
         return (0, quidproquo_core_1.actionResult)({
             path,
             query: Object.assign(Object.assign({}, (apiGatewayEvent.multiValueQueryStringParameters || {})), (apiGatewayEvent.queryStringParameters || {})),
@@ -84,9 +84,9 @@ const getProcessMatchStory = (routes) => {
 };
 exports.default = (config) => {
     const routes = quidproquo_webserver_1.qpqWebServerUtils.getAllRoutes(config);
-    const appName = quidproquo_core_1.qpqCoreUtils.getAppName(config);
+    const serviceName = quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(config);
     return {
-        [quidproquo_core_1.EventActionType.TransformEventParams]: getProcessTransformEventParams(appName),
+        [quidproquo_core_1.EventActionType.TransformEventParams]: getProcessTransformEventParams(serviceName),
         [quidproquo_core_1.EventActionType.TransformResponseResult]: getProcessTransformResponseResult(config),
         [quidproquo_core_1.EventActionType.AutoRespond]: getProcessAutoRespond(config),
         [quidproquo_core_1.EventActionType.MatchStory]: getProcessMatchStory(routes),

package/lib/getActionProcessor/core/event/getCloudFrontOriginRequestEventActionProcessor.js

@@ -17,7 +17,7 @@ const getProcessTransformEventParams = (qpqConfig) => {
         const cfRecordRequest = cloudFrontRequestEvent.Records[0].cf.request;
         const headers = Object.keys(cfRecordRequest.headers).reduce((acc, header) => (Object.assign(Object.assign({}, acc), { [header]: cfRecordRequest.headers[header][0].value })), {});
         return (0, quidproquo_core_1.actionResult)({
-            domain: quidproquo_webserver_1.qpqWebServerUtils.getFeatureDomainName(qpqConfig),
+            domain: quidproquo_webserver_1.qpqWebServerUtils.getBaseDomainName(qpqConfig),
             body: cfRecordRequest.body,
             correlation: context.awsRequestId,
             method: cfRecordRequest.method,

package/lib/getActionProcessor/core/file/getFileDeleteActionProcessor.js

@@ -16,7 +16,7 @@ const s3Utils_1 = require("../../../logic/s3/s3Utils");
 const getProcessFileDelete = (qpqConfig) => {
     return ({ drive, filepaths }) => __awaiter(void 0, void 0, void 0, function* () {
         const s3BucketName = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveResourceName)(drive, qpqConfig);
-        const errored = yield (0, s3Utils_1.deleteFiles)(s3BucketName, filepaths, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig));
+        const errored = yield (0, s3Utils_1.deleteFiles)(s3BucketName, filepaths, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig));
         // errored deletes are a graceful success ~ Retry
         // if (errored.length > 0) {
         //   return actionResultError(

package/lib/getActionProcessor/core/file/getFileExistsActionProcessor.js

@@ -15,7 +15,7 @@ const s3Utils_1 = require("../../../logic/s3/s3Utils");
 const getProcessFileExists = (qpqConfig) => {
     return ({ drive, filepath }) => __awaiter(void 0, void 0, void 0, function* () {
         const s3BucketName = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveResourceName)(drive, qpqConfig);
-        return (0, quidproquo_core_1.actionResult)(yield (0, s3Utils_1.objectExists)(s3BucketName, filepath, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig)));
+        return (0, quidproquo_core_1.actionResult)(yield (0, s3Utils_1.objectExists)(s3BucketName, filepath, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig)));
     });
 };
 exports.default = (qpqConfig) => ({

package/lib/getActionProcessor/core/file/getFileListDirectoryActionProcessor.js

@@ -15,7 +15,7 @@ const s3Utils_1 = require("../../../logic/s3/s3Utils");
 const getProcessFileListDirectory = (qpqConfig) => {
     return ({ drive, folderPath, maxFiles, pageToken }) => __awaiter(void 0, void 0, void 0, function* () {
         const s3BucketName = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveResourceName)(drive, qpqConfig);
-        const s3FileList = yield (0, s3Utils_1.listFiles)(s3BucketName, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig), folderPath, maxFiles, pageToken);
+        const s3FileList = yield (0, s3Utils_1.listFiles)(s3BucketName, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), folderPath, maxFiles, pageToken);
         // Add the drive onto the list
         const fileInfos = s3FileList.fileInfos.map((s3fi) => (Object.assign(Object.assign({}, s3fi), { drive: drive })));
         return (0, quidproquo_core_1.actionResult)({

package/lib/getActionProcessor/core/file/getFileReadBinaryContentsActionProcessor.js

@@ -15,7 +15,7 @@ const s3Utils_1 = require("../../../logic/s3/s3Utils");
 const getProcessFileReadBinaryContents = (qpqConfig) => {
     return ({ drive, filepath }) => __awaiter(void 0, void 0, void 0, function* () {
         const s3BucketName = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveResourceName)(drive, qpqConfig);
-        return (0, quidproquo_core_1.actionResult)(yield (0, s3Utils_1.readBinaryFile)(s3BucketName, filepath, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig)));
+        return (0, quidproquo_core_1.actionResult)(yield (0, s3Utils_1.readBinaryFile)(s3BucketName, filepath, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig)));
     });
 };
 exports.default = (qpqConfig) => ({

package/lib/getActionProcessor/core/file/getFileReadTextContentsActionProcessor.js

@@ -15,7 +15,7 @@ const s3Utils_1 = require("../../../logic/s3/s3Utils");
 const getProcessFileReadTextContents = (qpqConfig) => {
     return ({ drive, filepath }) => __awaiter(void 0, void 0, void 0, function* () {
         const s3BucketName = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveResourceName)(drive, qpqConfig);
-        return (0, quidproquo_core_1.actionResult)(yield (0, s3Utils_1.readTextFile)(s3BucketName, filepath, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig)));
+        return (0, quidproquo_core_1.actionResult)(yield (0, s3Utils_1.readTextFile)(s3BucketName, filepath, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig)));
     });
 };
 exports.default = (qpqConfig) => ({

package/lib/getActionProcessor/core/file/getFileWriteBinaryContentsActionProcessor.js

@@ -15,7 +15,7 @@ const s3Utils_1 = require("../../../logic/s3/s3Utils");
 const getProcessFileWriteBinaryContents = (qpqConfig) => {
     return ({ drive, filepath, data }) => __awaiter(void 0, void 0, void 0, function* () {
         const s3BucketName = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveResourceName)(drive, qpqConfig);
-        yield (0, s3Utils_1.writeBinaryFile)(s3BucketName, filepath, data, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig));
+        yield (0, s3Utils_1.writeBinaryFile)(s3BucketName, filepath, data, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig));
         return (0, quidproquo_core_1.actionResult)(void 0);
     });
 };

package/lib/getActionProcessor/core/file/getFileWriteTextContentsActionProcessor.js

@@ -15,7 +15,7 @@ const s3Utils_1 = require("../../../logic/s3/s3Utils");
 const getProcessFileWriteTextContents = (qpqConfig) => {
     return ({ drive, filepath, data }) => __awaiter(void 0, void 0, void 0, function* () {
         const s3BucketName = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveResourceName)(drive, qpqConfig);
-        yield (0, s3Utils_1.writeTextFile)(s3BucketName, filepath, data, quidproquo_core_1.qpqCoreUtils.getDeployRegion(qpqConfig));
+        yield (0, s3Utils_1.writeTextFile)(s3BucketName, filepath, data, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig));
         return (0, quidproquo_core_1.actionResult)(void 0);
     });
 };

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 export * from './getActionProcessor';
 export * as awsLambdaUtils from './awsLambdaUtils';
+export * as awsNamingUtils from './awsNamingUtils';
 export * from './runtimeConfig/QPQAWSResourceMap';
 export * from './types/DynamicLoader';
 export * from './logic/parametersManager/getParameter';

package/lib/index.js

@@ -26,9 +26,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.awsLambdaUtils = void 0;
+exports.awsNamingUtils = exports.awsLambdaUtils = void 0;
 __exportStar(require("./getActionProcessor"), exports);
 exports.awsLambdaUtils = __importStar(require("./awsLambdaUtils"));
+exports.awsNamingUtils = __importStar(require("./awsNamingUtils"));
 __exportStar(require("./runtimeConfig/QPQAWSResourceMap"), exports);
 __exportStar(require("./types/DynamicLoader"), exports);
 __exportStar(require("./logic/parametersManager/getParameter"), exports);

package/lib/runtimeConfig/qpqAwsLambdaRuntimeConfigUtils.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveParameterKey = exports.resolveSecretKey = exports.resolveResourceName = void 0;
-const awsLambdaUtils_1 = require("../awsLambdaUtils");
+const awsNamingUtils_1 = require("../awsNamingUtils");
 const resolveResourceName = (resourceName, qpqConfig) => {
-    return (0, awsLambdaUtils_1.getRuntimeResourceName)(resourceName, qpqConfig);
+    return (0, awsNamingUtils_1.getConfigRuntimeResourceName)(resourceName, qpqConfig);
 };
 exports.resolveResourceName = resolveResourceName;
 const resolveSecretKey = (secretName, qpqConfig) => {
-    return (0, awsLambdaUtils_1.getRuntimeResourceName)(secretName, qpqConfig);
+    return (0, awsNamingUtils_1.getConfigRuntimeResourceName)(secretName, qpqConfig);
 };
 exports.resolveSecretKey = resolveSecretKey;
 const resolveParameterKey = (parameterName, qpqConfig) => {
-    return (0, awsLambdaUtils_1.getRuntimeResourceName)(parameterName, qpqConfig);
+    return (0, awsNamingUtils_1.getConfigRuntimeResourceName)(parameterName, qpqConfig);
 };
 exports.resolveParameterKey = resolveParameterKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",