@izara_project/izara-core-generate-service-code 1.0.75 → 1.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.75",
+  "version": "1.0.76",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {

package/src/compile/loadSchemas.js

@@ -159,41 +159,47 @@ export async function resolveExtendedObjectSchemas(
       }
     }
 
-    /*
     if (
       currentSchema.hasOwnProperty('belongTo') &&
-      currentSchema.belongTo &&
-      currentSchema.belongTo.serviceTag &&
-      currentSchema.belongTo.objectType
+      currentSchema.belongTo
     ) {
-      try {
-        Logger.debug(
-          `[DEBUG] [resolveExtendedObjectSchemas] Fetching belongTo schema for objectType=${currentSchema.objectType}`,
-          { belongTo: currentSchema.belongTo }
-        );
-        const belongToObjType = {
-          serviceTag: currentSchema.belongTo.serviceTag,
-          objectType: currentSchema.belongTo.objectType
-        };
-        const belongToSchema = await getObjectSchema.getObjSchemaS3(
-          { logger: Logger },
-          belongToObjType,
-          false,
-          bucketName
-        );
-        currentSchema.belongToSchema = belongToSchema;
-        Logger.debug(
-          `[DEBUG] [resolveExtendedObjectSchemas] Successfully fetched belongTo schema for objectType=${currentSchema.objectType}`,
-          { belongToObjectType: belongToSchema?.objectType }
-        );
-      } catch (error) {
-        Logger.warn(
-          `[WARN] [resolveExtendedObjectSchemas] Failed to fetch belongTo schema for objectType=${currentSchema.objectType}`,
-          { error }
-        );
+      const belongToTarget = Array.isArray(currentSchema.belongTo)
+        ? currentSchema.belongTo[0]
+        : currentSchema.belongTo;
+
+      if (
+        belongToTarget &&
+        belongToTarget.serviceTag &&
+        belongToTarget.objectType
+      ) {
+        try {
+          Logger.debug(
+            `[DEBUG] [resolveExtendedObjectSchemas] Fetching belongTo schema for objectType=${currentSchema.objectType}`,
+            { belongTo: belongToTarget }
+          );
+          const belongToObjType = {
+            serviceTag: belongToTarget.serviceTag,
+            objectType: belongToTarget.objectType
+          };
+          const belongToSchema = await getObjectSchema.getObjSchemaS3(
+            { logger: Logger },
+            belongToObjType,
+            false,
+            bucketName
+          );
+          currentSchema.belongToSchema = belongToSchema;
+          Logger.debug(
+            `[DEBUG] [resolveExtendedObjectSchemas] Successfully fetched belongTo schema for objectType=${currentSchema.objectType}`,
+            { belongToObjectType: belongToSchema?.objectType }
+          );
+        } catch (error) {
+          Logger.warn(
+            `[WARN] [resolveExtendedObjectSchemas] Failed to fetch belongTo schema for objectType=${currentSchema.objectType}`,
+            { error }
+          );
+        }
       }
     }
-    */
 
     resolvedSchemas.push(currentSchema);
   }

package/src/emit/coreFunction/emitCoreFunctionArtifacts.js

@@ -210,13 +210,11 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     },
     {
       path: `${SRC_ROOT}/InitialSetupConfig.js`,
-      content: initialSetupConfig,
-      writeWhenFileExist: false
+      content: initialSetupConfig
     },
     {
       path: `${INITIAL_SETUP_ROOT}/InitialSetupConfig.js`,
-      content: initialSetupConfig,
-      writeWhenFileExist: false // Don't overwrite the file that dev modifies
+      content: initialSetupConfig
     },
     {
       path: `${INITIAL_SETUP_ROOT}/runner.js`,

package/src/emit/coreFunction/templates/InitialSetupConfig.ejs

@@ -49,21 +49,31 @@ const externalServices = {
 -%>
 const tableConfigs = {
   prod: {
-    Config: {},
+    Config: {
+      // <#InitialSetupConfig_Prod_Config_TableConfig#>
+      // <#/InitialSetupConfig_Prod_Config_TableConfig#>
+    },
 <% dynamoTableNames.forEach(tableName => { -%>
-    <%= tableName %>: {},
+    <%= tableName %>: {
+      // <#InitialSetupConfig_Prod_<%= tableName %>_TableConfig#>
+      // <#/InitialSetupConfig_Prod_<%= tableName %>_TableConfig#>
+    },
 <% }); -%>
     // <#InitialSetupConfig_ExtraProdTableConfigs#>
     // <#/InitialSetupConfig_ExtraProdTableConfigs#>
   },
   test: {
     Config: {
+      // <#InitialSetupConfig_Test_Config_TableConfig#>
       clearDataWhenRefresh: true,
       rawSource: false
+      // <#/InitialSetupConfig_Test_Config_TableConfig#>
     },
 <% dynamoTableNames.forEach(tableName => { -%>
     <%= tableName %>: {
+      // <#InitialSetupConfig_Test_<%= tableName %>_TableConfig#>
       clearDataWhenRefresh: true
+      // <#/InitialSetupConfig_Test_<%= tableName %>_TableConfig#>
     },
 <% }); -%>
     // <#InitialSetupConfig_ExtraTestTableConfigs#>

package/src/emit/coreFunction/templates/InitialSetupRunner.ejs

@@ -40,6 +40,8 @@ if (fs.existsSync(configPath)) {
   );
 }
 
+process.env.LOG_LEVEL = process.env.LOG_LEVEL || 'INFO';
+
 // 2. Dynamic import to ensure SDKs use the injected process.env
 const { default: initialSetupSharedLib } =
   await import('@izara_project/izara-core-library-initial-setup');
@@ -96,15 +98,15 @@ const commands = {
   },
   uploadSchema: async (_izContext) => {
     const { default: fn } = await import('./commands/uploadSchema.js');
-    await fn(_izContext);
+    await fn(_izContext, initialSetupSharedLib);
   },
   'uploadSchema:test': async (_izContext) => {
     const { default: fn } = await import('./commands/uploadSchema.js');
-    await fn(_izContext);
+    await fn(_izContext, initialSetupSharedLib);
   },
   'uploadSchema:prod': async (_izContext) => {
     const { default: fn } = await import('./commands/uploadSchema.js');
-    await fn(_izContext);
+    await fn(_izContext, initialSetupSharedLib);
   }
 };
 

package/src/emit/coreFunction/templates/InitialSetupRunner_uploadSchema.ejs

@@ -1,4 +1,4 @@
-import { uploadObjSchema } from '@izara_project/izara-core-library-service-schemas';
+import initialSetupLib from '@izara_project/izara-core-library-initial-setup';
 
 const SERVICE_TAG = {
   TRANSLATIONS: 'Translations',
@@ -18,18 +18,25 @@ const ignoreExternalServices = {
 };
 //(</ignoreExternalServices>)
 
-export default async function uploadSchema(_izContext) {
+export default async function uploadSchema(_izContext, initialSetupSharedLib = initialSetupLib) {
   console.log('======== UploadSchema ========');
   try {
-    _izContext.logger.debug('uploadSchema _izContext: ', _izContext);
-
-    await uploadObjSchema.uploadObjectSchemaByUseCase(_izContext, {
+    const libToUse = initialSetupSharedLib || initialSetupLib;
+    await libToUse.uploadObjectSchema(_izContext, {
       ignoreExternalServices: ignoreExternalServices
     });
     console.log('-------- Finish UploadSchema --------');
     return 'upload successfully';
   } catch (err) {
-    _izContext.logger.error('error LambdaFunction: ', err);
+    let errorDetails = err.message || String(err);
+    if (errorDetails.includes('errorMessage:')) {
+      const match = errorDetails.match(/functionName:\s*([^,]+),errorMessage:(.*)/);
+      if (match) {
+        errorDetails = `Lambda [${match[1].trim()}] failed: ${match[2].trim()}`;
+      }
+    }
+    _izContext.logger.error(`[uploadSchema] ❌ ${errorDetails}`);
     throw err;
   }
 }
+

package/src/emit/coreFunction/templates/InitialSetup_HdrInv.ejs

@@ -1,4 +1,4 @@
-import middlewareHandler from '@izara_project/izara-core-library-middleware';
+import { middlewareHandler } from '@izara_project/izara-middleware';
 import mainHandler from './InitialSetup_Main.js';
 
 export const main = middlewareHandler.wrap(

package/src/emit/rbac/emitDynamicRbacFlowSchemas.js

@@ -29,7 +29,9 @@ export function rbacFlowSchemaManagedPaths(objects = []) {
     (object) =>
       `app/src/schemas/FlowSchemas/generateCode/FlowRbac/${rbacFlowTag(object)}.js`
   );
-  return [...dynamicRbacFlowSchemaPaths, ...rbacPaths];
+  const hasSelfRbac = objects.some(_hasSelfRbacAddOn);
+  const dynamicPaths = hasSelfRbac ? dynamicRbacFlowSchemaPaths : [];
+  return [...dynamicPaths, ...rbacPaths];
 }
 
 export async function emitDynamicRbacFlowSchemas({ objects, serviceTag }) {
@@ -47,9 +49,12 @@ export async function emitDynamicRbacFlowSchemas({ objects, serviceTag }) {
     );
   }
 
-  const sharedArtifacts = RBAC_FLOW_DEFINITIONS.map(({ flowTag, event }) =>
-    _artifact(flowTag, _createSharedRbacFlow(flowTag, event))
-  );
+  const hasSelfRbac = objects.some(_hasSelfRbacAddOn);
+  const sharedArtifacts = hasSelfRbac
+    ? RBAC_FLOW_DEFINITIONS.map(({ flowTag, event }) =>
+        _artifact(flowTag, _createSharedRbacFlow(flowTag, event))
+      )
+    : [];
   const userArtifacts = rbacObjects.map((object) => {
     const flowTag = rbacFlowTag(object);
     return _artifact(
@@ -61,13 +66,23 @@ export async function emitDynamicRbacFlowSchemas({ objects, serviceTag }) {
   return Promise.all([...sharedArtifacts, ...userArtifacts]);
 }
 
-function _hasRbacAddOn(object) {
+function _hasSelfRbacAddOn(object) {
   return (
     Array.isArray(object?.addOnDataStructure) &&
     object.addOnDataStructure.some((addOn) => addOn?.type === 'rbac')
   );
 }
 
+function _hasRbacAddOn(object) {
+  const selfHasRbac = _hasSelfRbacAddOn(object);
+  const belongToHasRbac =
+    Array.isArray(object?.belongToSchema?.addOnDataStructure) &&
+    object.belongToSchema.addOnDataStructure.some(
+      (addOn) => addOn?.type === 'rbac'
+    );
+  return selfHasRbac || belongToHasRbac;
+}
+
 async function _artifact(flowTag, flow) {
   return {
     path: `app/src/schemas/FlowSchemas/generateCode/FlowRbac/${flowTag}.js`,

package/src/emit/rbac/emitRbacApplicationArtifacts.js

@@ -21,11 +21,16 @@ export async function emitRbacApplicationArtifacts(objects) {
     return [];
   }
 
+  const hasSelfRbac = objects.some(hasSelfRbacAddOn);
   const handlers = await Promise.all([
-    createTargetRoleHandler(),
-    ...LIST_DEFINITIONS.map(createListHandler),
-    ...MUTATION_DEFINITIONS.map(createMutationHandler),
-    ...USER_ROLE_MUTATIONS.map(createUserRoleMutationHandler),
+    ...(hasSelfRbac
+      ? [
+          createTargetRoleHandler(),
+          ...LIST_DEFINITIONS.map(createListHandler),
+          ...MUTATION_DEFINITIONS.map(createMutationHandler),
+          ...USER_ROLE_MUTATIONS.map(createUserRoleMutationHandler)
+        ]
+      : []),
     ...objects.filter(hasRbacAddOn).map(createUserRbacFlowHandler)
   ]);
   return [
@@ -83,49 +88,42 @@ const USER_ROLE_MUTATIONS = [
   { flowTag: 'DeleteUserFromRole', operation: 'Delete' }
 ];
 
+const STATIC_RBAC_APPLICATION_PATHS = [
+  'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_Main.js',
+  'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrSqs.js',
+  'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_WbsMain.js',
+  'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrWbs.js',
+  ...LIST_DEFINITIONS.flatMap(({ flowTag }) => [
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrApi.js`
+  ]),
+  ...MUTATION_DEFINITIONS.flatMap(({ flowTag }) => [
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_WbsMain.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
+  ]),
+  ...USER_ROLE_MUTATIONS.flatMap(({ flowTag }) => [
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_WbsMain.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
+  ]),
+  FLOW_RBAC_YAML_PATH
+];
+
 export function rbacApplicationManagedPaths(objects = []) {
   if (!Array.isArray(objects)) {
     throw new TypeError('objects must be an array');
   }
-  return [
-    'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_Main.js',
-    'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrSqs.js',
-    'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_WbsMain.js',
-    'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrWbs.js',
-    ...LIST_DEFINITIONS.flatMap(({ flowTag }) => [
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrApi.js`
-    ]),
-    ...MUTATION_DEFINITIONS.flatMap(({ flowTag }) => [
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_WbsMain.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
-    ]),
-    ...USER_ROLE_MUTATIONS.flatMap(({ flowTag }) => [
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_WbsMain.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
-    ]),
-    ...objects.filter(hasRbacAddOn).flatMap((object) => {
-      const flowTag = rbacFlowTag(object);
-      const sourcePath = `app/src/generatedCode/FlowRbac/${flowTag}/source`;
-      return [
-        `${sourcePath}/${flowTag}_Main.js`,
-        `${sourcePath}/${flowTag}_HdrSqs.js`
-      ];
-    }),
-    FLOW_RBAC_YAML_PATH
-  ];
-}
-
-function hasRbacAddOn(object) {
-  return (
-    Array.isArray(object?.addOnDataStructure) &&
-    object.addOnDataStructure.some((addOn) => addOn?.type === 'rbac')
-  );
+  const rbacObjects = objects.filter(hasRbacAddOn);
+  const sourcePaths = rbacObjects.flatMap((object) => {
+    const flowTag = rbacFlowTag(object);
+    const sourcePath = `app/src/generatedCode/FlowRbac/${flowTag}/source`;
+    return [`${sourcePath}/${flowTag}_Main.js`, `${sourcePath}/${flowTag}_HdrSqs.js`];
+  });
+  return [...STATIC_RBAC_APPLICATION_PATHS, ...sourcePaths];
 }
 
 async function createTargetRoleHandler() {
@@ -367,3 +365,20 @@ async function renderTemplate(templateUrl, templateName, data) {
     data
   );
 }
+
+function hasSelfRbacAddOn(object) {
+  return (
+    Array.isArray(object?.addOnDataStructure) &&
+    object.addOnDataStructure.some((addOn) => addOn?.type === 'rbac')
+  );
+}
+
+function hasRbacAddOn(object) {
+  const selfHasRbac = hasSelfRbacAddOn(object);
+  const belongToHasRbac =
+    Array.isArray(object?.belongToSchema?.addOnDataStructure) &&
+    object.belongToSchema.addOnDataStructure.some(
+      (addOn) => addOn?.type === 'rbac'
+    );
+  return selfHasRbac || belongToHasRbac;
+}

package/src/emit/rbac/templates/CreateTargetRole_HdrSqs.ejs

@@ -15,33 +15,81 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { middlewareHandler as middleware } from '@izara_project/izara-middleware';
+import {
+  middlewareHandler as middleware,
+  validatorSchema
+} from '@izara_project/izara-middleware';
 import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+
 import CreateTargetRole from './CreateTargetRole_Main.js';
 
+// validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
-export const main = middleware.wrap(async (event) =>
-  Promise.all(
-    event.Records.map(async (record) => {
-      await recordHandlerSharedLib.validateRecord(
-        record,
-        'CreateTargetRoleHdrSqs',
-        {},
-        null
-      );
-      return recordHandlerSharedLib.recordHandler(
-        record,
-        CreateTargetRole,
-        'CreateTargetRoleHdrSqs',
-        [
-          record.body.Message,
+let perRecordsValidatorSchema = {
+  type: 'object',
+  properties: {}
+};
+
+export const main = middleware.wrap(async (event, context) => {
+  try {
+    let recordPromises = [];
+
+    // loop each record and send to mainFunction
+    await Promise.all(
+      event.Records.map(async (record) => {
+        // promise.all for map() function
+
+        let passOnProperties = [];
+        record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+        // validate message (and MessageAttributes)
+        await recordHandlerSharedLib.validateRecord(
+          record, // one record will send to mainFunction
+          'CreateTargetRoleHdrSqs', // queue name that need to retry or send to dlq
+          perRecordsValidatorSchema // schema for record.Message
+        );
+
+        // add argument (to invoke lambda) to passOnProperties[]
+        passOnProperties.push(record.body.Message);
+        passOnProperties.push(
           callingFlowSharedLib.addCallingFlowToPassOnProperties(
             record.body.Message
           )
-        ]
+        );
+        record._izContext.logger.debug(
+          'passOnProperties in handler',
+          passOnProperties
+        );
+
+        // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
+        let recordPromise = recordHandlerSharedLib.recordHandler(
+          record, // one record will send to mainFunction
+          CreateTargetRole, // mainFunction that need to invoke.
+          'CreateTargetRoleHdrSqs', // queue name that need to retry or send to dlq
+          passOnProperties // all parameters that mainFunction needed.
+        );
+        record._izContext.logger.debug('after recordPromise in handler');
+        recordPromises.push(recordPromise); // push promise to recordPromises
+      })
+    );
+
+    Logger.debug('before Promise.all(recordPromises) in handler');
+    try {
+      // --- main await all promises
+      await Promise.all(recordPromises); // await all promises
+
+      return event.Records; // return all for local testing
+    } catch {
+      Logger.debug(
+        'Promise.all(recordPromises) in handler threw error (at least one record did no resolve)'
       );
-    })
-  )
-);
+    }
+    Logger.debug('after Promise.all(recordPromises) in handler');
+  } catch (err) {
+    Logger.error('Unhandled Error, LambdaFunctionHdrSqs: ', err);
+    throw err;
+  }
+});

package/src/emit/rbac/templates/ListRbac_HdrSqs.ejs

@@ -15,32 +15,81 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { middlewareHandler as middleware } from '@izara_project/izara-middleware';
+import {
+  middlewareHandler as middleware,
+  validatorSchema
+} from '@izara_project/izara-middleware';
 import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+
 import <%- flowTag %> from './<%- flowTag %>_Main.js';
 
+// validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
-export const main = middleware.wrap(async (event) =>
-  Promise.all(
-    event.Records.map(async (record) => {
-      await recordHandlerSharedLib.validateRecord(
-        record,
-        '<%- flowTag %>HdrSqs',
-        {},
-        null
-      );
-      return recordHandlerSharedLib.recordHandler(
-        record,
-        <%- flowTag %>,
-        '<%- flowTag %>HdrSqs',
-        [
-          record.body.Message,
+
+let perRecordsValidatorSchema = {
+  type: 'object',
+  properties: {}
+};
+
+export const main = middleware.wrap(async (event, context) => {
+  try {
+    let recordPromises = [];
+
+    // loop each record and send to mainFunction
+    await Promise.all(
+      event.Records.map(async (record) => {
+        // promise.all for map() function
+
+        let passOnProperties = [];
+        record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+        // validate message (and MessageAttributes)
+        await recordHandlerSharedLib.validateRecord(
+          record, // one record will send to mainFunction
+          '<%- flowTag %>HdrSqs', // queue name that need to retry or send to dlq
+          perRecordsValidatorSchema // schema for record.Message
+        );
+
+        // add argument (to invoke lambda) to passOnProperties[]
+        passOnProperties.push(record.body.Message);
+        passOnProperties.push(
           callingFlowSharedLib.addCallingFlowToPassOnProperties(
             record.body.Message
           )
-        ]
+        );
+        record._izContext.logger.debug(
+          'passOnProperties in handler',
+          passOnProperties
+        );
+
+        // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
+        let recordPromise = recordHandlerSharedLib.recordHandler(
+          record, // one record will send to mainFunction
+          <%- flowTag %>, // mainFunction that need to invoke.
+          '<%- flowTag %>HdrSqs', // queue name that need to retry or send to dlq
+          passOnProperties // all parameters that mainFunction needed.
+        );
+        record._izContext.logger.debug('after recordPromise in handler');
+        recordPromises.push(recordPromise); // push promise to recordPromises
+      })
+    );
+
+    Logger.debug('before Promise.all(recordPromises) in handler');
+    try {
+      // --- main await all promises
+      await Promise.all(recordPromises); // await all promises
+
+      return event.Records; // return all for local testing
+    } catch {
+      Logger.debug(
+        'Promise.all(recordPromises) in handler threw error (at least one record did no resolve)'
       );
-    })
-  )
-);
+    }
+    Logger.debug('after Promise.all(recordPromises) in handler');
+  } catch (err) {
+    Logger.error('Unhandled Error, LambdaFunctionHdrSqs: ', err);
+    throw err;
+  }
+});

package/src/emit/rbac/templates/UserRbacFlow_HdrSqs.ejs

@@ -15,32 +15,81 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { middlewareHandler as middleware } from '@izara_project/izara-middleware';
+import {
+  middlewareHandler as middleware,
+  validatorSchema
+} from '@izara_project/izara-middleware';
 import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+
 import <%- flowTag %> from './<%- flowTag %>_Main.js';
 
+// validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
-export const main = middleware.wrap(async (event) =>
-  Promise.all(
-    event.Records.map(async (record) => {
-      await recordHandlerSharedLib.validateRecord(
-        record,
-        '<%- flowTag %>HdrSqs',
-        {},
-        null
-      );
-      return recordHandlerSharedLib.recordHandler(
-        record,
-        <%- flowTag %>,
-        '<%- flowTag %>HdrSqs',
-        [
-          record.body.Message,
+
+let perRecordsValidatorSchema = {
+  type: 'object',
+  properties: {}
+};
+
+export const main = middleware.wrap(async (event, context) => {
+  try {
+    let recordPromises = [];
+
+    // loop each record and send to mainFunction
+    await Promise.all(
+      event.Records.map(async (record) => {
+        // promise.all for map() function
+
+        let passOnProperties = [];
+        record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+        // validate message (and MessageAttributes)
+        await recordHandlerSharedLib.validateRecord(
+          record, // one record will send to mainFunction
+          '<%- flowTag %>HdrSqs', // queue name that need to retry or send to dlq
+          perRecordsValidatorSchema // schema for record.Message
+        );
+
+        // add argument (to invoke lambda) to passOnProperties[]
+        passOnProperties.push(record.body.Message);
+        passOnProperties.push(
           callingFlowSharedLib.addCallingFlowToPassOnProperties(
             record.body.Message
           )
-        ]
+        );
+        record._izContext.logger.debug(
+          'passOnProperties in handler',
+          passOnProperties
+        );
+
+        // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
+        let recordPromise = recordHandlerSharedLib.recordHandler(
+          record, // one record will send to mainFunction
+          <%- flowTag %>, // mainFunction that need to invoke.
+          '<%- flowTag %>HdrSqs', // queue name that need to retry or send to dlq
+          passOnProperties // all parameters that mainFunction needed.
+        );
+        record._izContext.logger.debug('after recordPromise in handler');
+        recordPromises.push(recordPromise); // push promise to recordPromises
+      })
+    );
+
+    Logger.debug('before Promise.all(recordPromises) in handler');
+    try {
+      // --- main await all promises
+      await Promise.all(recordPromises); // await all promises
+
+      return event.Records; // return all for local testing
+    } catch {
+      Logger.debug(
+        'Promise.all(recordPromises) in handler threw error (at least one record did no resolve)'
       );
-    })
-  )
-);
+    }
+    Logger.debug('after Promise.all(recordPromises) in handler');
+  } catch (err) {
+    Logger.error('Unhandled Error, LambdaFunctionHdrSqs: ', err);
+    throw err;
+  }
+});

package/src/emit/resource/emitResourceArtifacts.js

@@ -148,6 +148,7 @@ export const resourceArtifactPaths = [
 
 function createResourceState({ objects, relationships, flows }) {
   const crud = objects.some(isCrudObject);
+  const selfRbac = objects.some(hasSelfRbacAddOn);
   const rbac = objects.some(hasRbacAddOn);
   const ownTopics = new Set([
     'ProcessLogical',
@@ -195,11 +196,13 @@ function createResourceState({ objects, relationships, flows }) {
     }
     dsqQueues.add('GetRelationshipHdrDsq');
   }
-  if (rbac) {
+  if (selfRbac) {
     for (const action of RBAC_ACTIONS) {
       ownTopics.add(action);
       sqsQueues.add(`Process${action}HdrSqs`);
     }
+  }
+  if (rbac) {
     for (const object of objects.filter(hasRbacAddOn)) {
       const flowTag = upperFirst(object.objectType) + 'RbacFlow';
       ownTopics.add(flowTag);
@@ -816,13 +819,21 @@ function isCrudObject(object) {
     object?.generatedBy === 'systemGenerated'
   );
 }
-function hasRbacAddOn(object) {
+function hasSelfRbacAddOn(object) {
   return (
     Array.isArray(object?.addOnDataStructure) &&
     object.addOnDataStructure.some((addOn) => addOn?.type === 'rbac')
   );
 }
 
+function hasRbacAddOn(object) {
+  const selfHasRbac = hasSelfRbacAddOn(object);
+  const belongToHasRbac =
+    Array.isArray(object?.belongToSchema?.addOnDataStructure) &&
+    object.belongToSchema.addOnDataStructure.some((addOn) => addOn?.type === 'rbac');
+  return selfHasRbac || belongToHasRbac;
+}
+
 /**
  * Returns the per-object RBAC flow queues (e.g. UserRbacFlowHdrSqs)
  * created for objects with an 'rbac' add-on. These are consumed by the

package/src/output/mergeHooks.js

@@ -39,7 +39,8 @@ async function mergeHook(outputRoot, artifact) {
 
   return artifact.content.replace(
     matchers.anyTag,
-    (_match, tagName) => {
+    (_match, p1, _body1, p2) => {
+      const tagName = p1 || p2;
       const hookBlock = sourceContent.match(matchers.tagPattern(tagName))?.[0];
       return hookBlock ?? _match;
     }
@@ -49,10 +50,10 @@ async function mergeHook(outputRoot, artifact) {
 function hookMatchers(filePath) {
   if (filePath.endsWith('.js')) {
     return {
-      anyTag: /\/\/\(<(\w+)>\)([\s\S]*?)\/\/\(<\/\1>\)/gm,
+      anyTag: /(?:\/\/\(<(\w+)>\)([\s\S]*?)\/\/\(<\/\1>\)|\/\/\s*<#(\w+)#>([\s\S]*?)\/\/\s*<#\/\3#>)/gm,
       tagPattern: (name) =>
         new RegExp(
-          `\\/\\/\\(<${name}>\\)([\\s\\S]*?)\\/\\/\\(<\\/${name}>\\)`,
+          `(?:\\/\\/\\(<${name}>\\)([\\s\\S]*?)\\/\\/\\(<\\/${name}>\\)|\\/\\/\\s*<#${name}#>([\\s\\S]*?)\\/\\/\\s*<#\\/${name}#>)`,
           'gm'
         )
     };