@izara_project/izara-core-generate-service-code 1.0.93 → 1.0.95

package/src/emit/custom/customFlowSteps.js

@@ -13,10 +13,7 @@ import {
 export async function emitExtTopicStep({ flow, step, flowTag, stepName }) {
   const source = `app/src/generatedCode/FlowSchemas/${flowTag}/source`;
   const handlerRoot = `src/generatedCode/FlowSchemas/${flowTag}/source`;
-  let functionName = `${flowTag}${stepName}`;
-  if (stepName.startsWith(flowTag)) {
-    functionName = stepName;
-  }
+  const functionName = `${flowTag}${stepName}`;
   const mainFileName = `${functionName}_Main`;
   const startConfig = stepConfig(flow, step);
 
@@ -160,7 +157,6 @@ export async function emitOwnTopicRoot(flow, objects) {
     upperCaseFlowTag: tag,
     startConfig: _startConfig(flow)
   };
-  const isRbac = flowHasRbac(flow, objects);
   const ownArtifacts = [
     {
       path: `${source}/${mainFileName}.js`,
@@ -212,46 +208,6 @@ export async function emitOwnTopicRoot(flow, objects) {
     })
   ];
 
-  if (isRbac) {
-    const rbacStep = (flow.flowSteps || []).find(
-      (s) =>
-        typeof s?.stepName === 'string' &&
-        s.stepName.toLowerCase() === 'rbaccallback'
-    );
-    const rbacConfig = rbacStep ? stepConfig(flow, rbacStep) : null;
-    ownArtifacts.push(
-      {
-        path: `${source}/${tag}RbacCallback_Main.js`,
-        content: await renderCustom('FlowEndpointRbacCallback_Main.ejs', {
-          flowTag: flow.flowTag,
-          upperCaseFlowTag: tag,
-          functionName: `${tag}RbacCallbackMain`
-        })
-      },
-      {
-        path: `${source}/${tag}RbacCallback_HdrSqs.js`,
-        content: await renderShared('FlowHandler_HdrSqs.ejs', {
-          flowTag: flow.flowTag,
-          flowStepName: 'RbacCallback',
-          mainFileName: `${tag}RbacCallback_Main`,
-          functionName: `${tag}RbacCallbackMain`,
-          queueName: `${tag}RbacCallbackHdrSqs`,
-          startConfig: rbacConfig
-        })
-      }
-    );
-    ownFunctions.push(
-      renderSqsFunctionYaml({
-        functionName: `${tag}RbacCallbackHdrSqs`,
-        handlerPath: `${handlerRoot}/${tag}RbacCallback_HdrSqs.main`,
-        roleName: customFlowRoleName(flow.flowTag),
-        queueName: `${tag}RbacCallbackHdrSqs`,
-        flowTag: flow.flowTag,
-        flowStepName: 'RbacCallback'
-      })
-    );
-  }
-
   return {
     artifacts: ownArtifacts,
     functions: ownFunctions
@@ -352,8 +308,12 @@ export function storedCacheTableName(flow, objects) {
   if (flow.statusType !== 'storedCache') {
     return null;
   }
+  const targetObjectType =
+    typeof flow.objType === 'string'
+      ? flow.objType
+      : flow.objType?.objectType;
   const candidates = objects.filter(
-    (object) => object.objectType === flow.objType?.objectType
+    (object) => object.objectType === targetObjectType
   );
   let object;
   if (flow.objType?.serviceTag) {
@@ -373,7 +333,14 @@ export function storedCacheTableName(flow, objects) {
   if (targetResource?.tableName) {
     return targetResource.tableName;
   }
-  return null;
+  const flowTag = flow.flowTag || 'unknown';
+  const targetObj = JSON.stringify(flow.objType);
+  console.error(
+    `[ERROR] [FlowSchema Validation] Flow '${flowTag}' has statusType 'storedCache' but cannot resolve DynamoDB tableName from objType ${targetObj}`
+  );
+  throw new Error(
+    `FlowSchema validation error: Flow '${flowTag}' has statusType 'storedCache' but cannot resolve DynamoDB tableName from objType ${targetObj}. Ensure the ObjectSchema exists and defines a DynamoDB storage resource with tableName.`
+  );
 }
 
 export async function renderStepMain(functionName, startConfig = null) {

package/src/emit/custom/customFlows.js

@@ -14,11 +14,20 @@ export function supportedCustomFlows(flows) {
     throw new TypeError('flows must be an array');
   }
   return flows.filter((flow) => {
-    if (typeof flow?.flowTag !== 'string' || flow.flowTag === '') {
-      return false;
+    if (typeof flow?.flowTag !== 'string' || flow.flowTag.trim() === '') {
+      throw new Error(
+        'FlowSchema validation error: flowTag is required and must be a non-empty string'
+      );
     }
-    if (!Array.isArray(flow.event)) {
-      return false;
+    if (!Array.isArray(flow.event) || flow.event.length === 0) {
+      throw new Error(
+        `FlowSchema validation error: Flow '${flow.flowTag}' requires a non-empty 'event' array`
+      );
+    }
+    if (flow.event.includes('generateCode') && flow.event.length > 1) {
+      throw new Error(
+        `FlowSchema validation error: Flow '${flow.flowTag}' with event 'generateCode' must be a standalone event and cannot co-exist with other events`
+      );
     }
     const hasSupportedEvent = flow.event.some((e) => SUPPORTED_EVENTS.has(e));
     if (!hasSupportedEvent) {
@@ -28,9 +37,14 @@ export function supportedCustomFlows(flows) {
       if (flowHasOwnTopic(flow)) {
         return false;
       }
-      if (!flow.generatedCodeConfig.codeHookTag) {
+      if (flow.event.includes('dsq')) {
         return false;
       }
+      if (!flow.generatedCodeConfig.codeHookTag) {
+        throw new Error(
+          `FlowSchema validation error: Flow '${flow.flowTag}' has generatedCodeConfig without ownTopic, which requires 'codeHookTag' ('before' | 'after')`
+        );
+      }
     }
     return true;
   });
@@ -67,6 +81,11 @@ export function flowExtTopicSteps(flows) {
     }
     const hasTriggerFlowTypes =
       Array.isArray(flow.triggerFlowTypes) && flow.triggerFlowTypes.length > 0;
+    if (flow.statusType === 'triggerCache' && !hasTriggerFlowTypes) {
+      throw new Error(
+        `FlowSchema validation error: Flow '${flow.flowTag}' has statusType 'triggerCache' but requires a non-empty 'triggerFlowTypes' array`
+      );
+    }
     const steps = flow.flowSteps ?? [];
     const hasCheckStep = steps.some(
       (step) =>
@@ -87,7 +106,9 @@ export function flowExtTopicSteps(flows) {
       }
       const isCheckStep = step.stepName.toLowerCase().includes('checktrigger');
       if (isCheckStep && !hasTriggerFlowTypes) {
-        return [];
+        throw new Error(
+          `FlowSchema validation error: Flow '${flow.flowTag}' defines step '${step.stepName}' but requires a non-empty 'triggerFlowTypes' array`
+        );
       }
       return [
         {

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -5,8 +5,7 @@ import {
   generatedDsqFlows,
   generatedOwnTopicFlows,
   supportedCustomFlows,
-  upperFirst,
-  flowHasRbac
+  upperFirst
 } from './customFlows.js';
 import {
   customFlowApplicationManagedPaths,
@@ -19,11 +18,9 @@ import {
   emitDsqStep,
   emitOwnTopicRoot,
   renderEndpointMain,
-  stepConfig,
   _startConfig
 } from './customFlowSteps.js';
 import {
-  renderCustom,
   renderShared,
   renderDsq
 } from './customFlowTemplates.js';
@@ -101,49 +98,6 @@ async function emitFlow(flow, objects) {
   }
   const functions = [];
 
-  const isRbac = flowHasRbac(flow, objects);
-  if (isRbac && !flow.event.includes('ownTopic')) {
-    const rbacStep = (flow.flowSteps || []).find(
-      (s) =>
-        typeof s?.stepName === 'string' &&
-        s.stepName.toLowerCase() === 'rbaccallback'
-    );
-    let rbacConfig = null;
-    if (rbacStep) {
-      rbacConfig = stepConfig(flow, rbacStep);
-    }
-    artifacts.push(
-      {
-        path: `${source}/${tag}RbacCallback_Main.js`,
-        content: await renderCustom('FlowEndpointRbacCallback_Main.ejs', {
-          flowTag: flow.flowTag,
-          upperCaseFlowTag: tag,
-          functionName: `${tag}RbacCallbackMain`
-        })
-      },
-      {
-        path: `${source}/${tag}RbacCallback_HdrSqs.js`,
-        content: await renderShared('FlowHandler_HdrSqs.ejs', {
-          flowTag: flow.flowTag,
-          flowStepName: 'RbacCallback',
-          mainFileName: `${tag}RbacCallback_Main`,
-          functionName: `${tag}RbacCallbackMain`,
-          queueName: `${tag}RbacCallbackHdrSqs`,
-          startConfig: rbacConfig
-        })
-      }
-    );
-    functions.push(
-      renderSqsFunctionYaml({
-        functionName: `${tag}RbacCallbackHdrSqs`,
-        handlerPath: `${handlerRoot}/${tag}RbacCallback_HdrSqs.main`,
-        roleName: customFlowRoleName(flow.flowTag),
-        queueName: `${tag}RbacCallbackHdrSqs`,
-        flowTag: flow.flowTag,
-        flowStepName: 'RbacCallback'
-      })
-    );
-  }
 
   if (flow.event.includes('extTopic') && !flow.event.includes('ownTopic')) {
     artifacts.push({

package/src/emit/custom/templates/FlowEndpoint_Main.ejs

@@ -26,6 +26,9 @@ import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 <% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { %>
 import storedCacheSharedLib from '@izara_project/izara-core-library-stored-cache';
 <% } %>
+<% if (typeof flow !== 'undefined' && flow.statusType === 'triggerCache') { %>
+import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-trigger-cache';
+<% } %>
 
 //(<optionalImport>)
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
@@ -73,6 +76,70 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       callingFlowConfig
     );
 
+<% if (typeof flow !== 'undefined' && flow.statusType === 'triggerCache') { -%>
+
+    //(<beforeCheckTriggeredCache>)
+    //(</beforeCheckTriggeredCache>)
+
+    const checkTriggerReseted =
+      await triggeredCacheSharedLibV2.checkTriggerResetedV2(
+        _izContext,
+        {
+          serviceTag: process.env.iz_serviceTag,
+          flowTag: '<%= flowTag %>'
+        },
+        //(<triggerCacheIdentifiers>)
+        {}
+        //(</triggerCacheIdentifiers>)
+        //(<triggerCacheUniqueRequestId>)
+        //(</triggerCacheUniqueRequestId>)
+        //(<triggerCacheSettings>)
+        //(</triggerCacheSettings>)
+      );
+
+    _izContext.logger.debug(
+      `[${process.env.iz_serviceTag}:<%-
+        typeof functionName !== 'undefined'
+          ? functionName
+          : upperCaseFlowTag
+      %>] checkTriggerReseted:`,
+      checkTriggerReseted
+    );
+
+    //(<afterCheckTriggerReseted>)
+    //(</afterCheckTriggerReseted>)
+
+    const triggeredCacheResult =
+      await triggeredCacheSharedLibV2.checkTriggeredCacheV2(
+        _izContext,
+        {
+          serviceTag: process.env.iz_serviceTag,
+          flowTag: '<%= flowTag %>'
+        },
+        //(<triggerCacheCheckIdentifiers>)
+        {}
+        //(</triggerCacheCheckIdentifiers>)
+      );
+
+    _izContext.logger.debug(
+      `[${process.env.iz_serviceTag}:<%-
+        typeof functionName !== 'undefined'
+          ? functionName
+          : upperCaseFlowTag
+      %>] triggeredCacheResult:`,
+      triggeredCacheResult
+    );
+
+    //(<afterCheckTriggeredCache>)
+    //(</afterCheckTriggeredCache>)
+
+    if (triggeredCacheResult?.hasPendingTasks) {
+      //(<dispatchTriggerFlowHook>)
+      //(</dispatchTriggerFlowHook>)
+      return triggeredCacheResult;
+    }
+
+<% } -%>
 <% if (typeof flow !== 'undefined' && flow.statusType === 'storedCache') { -%>
 
     //(<beforeCheckCache>)
@@ -107,9 +174,15 @@ export default async function <%- typeof functionName !== 'undefined' ? function
 
       //(<checkStoredCacheHook>)
       //(</checkStoredCacheHook>)
+
+      if (cacheMainStatus === 'complete') {
+        //(<returnStoredCacheHit>)
+        return cacheMain;
+        //(</returnStoredCacheHit>)
+      }
     }
 <% } -%>
-<% if (typeof flow !== 'undefined' && flow.isRbac && !flow.generatedCodeConfig) { -%>
+<% if (typeof flow !== 'undefined' && flow.isRbac && !flow.generatedCodeConfig && flow.initiateBy !== 'systemNoUser') { -%>
 
     const { checkRbacPermission } =
       await import('@izara_project/izara-authorization');
@@ -127,7 +200,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
           serviceTag: '<%- (typeof rbacServiceTag !== "undefined" && rbacServiceTag) ? rbacServiceTag : ((flow.objType?.belongTo ? (Array.isArray(flow.objType.belongTo) ? flow.objType.belongTo[0]?.serviceTag : flow.objType.belongTo?.serviceTag) : null) || flow.serviceTag || (flow.objType ? flow.objType.serviceTag : "")) %>'
         },
         requestParams: typeof requestParams !== 'undefined' ? requestParams : {},
-        nextFlowStepName: '<%- upperCaseFlowTag %>RbacCallback'
+        sync: true
       }
     );
 

package/src/emit/relationship/templates/ChangeRelationship_Main.ejs

@@ -84,15 +84,15 @@ export default async function <%- functionName %>(
       firstObject,
       secondObject,
       oldRelTypeAndDirection,
-      newRelType
-      //(<requestParamCreateRel>)
-      //(</requestParamCreateRel>)
+      newRelType,
+      //(<requestParamChangeRel>)
+      //(</requestParamChangeRel>)
     } = requestParams;
 
     let foundErrors = [];
     const parentFlowId = identifierUuid();
     //(<beforeValidateChangeRel>)
-    //(</beforeValidateChangeRel>).
+    //(</beforeValidateChangeRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
@@ -443,7 +443,7 @@ export default async function <%- functionName %>(
         newRelType,
         originTimestamp,
         changedByUserId,
-        parentFlowId
+        parentFlowId,
         //(<messageBodyChangeRel>)
         //(</messageBodyChangeRel>)
 
@@ -461,15 +461,15 @@ export default async function <%- functionName %>(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.changeRelationshipComplete
                     ),
-                    //(</callingFlowProperties>)
+                    //(<callingFlowProperties>)
                     {
                       graphServiceTag: storageResource.graphServiceTag
                     }
+                    //(</callingFlowProperties>)
                   )
                 )
               );

package/src/emit/relationship/templates/CreateRelationship_Main.ejs

@@ -83,7 +83,7 @@ export default async function createRelationship(
       relationshipDirection,
       relationshipProperties,
       deepPathConditional,
-      settings = {}
+      settings = {},
       //(<requestParamCreateRel>)
       //(</requestParamCreateRel>)
     } = requestParams;
@@ -93,7 +93,7 @@ export default async function createRelationship(
     let foundErrors = [];
     const parentFlowId = identifierUuid();
     //(<beforeValidateCreateRel>)
-    //(</beforeValidateCreateRel>).
+    //(</beforeValidateCreateRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
@@ -465,7 +465,7 @@ export default async function createRelationship(
         relationshipProperties,
         deepPathConditional: deepPathConditional || [],
         parentFlowId,
-        settings: { createOnConditionalFail: createOnConditionalFail }
+        settings: { createOnConditionalFail: createOnConditionalFail },
         //(<inCreateRelMessageBodyCreateRel>)
         //(</inCreateRelMessageBodyCreateRel>)
 
@@ -483,15 +483,15 @@ export default async function createRelationship(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.createRelComplete
                     ),
-                    //(</callingFlowProperties>)
+                    //(<callingFlowProperties>)
                     {
                       graphServiceTag: storageResource.graphServiceTag
                     }
+                    //(</callingFlowProperties>)
                   )
                 )
               );

package/src/emit/relationship/templates/DeleteRelationship_Main.ejs

@@ -81,7 +81,7 @@ export default async function deleteRelationship(
       secondObject,
       relType,
       relId,
-      relationshipDirection
+      relationshipDirection,
       //(<requestParamDeleteRel>)
       //(</requestParamDeleteRel>)
     } = requestParams;
@@ -346,7 +346,7 @@ export default async function deleteRelationship(
         relType: relType,
         relId: relId,
         relationshipDirection: relationshipDirection,
-        parentFlowId: parentFlowId
+        parentFlowId: parentFlowId,
         //(<inDeleteRelMessageBody>)
         //(</inDeleteRelMessageBody>)
       };
@@ -362,11 +362,11 @@ export default async function deleteRelationship(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.deleteRelComplete
                     ),
+                    //(<callingFlowProperties>)
                     {}
                     //(</callingFlowProperties>)
                   )

package/src/emit/relationship/templates/GetRelationship_Main.ejs

@@ -79,7 +79,7 @@ export default async function getRelationship(
       secondObject,
       relType,
       relId,
-      relationshipDirection
+      relationshipDirection,
       //(<requestParamGetRel>)
       //(</requestParamGetRel>)
     } = requestParams;

package/src/emit/relationship/templates/MoveRelationship_Main.ejs

@@ -87,7 +87,7 @@ export default async function moveRelationship(
       relType,
       relationshipDirection,
       relationshipProperties,
-      moveObject
+      moveObject,
       //(<requestParamMoveRel>)
       //(</requestParamMoveRel>)
     } = requestParams;
@@ -96,7 +96,7 @@ export default async function moveRelationship(
     let foundErrors = [];
 
     //(<beforeValidateMoveRel>)
-    //(</beforeValidateMoveRel>).
+    //(</beforeValidateMoveRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
@@ -428,7 +428,7 @@ export default async function moveRelationship(
         relationshipDirection,
         relationshipProperties,
         moveObject,
-        parentFlowId: parentFlowId
+        parentFlowId: parentFlowId,
         //(<messageBodyMoveRel>)
         //(</messageBodyMoveRel>)
 
@@ -446,15 +446,15 @@ export default async function moveRelationship(
                   callingFlowConfig, // receive parent callingFlowConfig.
                   callingFlowSharedLib.createCallingFlowConfig(
                     // calling flow own service
-                    //(<callingFlowProperties>)
                     await lambdaSharedLib.lambdaFunctionName(
                       _izContext,
                       TOPIC_NAME_GENERATE_CODE.moveRelationshipComplete
                     ),
-                    //(</callingFlowProperties>)
+                    //(<callingFlowProperties>)
                     {
                       graphServiceTag: storageResource.graphServiceTag
                     }
+                    //(</callingFlowProperties>)
                   )
                 )
               );

package/src/emit/relationship/templates/UpdateRelationship_Main.ejs

@@ -83,7 +83,7 @@ export default async function updateRelationship(
       relType,
       relId,
       relationshipProperties,
-      relationshipDirection
+      relationshipDirection,
       //(<requestParamUpdateRel>)
       //(</requestParamUpdateRel>)
     } = requestParams;
@@ -292,7 +292,7 @@ export default async function updateRelationship(
           relationshipDirection,
           status: 'error',
           foundErrors: foundErrors,
-          parentFlowId: parentFlowId
+          parentFlowId: parentFlowId,
           //(<inUpdateCompleteMsgUpdateRel>)
           //(</inUpdateCompleteMsgUpdateRel>)
         };
@@ -422,7 +422,7 @@ export default async function updateRelationship(
           relType: relType,
           relationshipProperties,
           relationshipDirection,
-          parentFlowId
+          parentFlowId,
           //(<inUpdateRelMessageBodyUpdateRel>)
           //(</inUpdateRelMessageBodyUpdateRel>)
         };
@@ -438,15 +438,15 @@ export default async function updateRelationship(
                     callingFlowConfig, // receive parent callingFlowConfig.
                     callingFlowSharedLib.createCallingFlowConfig(
                       // callingFlow own service
-                      //(<callingFlowProperties>)
                       await lambdaSharedLib.lambdaFunctionName(
                         _izContext,
                         TOPIC_NAME_GENERATE_CODE.updateRelComplete
                       ),
-                      //(</callingFlowProperties>)
+                      //(<callingFlowProperties>)
                       {
                         graphServiceTag: storageResource.graphServiceTag
                       }
+                      //(</callingFlowProperties>)
                     )
                   )
                 );

package/src/emit/resource/iamResourceArtifacts.js

@@ -3,8 +3,7 @@ import { CRUD_ACTIONS } from '../crud/crudActionPlan.js';
 import {
   customFlowRoleName,
   flowDsqSteps,
-  flowExtTopicSteps,
-  flowHasRbac
+  flowExtTopicSteps
 } from '../custom/customFlows.js';
 import {
   RELATIONSHIP_ACTIONS,
@@ -242,7 +241,11 @@ export function roleTableNames(state, roleName) {
     tables.push('UserUploadRecords', 'ReservedDataMain');
   }
   if (flow.statusType === 'storedCache') {
-    const object = state.objectTablesByType.get(flow.objType?.objectType);
+    const targetObjectType =
+      typeof flow.objType === 'string'
+        ? flow.objType
+        : flow.objType?.objectType;
+    const object = state.objectTablesByType.get(targetObjectType);
     if (object) {
       tables.push(object);
     }
@@ -334,9 +337,6 @@ export function roleQueueNames(state, roleName) {
   if (includesEvent(flow, 'dsq')) {
     queueList.push(`${tag}HdrDsq`);
   }
-  if (flowHasRbac(flow, state.objects)) {
-    queueList.push(`${tag}RbacCallbackHdrSqs`);
-  }
   queueList.push(
     ...flowExtTopicSteps([flow]).map(
       ({ flowTag, stepName }) => `${flowTag}${stepName}HdrSqs`

package/src/emit/resource/resourceState.js

@@ -4,8 +4,7 @@ import {
   flowExtTopicSteps,
   generatedDsqFlows,
   generatedOwnTopicFlows,
-  supportedCustomFlows,
-  flowHasRbac
+  supportedCustomFlows
 } from '../custom/customFlows.js';
 import { hasSystemWebSocket } from '../system/emitSystemWebSocketArtifacts.js';
 import { rbacFlowTag } from '../rbac/rbacFlowTag.js';
@@ -146,7 +145,7 @@ export function createResourceState({ objects, relationships, flows }) {
   const customSqsQueues = [
     ...flows
       .filter((flow) => includesEvent(flow, 'extTopic'))
-      .map((flow) => `Process${upperFirst(flow.flowTag)}HdrSqs`),
+      .map((flow) => `${upperFirst(flow.flowTag)}HdrSqs`),
     ...flows
       .filter(
         (flow) =>
@@ -159,12 +158,7 @@ export function createResourceState({ objects, relationships, flows }) {
   for (const { flowTag, stepName } of flowExtTopicSteps(flows)) {
     customSqsQueues.push(`${flowTag}${stepName}HdrSqs`);
   }
-  for (const flow of flows) {
-    if (flowHasRbac(flow, objects)) {
-      const tag = upperFirst(flow.flowTag);
-      customSqsQueues.push(`${tag}RbacCallbackHdrSqs`);
-    }
-  }
+
   for (const flow of flows.filter((flow) => includesEvent(flow, 's3'))) {
     const tag = upperFirst(flow.flowTag);
     customSqsQueues.push(`${tag}CreatePreSignUrlHdrSqs`);

package/src/emit/system/emitSystemFindDataArtifacts.js

@@ -43,13 +43,14 @@ async function _emitSystemArtifacts(objects) {
     return { artifacts: [], functions: [] };
   }
 
-  const hasFindDataEntries = buildFindDataEntries(objects).length > 0;
+  const findDataEntries = buildFindDataEntries(objects);
+  const hasFindDataEntries = findDataEntries.length > 0;
 
   const artifacts = [];
 
   if (hasFindDataEntries) {
     const findDataMain = await render('FindData_Main.ejs', {
-      datas: buildFindDataEntries(objects)
+      datas: findDataEntries
     });
     artifacts.push(
       { path: `${FIND_DATA_SOURCE}/FindData_Main.js`, content: findDataMain },
@@ -85,21 +86,21 @@ async function _emitSystemArtifacts(objects) {
 
   return {
     artifacts,
-    functions: renderSystemYamlFunctions()
+    functions: renderSystemYamlFunctions(hasFindDataEntries)
   };
 }
 
-function renderSystemYamlFunctions() {
-  const findDataYaml = renderFindDataYaml();
-  const processLogicalYaml = renderProcessLogicalYaml();
-  const processLogicalPaginateDsqYaml = renderProcessLogicalPaginateDsqYaml();
-  const processLogicalPaginateSqsYaml = renderProcessLogicalPaginateSqsYaml();
-  return [
-    findDataYaml,
-    processLogicalYaml,
-    processLogicalPaginateDsqYaml,
-    processLogicalPaginateSqsYaml
-  ];
+function renderSystemYamlFunctions(hasFindDataEntries = true) {
+  const functions = [];
+  if (hasFindDataEntries) {
+    functions.push(renderFindDataYaml());
+  }
+  functions.push(
+    renderProcessLogicalYaml(),
+    renderProcessLogicalPaginateDsqYaml(),
+    renderProcessLogicalPaginateSqsYaml()
+  );
+  return functions;
 }
 
 function renderFindDataYaml() {