@izara_project/izara-core-generate-service-code 1.0.98 → 1.0.100

package/src/emit/application/crud/templates/CreateLogicalLib.ejs

@@ -170,13 +170,20 @@ export async function resolveAndGenerateIdentifiers(
     objectSchemas
   );
 
-  foundErrors.push(
-    ...(await createNodeLib.validateRequiredOnCreateLinks(
-      _izContext,
-      objType,
-      requestParams.relationships
-    ))
-  );
+  try {
+    foundErrors.push(
+      ...(await createNodeLib.validateRequiredOnCreateLinks(
+        _izContext,
+        objType,
+        requestParams.relationships
+      ))
+    );
+  } catch (err) {
+    _izContext.logger.warn(
+      `[${process.env.iz_serviceTag}:<%- flowTag %>] validateRequiredOnCreateLinks warning:`,
+      err.message
+    );
+  }
   _izContext.logger.debug(
     `[${process.env.iz_serviceTag}:<%- flowTag %>] foundErrors:`,
     foundErrors
@@ -499,6 +506,24 @@ const ROOT_RBAC_OBJECT_TYPES = new Set([
 <%_ } _%>
 ]);
 
+<%_
+const objectQuotaServiceTags = {};
+for (const obj of objects || []) {
+  if (obj?.objectType) {
+    let serviceTag = null;
+    if (obj.belongTo) {
+      if (Array.isArray(obj.belongTo)) {
+        serviceTag = obj.belongTo[0]?.serviceTag || null;
+      } else if (obj.belongTo.serviceTag) {
+        serviceTag = obj.belongTo.serviceTag;
+      }
+    }
+    objectQuotaServiceTags[obj.objectType] = serviceTag;
+  }
+}
+_%>
+const OBJECT_QUOTA_SERVICE_TAGS = <%- JSON.stringify(objectQuotaServiceTags) %>;
+
 /**
  * Auto-provisions owner TargetRole for Root RBAC object after Graph and DynamoDB write
  * @param {Object} _izContext - Izara context object
@@ -772,6 +797,30 @@ export function resolveQuotaDeductionKeys(
     passBackProperties?.rbacType ||
     callingFlowConfig?.rbacType;
 
+  const objType =
+    returnValue?.requestParams?.objType ||
+    requestParams?.objType ||
+    passBackProperties?.objType;
+  let objectType = null;
+  if (typeof objType === 'string') {
+    objectType = objType;
+  } else if (objType && objType.objectType) {
+    objectType = objType.objectType;
+  }
+
+  let quotaServiceTag =
+    requestParams?.passBackProperties?.quotaServiceTag ||
+    passBackProperties?.passBackProperties?.quotaServiceTag ||
+    passBackProperties?.quotaServiceTag ||
+    callingFlowConfig?.quotaServiceTag;
+
+  if (!quotaServiceTag && objectType && OBJECT_QUOTA_SERVICE_TAGS[objectType]) {
+    quotaServiceTag = OBJECT_QUOTA_SERVICE_TAGS[objectType];
+  }
+  if (!quotaServiceTag) {
+    quotaServiceTag = process.env.iz_serviceTag;
+  }
+
   return {
     limitTag,
     flowTypeConcat,
@@ -780,7 +829,8 @@ export function resolveQuotaDeductionKeys(
     runningTotalReservedId,
     identifiersConcat,
     targetIdentifiers,
-    rbacType
+    rbacType,
+    quotaServiceTag
   };
 }
 
@@ -808,10 +858,15 @@ export async function forwardToQuotaConfirmation(
       targetFunction = 'ConfirmUsageHdrInv';
     }
 
+    let quotaServiceTag = quotaKeys.quotaServiceTag;
+    if (!quotaServiceTag) {
+      quotaServiceTag = process.env.iz_serviceTag;
+    }
+
     const functionName = await lambdaSharedLib.lambdaFunctionName(
       _izContext,
       targetFunction,
-      'Rbac'
+      quotaServiceTag
     );
 
     const forwardMessage = {
@@ -820,11 +875,15 @@ export async function forwardToQuotaConfirmation(
       callingFlowConfig
     };
 
-    _izContext.logger.debug('[CreateLogicalLib] invoking RBAC quota sync', {
-      targetFunction,
-      functionName,
-      forwardMessage
-    });
+    _izContext.logger.debug(
+      `[CreateLogicalLib] invoking ${quotaServiceTag} quota sync`,
+      {
+        targetFunction,
+        functionName,
+        quotaServiceTag,
+        forwardMessage
+      }
+    );
 
     try {
       quotaResult = await lambda.invokeSync(
@@ -842,7 +901,7 @@ export async function forwardToQuotaConfirmation(
           const cancelFunctionName = await lambdaSharedLib.lambdaFunctionName(
             _izContext,
             'CancelUsageHdrInv',
-            'Rbac'
+            quotaServiceTag
           );
           await lambda.invokeSync(
             _izContext,

package/src/emit/application/crud/templates/DeleteComplete_Main.ejs

@@ -145,6 +145,8 @@ export default async function DeleteComplete(
       }
       const callingFlowConfig =
         result?.additionalAttributes?.callingFlowConfig ||
+        requestParams?.passBackProperties?.parentPassBackProperties ||
+        passBackProperties?.passBackProperties?.parentPassBackProperties ||
         passBackProperties;
       const actionData = {
         objType: returnValue.requestParams.objType,

package/src/emit/application/crud/templates/DeleteEndpoint_Main.ejs

@@ -144,9 +144,9 @@ export default async function <%- flowTag %>(
       const { checkRbacPermission } =
         await import('@izara_project/izara-authorization');
 
-      //(<rbacParameterGroups_<%- flowTag %>)
+      //(<rbacParameterGroups_<%- flowTag %>>)
       const parameterGroups = {};
-      //(</rbacParameterGroups_<%- flowTag %>)
+      //(</rbacParameterGroups_<%- flowTag %>>)
 
       const resultPermissionCheck = await checkRbacPermission(
         _izContext,
@@ -181,8 +181,8 @@ export default async function <%- flowTag %>(
         );
       }
 
-      //(<rbacPublish_<%- flowTag %>)
-      //(</rbacPublish_<%- flowTag %>)
+      //(<rbacPublish_<%- flowTag %>>)
+      //(</rbacPublish_<%- flowTag %>>)
     }
     <%_ } _%>
 

package/src/emit/application/crud/templates/FlowEndpoint_HdrWbs.ejs

@@ -89,10 +89,10 @@ export const main = middleware.wrap(async (event, context) => {
             flowSchema.statusType === 'triggerCache'
           ) {
             const taskKey = `${createFlowTypeConcat(event._izContext, { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag })}${identifiers}`;
-            event._izContext.logger.debug('[FlowEndpoint_HdrWbs] registering WebSocketTask with ttl', {
+            event._izContext.logger.debug('[FlowEndpoint_HdrWbs] registering WebSocketTask with expirationTime', {
               taskKey,
               connectionId,
-              ttl: 600
+              expirationTime: Math.floor(Date.now() / 1000) + 7200
             });
             await dynamodbSharedLib.putItem(
               event._izContext,
@@ -103,14 +103,15 @@ export const main = middleware.wrap(async (event, context) => {
               {
                 taskKey,
                 connectionId: connectionId,
-                ttl: 600
+                expirationTime: Math.floor(Date.now() / 1000) + 7200
               }
             );
           } else if (flowSchema.statusType === 'none') {
             const taskKey = `${createFlowTypeConcat(event._izContext, { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag })}${correlationId}`;
             event._izContext.logger.debug('[FlowEndpoint_HdrWbs] registering WebSocketTask for status none', {
               taskKey,
-              connectionId
+              connectionId,
+              expirationTime: Math.floor(Date.now() / 1000) + 7200
             });
             await dynamodbSharedLib.putItem(
               event._izContext,
@@ -120,7 +121,8 @@ export const main = middleware.wrap(async (event, context) => {
               ),
               {
                 taskKey,
-                connectionId: connectionId
+                connectionId: connectionId,
+                expirationTime: Math.floor(Date.now() / 1000) + 7200
               }
             );
           }

package/src/emit/application/crud/templates/UpdateComplete_Main.ejs

@@ -145,6 +145,8 @@ export default async function UpdateComplete(
       }
       const callingFlowConfig =
         result?.additionalAttributes?.callingFlowConfig ||
+        requestParams?.passBackProperties?.parentPassBackProperties ||
+        passBackProperties?.passBackProperties?.parentPassBackProperties ||
         passBackProperties;
 
       const actionData = {

package/src/emit/application/crud/templates/UpdateEndpoint_Main.ejs

@@ -156,9 +156,9 @@ export default async function <%- flowTag %>(
       const { checkRbacPermission } =
         await import('@izara_project/izara-authorization');
 
-      //(<rbacParameterGroups_<%- flowTag %>)
+      //(<rbacParameterGroups_<%- flowTag %>>)
       const parameterGroups = {};
-      //(</rbacParameterGroups_<%- flowTag %>)
+      //(</rbacParameterGroups_<%- flowTag %>>)
 
       const resultPermissionCheck = await checkRbacPermission(
         _izContext,
@@ -193,8 +193,8 @@ export default async function <%- flowTag %>(
         );
       }
 
-      //(<rbacPublish_<%- flowTag %>)
-      //(</rbacPublish_<%- flowTag %>)
+      //(<rbacPublish_<%- flowTag %>>)
+      //(</rbacPublish_<%- flowTag %>>)
     }
     <%_ } _%>
 

package/src/emit/application/custom/customFlowPaths.js

@@ -4,7 +4,8 @@ import {
   generatedDsqFlows,
   generatedOwnTopicFlows,
   supportedCustomFlows,
-  upperFirst
+  upperFirst,
+  resolveS3Parts
 } from './customFlows.js';
 
 export const YAML_PATH = 'app/sls_yaml/generatedCode/source/flow-schema.yml';
@@ -70,23 +71,19 @@ export function flowPaths(flow, objects = []) {
     paths.push(...ownTopicRootPaths(flow, objects));
   }
   if (flow.event.includes('s3')) {
-    const s3Actions = [
-      'ConfirmAfterUpload',
-      'CreateObject',
-      'CreatePreSignUrl',
-      'ProcessAfterUpload',
-      'ReservedLimit'
-    ];
-    for (const action of s3Actions) {
-      let handler = 'HdrSqs';
-      if (action === 'CreateObject') {
-        handler = 'HdrWbs';
-      } else if (action === 'ProcessAfterUpload') {
-        handler = 'HdrS3';
+    const parts = resolveS3Parts(flow);
+    for (const { action, handler } of parts) {
+      let isStart = false;
+      if (typeof action === 'string' && action.toLowerCase() === 'start') {
+        isStart = true;
+      }
+      let baseName = `${tag}${action}`;
+      if (isStart) {
+        baseName = tag;
       }
       paths.push(
-        `${source}/${tag}${action}_Main.js`,
-        `${source}/${tag}${action}_${handler}.js`
+        `${source}/${baseName}_Main.js`,
+        `${source}/${baseName}_${handler}.js`
       );
     }
   }