quidproquo-actionprocessor-awslambda 0.0.113 → 0.0.115

package/lib/awsNamingUtils.d.ts

@@ -1,11 +1,12 @@
-import { QPQConfig } from 'quidproquo-core';
+import { QPQConfig, ResourceName } from 'quidproquo-core';
 export declare const getGlobalConfigRuntimeResourceName: (resourceName: string, application: string, environment: string, feature?: string) => string;
 export declare const getGlobalQpqRuntimeResourceName: (resourceName: string, application: string, environment: string, feature?: string, resourceType?: string) => string;
 export declare const getConfigRuntimeResourceName: (resourceName: string, application: string, service: string, environment: string, feature?: string) => string;
 export declare const getConfigRuntimeResourceNameFromConfig: (resourceName: string, qpqConfig: QPQConfig) => string;
 export declare const getConfigRuntimeResourceNameFromConfigWithServiceOverride: (resourceName: string, qpqConfig: QPQConfig, serviceOverride?: string) => string;
 export declare const getQpqRuntimeResourceName: (resourceName: string, application: string, service: string, environment: string, feature?: string, resourceType?: string) => string;
-export declare const getQpqRuntimeResourceNameFromConfig: (resourceName: string, qpqConfig: QPQConfig, resourceType?: string) => string;
+export declare const getQpqRuntimeResourceNameFromConfig: (resourceName: ResourceName, qpqConfig: QPQConfig, resourceType?: string) => string;
+export declare const getKvsDynamoTableNameFromConfig: (resourceName: ResourceName, qpqConfig: QPQConfig, resourceType?: string) => string;
 export declare const getCFExportNameUserPoolIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
 export declare const getCFExportNameUserPoolClientIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
 export declare const getCFExportNameApiKeyIdFromConfig: (apiKeyName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;

package/lib/awsNamingUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEventBusSnsTopicArn = exports.getCFExportNameDistributionIdArnFromConfig = exports.getCFExportNameSnsTopicArnFromConfig = exports.getCFExportNameApiKeyIdFromConfig = exports.getCFExportNameUserPoolClientIdFromConfig = exports.getCFExportNameUserPoolIdFromConfig = exports.getQpqRuntimeResourceNameFromConfig = exports.getQpqRuntimeResourceName = exports.getConfigRuntimeResourceNameFromConfigWithServiceOverride = exports.getConfigRuntimeResourceNameFromConfig = exports.getConfigRuntimeResourceName = exports.getGlobalQpqRuntimeResourceName = exports.getGlobalConfigRuntimeResourceName = void 0;
+exports.getEventBusSnsTopicArn = exports.getCFExportNameDistributionIdArnFromConfig = exports.getCFExportNameSnsTopicArnFromConfig = exports.getCFExportNameApiKeyIdFromConfig = exports.getCFExportNameUserPoolClientIdFromConfig = exports.getCFExportNameUserPoolIdFromConfig = exports.getKvsDynamoTableNameFromConfig = exports.getQpqRuntimeResourceNameFromConfig = exports.getQpqRuntimeResourceName = exports.getConfigRuntimeResourceNameFromConfigWithServiceOverride = exports.getConfigRuntimeResourceNameFromConfig = exports.getConfigRuntimeResourceName = exports.getGlobalQpqRuntimeResourceName = exports.getGlobalConfigRuntimeResourceName = void 0;
 const quidproquo_core_1 = require("quidproquo-core");
 const quidproquo_config_aws_1 = require("quidproquo-config-aws");
 const getGlobalConfigRuntimeResourceName = (resourceName, application, environment, feature) => {
@@ -46,13 +46,27 @@ const getQpqRuntimeResourceName = (resourceName, application, service, environme
 };
 exports.getQpqRuntimeResourceName = getQpqRuntimeResourceName;
 const getQpqRuntimeResourceNameFromConfig = (resourceName, qpqConfig, resourceType = '') => {
+    const crossServiceResourceName = quidproquo_core_1.qpqCoreUtils.resolveCrossServiceResourceName(resourceName);
     const application = quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
-    const service = quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    const service = crossServiceResourceName.service || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
     const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
     const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
-    return (0, exports.getQpqRuntimeResourceName)(resourceName, application, service, environment, feature, resourceType);
+    return (0, exports.getQpqRuntimeResourceName)(crossServiceResourceName.name, application, service, environment, feature, resourceType);
 };
 exports.getQpqRuntimeResourceNameFromConfig = getQpqRuntimeResourceNameFromConfig;
+const getKvsDynamoTableNameFromConfig = (resourceName, qpqConfig, resourceType = '') => {
+    var _a;
+    const storeConfig = quidproquo_core_1.qpqCoreUtils.getKeyValueStoreByName(qpqConfig, resourceName);
+    const crossServiceResourceName = quidproquo_core_1.qpqCoreUtils.resolveCrossServiceResourceName(resourceName);
+    const application = quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
+    const service = crossServiceResourceName.service ||
+        ((_a = storeConfig === null || storeConfig === void 0 ? void 0 : storeConfig.owner) === null || _a === void 0 ? void 0 : _a.module) ||
+        quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
+    const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
+    return (0, exports.getQpqRuntimeResourceName)(crossServiceResourceName.name, application, service, environment, feature, resourceType);
+};
+exports.getKvsDynamoTableNameFromConfig = getKvsDynamoTableNameFromConfig;
 const getCFExportNameUserPoolIdFromConfig = (userDirectoryName, qpqConfig, serviceOverride, applicationOverride) => {
     const application = applicationOverride || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
     const service = serviceOverride || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
@@ -92,24 +106,11 @@ const getCFExportNameDistributionIdArnFromConfig = (webEntryName, qpqConfig, ser
     return (0, exports.getQpqRuntimeResourceName)(webEntryName, application, service, environment, feature, 'distribution-id-export');
 };
 exports.getCFExportNameDistributionIdArnFromConfig = getCFExportNameDistributionIdArnFromConfig;
-function insertPipes(input) {
-    let output = '';
-    for (let i = 0; i < input.length; i++) {
-        output += input[i] + '|';
-    }
-    // remove the last '|' character
-    output = output.slice(0, -1);
-    return output;
-}
 const getEventBusSnsTopicArn = (eventBusName, qpqConfig, module, environment, application, feature) => {
     const topicName = (0, exports.getConfigRuntimeResourceName)(eventBusName, application, module, environment, feature);
     const accountInfo = (0, quidproquo_config_aws_1.getAwsServiceAccountInfoByDeploymentInfo)(qpqConfig, module, environment, feature, application);
     const awsAccountId = accountInfo.awsAccountId;
     const region = accountInfo.awsRegion;
-    const arn = `arn:aws:sns:${region}:${awsAccountId}:${topicName}`;
-    console.log('awsAccountId: ', awsAccountId);
-    console.log('TopicARN: ', insertPipes(arn));
-    console.log('accountInfo: ', JSON.stringify(accountInfo, null, 2));
-    return arn;
+    return `arn:aws:sns:${region}:${awsAccountId}:${topicName}`;
 };
 exports.getEventBusSnsTopicArn = getEventBusSnsTopicArn;

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreDeleteActionProcessor.js

@@ -15,7 +15,7 @@ const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
 const getProcessKeyValueStoreDelete = (qpqConfig) => {
     return ({ keyValueStoreName, key, sortKey }) => __awaiter(void 0, void 0, void 0, function* () {
-        const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
+        const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         yield (0, dynamo_1.deleteItem)(dynamoTableName, region, key, sortKey);
         return (0, quidproquo_core_2.actionResult)(void 0);

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreGetActionProcessor.js

@@ -15,7 +15,7 @@ const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
 const getProcessKeyValueStoreGet = (qpqConfig) => {
     return ({ keyValueStoreName, key }) => __awaiter(void 0, void 0, void 0, function* () {
-        const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
+        const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const result = yield (0, dynamo_1.getItem)(dynamoTableName, key, region);
         return (0, quidproquo_core_2.actionResult)(result);

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreGetAllActionProcessor.js

@@ -15,7 +15,7 @@ const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
 const getProcessKeyValueStoreGetAll = (qpqConfig) => {
     return ({ keyValueStoreName }) => __awaiter(void 0, void 0, void 0, function* () {
-        const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
+        const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const result = yield (0, dynamo_1.getAllItems)(dynamoTableName, region);
         return (0, quidproquo_core_2.actionResult)(result);

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreQueryActionProcessor.js

@@ -16,7 +16,7 @@ const dynamo_1 = require("../../../logic/dynamo");
 const qpqDynamoOrm_1 = require("../../../logic/dynamo/qpqDynamoOrm");
 const getProcessKeyValueStoreQuery = (qpqConfig) => {
     return ({ keyValueStoreName, keyCondition, filterCondition }) => __awaiter(void 0, void 0, void 0, function* () {
-        const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
+        const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const storeConfig = quidproquo_core_1.qpqCoreUtils.getKeyValueStoreByName(qpqConfig, keyValueStoreName);
         if (!storeConfig) {

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreScanActionProcessor.js

@@ -15,12 +15,8 @@ const quidproquo_core_2 = require("quidproquo-core");
 const scan_1 = require("../../../logic/dynamo/scan");
 const getProcessKeyValueStoreScan = (qpqConfig) => {
     return ({ keyValueStoreName, filterCondition }) => __awaiter(void 0, void 0, void 0, function* () {
-        const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
+        const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
-        const storeConfig = quidproquo_core_1.qpqCoreUtils.getKeyValueStoreByName(qpqConfig, keyValueStoreName);
-        if (!storeConfig) {
-            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Could not find key value store with name "${keyValueStoreName}"`);
-        }
         const items = yield (0, scan_1.scan)(dynamoTableName, region, filterCondition);
         return (0, quidproquo_core_2.actionResult)(items);
     });

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreUpdateActionProcessor.js

@@ -15,7 +15,7 @@ const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
 const getProcessKeyValueStoreUpdate = (qpqConfig) => {
     return ({ keyValueStoreName, key, sortKey, updates, options }) => __awaiter(void 0, void 0, void 0, function* () {
-        const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
+        const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         yield (0, dynamo_1.updateItem)(dynamoTableName, region, updates, key, sortKey);
         return (0, quidproquo_core_2.actionResult)(void 0);

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreUpsertActionProcessor.js

@@ -14,7 +14,7 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const dynamo_1 = require("../../../logic/dynamo");
 const getProcessKeyValueStoreUpsert = (qpqConfig) => {
     return ({ keyValueStoreName, item, options }) => __awaiter(void 0, void 0, void 0, function* () {
-        const dynamoTableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
+        const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const storeConfig = quidproquo_core_1.qpqCoreUtils.getKeyValueStoreByName(qpqConfig, keyValueStoreName);
         if (!storeConfig) {

package/lib/logic/dynamo/qpqDynamoOrm/buildDynamoQuery.js

@@ -135,15 +135,20 @@ const buildAttributeValue = (value) => {
                 };
             }
             else if (value !== null) {
+                const objectKeyValuePairs = Object.entries(value)
+                    .filter(([k, v]) => v !== undefined)
+                    .map(([k, v]) => {
+                    return [k, (0, exports.buildAttributeValue)(v)];
+                });
                 return {
-                    M: Object.fromEntries(Object.entries(value).map(([k, v]) => [k, (0, exports.buildAttributeValue)(v)])),
+                    M: Object.fromEntries(objectKeyValuePairs),
                 };
             }
             else {
                 return { NULL: true };
             }
         default:
-            throw new Error(`Unsupported data type: ${valueType}`);
+            throw new Error(`Unsupported data type in kvs expression: ${valueType}`);
     }
 };
 exports.buildAttributeValue = buildAttributeValue;

package/package.json

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