@izara_project/izara-core-generate-service-code 1.0.70 → 1.0.72

package/src/emit/crud/templates/GetRangeEndpoint_Main.ejs

@@ -43,7 +43,7 @@ import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 export default async function <%- mainFileName %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

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

@@ -479,7 +479,7 @@ export async function <%- flowTag %>MainLogical(
 export default async function <%- flowTag %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -690,7 +690,10 @@ function storedCacheTableName(flow, objects) {
     : candidates[0];
   return (
     Object.values(object?.storageResources ?? {}).find(
-      (resource) => resource?.storageType === 'dynamoDB'
+      (resource) =>
+        resource?.storageType === 'dynamo' ||
+        resource?.storageType === 'dynamoDB' ||
+        !resource?.storageType
     )?.tableName ?? null
   );
 }

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

@@ -58,7 +58,7 @@ const { createFlowTypeConcat } = utils;
 export default async function <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {
@@ -88,7 +88,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
         createFlowTypeConcat(_izContext, {
           flowTag: '<%= flowTag %>',
           serviceTag: process.env.iz_serviceTag
-        }),
+        })
         //(<storedCacheConfig>)
         //(</storedCacheConfig>)
       );

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

@@ -37,7 +37,7 @@ import { identifierUuid } from '@izara_project/izara-shared-core';
 export default async function <%= functionName %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

package/src/emit/custom/templates/s3/CreateObject_Main.ejs

@@ -51,7 +51,7 @@ const { TOPIC_NAME_GENERATE_CODE } = schemaConsts;
 export default async function createObject(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

package/src/emit/custom/templates/s3/ReservedLimit_Main.ejs

@@ -56,7 +56,7 @@ export default async function reservedLimit(
   objInstanceFull,
   //(<additionalProperties>)
   //(</additionalProperties>)
-  callingFlowConfig = {},
+  callingFlowConfig = {}
 ) {
   try {
     _izContext.logger.debug('----- reservedLimit event params ----- ', {

package/src/emit/custom/templates/triggerCache/CheckTriggerCache_HdrSqs.ejs

@@ -11,7 +11,7 @@ let perRecordsValidatorSchema = {
   properties: {
     <% startConfig.properties.forEach((prop, index) => { %> <%- prop.propertyName %>: {
       type: '<%- prop.type || 'string' %>'
-    },
+    }
     <% }) %>
   },
   required: [<%- startConfig.properties.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]
@@ -29,7 +29,7 @@ let messageAttributeValidatorSchema = {
         Value: { type: '<%- prop.type || 'string' %>' }
       },
       required: ['Type', 'Value']
-    },
+    }
     <% }) %>
   },
   required: [<%- startConfig.messageAttributes.filter(p => p.required === true).map(p => `'${p.propertyName}'`).join(', ') %>]

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

@@ -64,7 +64,7 @@ import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 export default async function <%- functionName %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

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

@@ -61,7 +61,7 @@ const { PREFIX, TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = consts;
 export default async function createRelationship(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

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

@@ -61,7 +61,7 @@ const { PREFIX, TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = consts;
 export default async function deleteRelationship(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

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

@@ -16,18 +16,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { objectHash as hash } from '@izara_project/izara-shared-core';
-
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-
 import {
   sns,
   lambda
 } from '@izara_project/izara-core-library-external-request';
-
 import {
   getObjectSchema,
   utils,
@@ -36,19 +33,15 @@ import {
   relSchemaLib,
   identifiersObject
 } from '@izara_project/izara-core-library-service-schemas';
-const { findLinksByObjTypes } = relSchemaLib;
+import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 
+const { findLinksByObjTypes } = relSchemaLib;
 const { getRelationshipSchemaWithCache, getObjSchemaS3WithHierarchy } =
   getObjectSchema;
-
 const { createLinkTypeId } = utils;
-
 const { getGraphServiceTagWithCache } = serviceConfig;
-
 const { PREFIX, TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = consts;
 
-import { consts as coreConsts } from '@izara_project/izara-core-library-core';
-
 //(<optionalRequire>)
 //(</optionalRequire>)
 
@@ -66,7 +59,7 @@ import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 export default async function getRelationship(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {
@@ -94,14 +87,16 @@ export default async function getRelationship(
     let errorsFound = [];
 
     //(<beforeValidateGetRel>)
-    //(</beforeValidateGetRel>).
+    //(</beforeValidateGetRel>)
     // validate object and identifiers
     async function validateIdentifiersExists(
       _izContext,
       objType,
       identifiersObject
     ) {
-      const objTypeString = `objType:{ serviceTag:${objType.serviceTag}, objectType:${objType.objectType} }`;
+      const objTypeString =
+        `objType:{ serviceTag:${objType.serviceTag}, ` +
+        `objectType:${objType.objectType} }`;
       const objectSchema = await getObjSchemaS3WithHierarchy(
         _izContext,
         objType
@@ -120,7 +115,8 @@ export default async function getRelationship(
         for (const identifierName of identifierNames) {
           if (!identifiersObject.hasOwnProperty(identifierName)) {
             errorsFound.push(
-              `validateIdentifiers, ${objTypeString} property:${identifierName} not exists`
+              `validateIdentifiers, ${objTypeString} ` +
+                `property:${identifierName} not exists`
             );
           } else {
             if (
@@ -128,7 +124,8 @@ export default async function getRelationship(
               typeof identifiersObject[identifierName] !== 'number'
             ) {
               errorsFound.push(
-                `validateIdentifiers, ${objTypeString} property:${identifierName} should be string or number`
+                `validateIdentifiers, ${objTypeString} ` +
+                  `property:${identifierName} should be string or number`
               );
             }
           }
@@ -136,16 +133,21 @@ export default async function getRelationship(
       }
     }
 
-    await validateIdentifiersExists(
-      _izContext,
-      firstObject.objType,
-      firstObject.identifiers
-    );
-    await validateIdentifiersExists(
-      _izContext,
-      secondObject.objType,
-      secondObject.identifiers
-    );
+    if (firstObject && Object.values(firstObject).length > 0) {
+      await validateIdentifiersExists(
+        _izContext,
+        firstObject.objType,
+        firstObject.identifiers
+      );
+    }
+
+    if (secondObject && Object.values(secondObject).length > 0) {
+      await validateIdentifiersExists(
+        _izContext,
+        secondObject.objType,
+        secondObject.identifiers
+      );
+    }
     // finished validate object and identifiers
 
     //(<afterValidateGetRel>)
@@ -167,8 +169,14 @@ export default async function getRelationship(
     );
     _izContext.logger.debug('links', links);
     if (!links.length) {
+      const firstTypeStr = JSON.stringify({
+        firstObject: firstObject.objType
+      });
+      const secondTypeStr = JSON.stringify({
+        secondObject: secondObject.objType
+      });
       errorsFound.push(
-        `not found link between ${JSON.stringify({ firstObject: firstObject.objType })} ${JSON.stringify({ secondObject: secondObject.objType })}`
+        `not found link between ${firstTypeStr} ${secondTypeStr}`
       );
     }
 
@@ -192,7 +200,7 @@ export default async function getRelationship(
         );
       }
 
-      if (firstObjectHie || firstObject || secondObjectHie || secondObject) {
+      if (firstObjectHie || (firstObject && secondObjectHie) || secondObject) {
         // find targetStorageResources and validate each storageResources
         await Promise.all(
           relationshipSchema.links.map(
@@ -238,7 +246,9 @@ export default async function getRelationship(
                       );
                       if (!graphServiceTag) {
                         errorsFound.push(
-                          `storageResourceTag: ${storageResourceTag} invalid, not found graph serviceTag from graphServerTag: ${usedStorageResource.graphServerTag}`
+                          `storageResourceTag: ${storageResourceTag} ` +
+                            `invalid, not found graph serviceTag from ` +
+                            `graphServerTag: ${usedStorageResource.graphServerTag}`
                         );
                       }
 
@@ -322,8 +332,10 @@ export default async function getRelationship(
       return getRelCompleteMsg;
     }
 
-    let usedGraphServiceTag = []; // collect used graph serviceTag, use to check duplicate graph serviceTag across graph serverTag
-    let targetGraphStorageResources = []; // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
+    // collect used graph serviceTag, use to check duplicate graph serviceTag across graph serverTag
+    let usedGraphServiceTag = [];
+    // collect used graph storageResources, filtered duplicate graphServiceTag from graphServerTag out
+    let targetGraphStorageResources = [];
 
     for (const targetStorageResource of targetStorageResources) {
       if (
@@ -351,7 +363,12 @@ export default async function getRelationship(
           storageResource.storageType === consts.STORAGE_TYPES.dynamoDB
         ) {
           // if have storageResource.storageType === "dynamoDB" will create relationship here
-          let tableNameFrom = `${firstObject.objType.serviceTag}_${firstObject.objType.objectType}__${relType.relationshipTag}__${secondObject.objType.serviceTag}_${secondObject.objType.objectType}`;
+          let tableNameFrom =
+            `${firstObject.objType.serviceTag}_` +
+            `${firstObject.objType.objectType}__` +
+            `${relType.relationshipTag}__` +
+            `${secondObject.objType.serviceTag}_` +
+            `${secondObject.objType.objectType}`;
 
           let identifiersConcatFirstObject =
             await identifiersObject.identifiersConcatFromIdentifiers(
@@ -365,8 +382,12 @@ export default async function getRelationship(
               secondObject.objType,
               secondObject.identifiers
             );
-          const firstObjectIdentifiersConcat = `${firstObject.objType.serviceTag}_${firstObject.objType.objectType}__identifiersConcat`;
-          const secondObjectIdentifiersConcat = `${secondObject.objType.serviceTag}_${secondObject.objType.objectType}__identifiersConcat`;
+          const firstObjectIdentifiersConcat =
+            `${firstObject.objType.serviceTag}_` +
+            `${firstObject.objType.objectType}__identifiersConcat`;
+          const secondObjectIdentifiersConcat =
+            `${secondObject.objType.serviceTag}_` +
+            `${secondObject.objType.objectType}__identifiersConcat`;
           // putItem first Object DynamoDb
           let getResultFromDynamo = await dynamodbSharedLib.getItem(
             _izContext,

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

@@ -69,7 +69,7 @@ import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 export default async function moveRelationship(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

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

@@ -62,7 +62,7 @@ const { PREFIX, TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = consts;
 export default async function updateRelationship(
   _izContext,
   requestParams,
-  callingFlowConfig = {},
+  callingFlowConfig = {}
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

package/src/emit/resource/emitResourceArtifacts.js

@@ -112,10 +112,6 @@ export async function emitResourceArtifacts({
     {
       path: `${APP_ROOT}/role-name-config.yml`,
       content: normalizeYaml(iam.roleNameConfigContent)
-    },
-    {
-      path: `${INITIAL_SETUP_ROOT}/generatedLambdaRoleServiceConfig.js`,
-      content: lambdaRoleConfig
     }
   ];
   if (state.s3Buckets.length > 0) {
@@ -140,20 +136,22 @@ export const resourceArtifactPaths = [
   `${RESOURCE_ROOT}/generated-s3.yml`,
   `${APP_ROOT}/generate-shared-resource.yml`,
   `${APP_ROOT}/role-name-config.yml`,
-  `${INITIAL_SETUP_ROOT}/generatedLambdaRoleServiceConfig.js`,
   `${APP_ROOT}/cors.yml`
 ];
 
 function createResourceState({ objects, relationships, flows }) {
   const crud = objects.some(isCrudObject);
   const rbac = objects.some(hasRbacAddOn);
-  const ownTopics = new Set(
-    flows
+  const ownTopics = new Set([
+    'ProcessLogical',
+    'FindData',
+    ...flows
       .filter((flow) => includesEvent(flow, 'ownTopic'))
       .map((flow) => upperFirst(flow.flowTag))
-  );
+  ]);
   const sqsQueues = new Set([
-    ...LEGACY_PROCESS_QUEUES,
+    'PaginateProcessLogicalHdrDsq',
+    'PaginateProcessLogicalHdrSqs',
     ...flows
       .filter((flow) => includesEvent(flow, 'extTopic'))
       .map((flow) => `Process${upperFirst(flow.flowTag)}HdrSqs`)
@@ -339,18 +337,35 @@ function createResourceState({ objects, relationships, flows }) {
         .map((object) => [
           object.objectType,
           Object.values(object.storageResources ?? {}).find(
-            (resource) => resource?.storageType === 'dynamoDB'
+            (resource) =>
+              resource?.storageType === 'dynamo' ||
+              resource?.storageType === 'dynamoDB' ||
+              !resource?.storageType
           )?.tableName
         ])
         .filter(([, tableName]) => tableName)
     ),
     s3Buckets,
-    flows
+    flows,
+    objects
   };
 }
 
+function indentYaml(content, spaces = 2) {
+  const prefix = ' '.repeat(spaces);
+  return content
+    .split('\n')
+    .map((line) => {
+      if (line.trim()) {
+        return `${prefix}${line}`;
+      }
+      return '';
+    })
+    .join('\n');
+}
+
 async function renderS3(state) {
-  if (state.s3Buckets.length === 0) return 'Resources:';
+  if (state.s3Buckets.length === 0) return 'Resources:\n';
   const template = await readFile(
     new URL('S3Bucket_Yaml.ejs', TEMPLATE_URL),
     'utf8'
@@ -358,7 +373,7 @@ async function renderS3(state) {
   const chunks = await Promise.all(
     state.s3Buckets.map((bucketName) => ejsLib.render(template, { bucketName }))
   );
-  return `Resources:\n${chunks.join('\n')}`;
+  return `Resources:\n${indentYaml(chunks.join('\n'), 2)}`;
 }
 
 async function renderInSqs(state) {
@@ -408,11 +423,17 @@ async function renderInSqs(state) {
   if (s3Subscriptions.length > 0) {
     parts.push(s3Subscriptions.join('\n'));
   }
-  return `Resources:\n${parts.join('\n')}`;
+  const body = parts.join('\n');
+  return `Resources:\n${indentYaml(body, 2)}`;
 }
 
 async function renderOut(state) {
-  return `Resources:\n${(await Promise.all(state.outTopics.map((topicName) => render('FlowOut_Yaml.ejs', { topicName })))).join('\n')}`;
+  const body = (
+    await Promise.all(
+      state.outTopics.map((topicName) => render('FlowOut_Yaml.ejs', { topicName }))
+    )
+  ).join('\n');
+  return `Resources:\n${indentYaml(body, 2)}`;
 }
 
 async function renderDynamo(state) {
@@ -420,7 +441,8 @@ async function renderDynamo(state) {
     render('SystemDynamoDB_Yaml.ejs', { hasS3: state.s3FlowTags.length > 0 }),
     ...state.tables.map((table) => render('DynamoDBTable_Yaml.ejs', table))
   ]);
-  return `${system}\n${tables.join('\n')}`;
+  const indentedTables = tables.map((t) => indentYaml(t, 2)).join('\n');
+  return indentedTables ? `${system}\n${indentedTables}` : `${system}`;
 }
 
 async function renderIam(state) {
@@ -583,10 +605,13 @@ function roleQueueNames(state, roleName) {
     ];
   }
   if (roleName === 'FlowRbacRole') {
-    return RBAC_ACTIONS.flatMap((action) => [
-      `${action}HdrSqs`,
-      `Process${action}HdrSqs`
-    ]);
+    return [
+      ...RBAC_ACTIONS.flatMap((action) => [
+        `${action}HdrSqs`,
+        `Process${action}HdrSqs`
+      ]),
+      ...rbacFlowQueueNames(state)
+    ];
   }
   const flow = state.flows.find(
     (candidate) => customFlowRoleName(candidate?.flowTag ?? '') === roleName
@@ -738,7 +763,9 @@ function collectTables(schemas) {
     );
     for (const resource of Object.values(schema.storageResources)) {
       if (
-        resource?.storageType === 'dynamoDB' &&
+        (resource?.storageType === 'dynamo' ||
+          resource?.storageType === 'dynamoDB' ||
+          !resource?.storageType) &&
         resource.tableName &&
         !tables.has(resource.tableName)
       )
@@ -771,6 +798,23 @@ function hasRbacAddOn(object) {
     object.addOnDataStructure.some((addOn) => addOn?.type === 'rbac')
   );
 }
+
+/**
+ * Returns the per-object RBAC flow queues (e.g. UserRbacFlowHdrSqs)
+ * created for objects with an 'rbac' add-on. These are consumed by the
+ * UserRbacFlow SQS functions emitted in emitRbacApplicationArtifacts.
+ */
+function rbacFlowQueueNames(state) {
+  return (state.objects ?? [])
+    .filter(hasRbacAddOn)
+    .map((object) => {
+      const objectType = object?.objectType;
+      if (typeof objectType !== 'string' || objectType.trim() === '') return null;
+      const flowTag = `${objectType[0].toUpperCase()}${objectType.slice(1)}RbacFlow`;
+      return `${flowTag}HdrSqs`;
+    })
+    .filter(Boolean);
+}
 function includesEvent(flow, event) {
   return Array.isArray(flow?.event) && flow.event.includes(event);
 }

package/src/emit/resource/templates/DynamoDBTable_Yaml.ejs

@@ -1,20 +1,20 @@
 ##===== [DynamoDB Table: <%- tableName %>]
-  <%- tableName %>Table:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      TableName: ${self:custom.iz_resourcePrefix}<%- tableName %>
-      BillingMode: PAY_PER_REQUEST
-      AttributeDefinitions:
-        - AttributeName: "<%- pk %>"
-          AttributeType: "S"
-<% if (sk) { %>
-        - AttributeName: "<%- sk %>"
-          AttributeType: "S"
-<% } %>
-      KeySchema:
-        - AttributeName: "<%- pk %>"
-          KeyType: "HASH"
-<% if (sk) { %>
-        - AttributeName: "<%- sk %>"
-          KeyType: "RANGE"
+<%- tableName %>Table:
+  Type: AWS::DynamoDB::Table
+  Properties:
+    TableName: ${self:custom.iz_resourcePrefix}<%- tableName %>
+    BillingMode: PAY_PER_REQUEST
+    AttributeDefinitions:
+      - AttributeName: '<%- pk %>'
+        AttributeType: 'S'
+      <% if (sk) { %>
+      - AttributeName: '<%- sk %>'
+        AttributeType: 'S'
+    <% } %>
+    KeySchema:
+      - AttributeName: '<%- pk %>'
+        KeyType: 'HASH'
+      <% if (sk) { %>
+      - AttributeName: '<%- sk %>'
+        KeyType: 'RANGE'
 <% } %>

package/src/emit/resource/templates/FlowOut_Yaml.ejs

@@ -1,6 +1,6 @@
 ##===== [Topic Out]
-  Out<%- topicName %>:
-    Type: AWS::SNS::Topic
-    Properties:
-      DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- topicName %>_Out
+Out<%- topicName %>:
+  Type: AWS::SNS::Topic
+  Properties:
+    DisplayName: 'SNS Message out'
+    TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- topicName %>_Out

package/src/emit/resource/templates/GeneratedLambdaRoleServiceConfig.ejs

@@ -25,7 +25,7 @@ const _izContext = { logger: Logger };
 
 export function generatedLambdaRole() {
   const externalLambdaRole = [
-<% if (crud) { -%>
+    <% if (crud) { -%>
     {
       roleName: 'FlowObjects',
       statement: [
@@ -34,7 +34,7 @@ export function generatedLambdaRole() {
           Effect: 'Allow',
           Action: ['lambda:InvokeFunction'],
           Resource: [
-            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'GetNodeHdrInv' ,'GraphHandler')}`
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'GetNodeHdrInv', 'GraphHandler')}`
           ]
         },
 
@@ -59,7 +59,7 @@ export function generatedLambdaRole() {
         //(</createFlowObjectsRole>)
       ]
     },
-<% } -%>
+    <% } -%>
 
     {
       roleName: 'ProcFindData',
@@ -69,13 +69,13 @@ export function generatedLambdaRole() {
           Effect: 'Allow',
           Action: ['lambda:InvokeFunction'],
           Resource: [
-            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'GetNodeHdrInv' ,'GraphHandler')}`
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'GetNodeHdrInv', 'GraphHandler')}`
           ]
         }
         //(<createProcFindDataRole>)
         //(</createProcFindDataRole>)
       ]
-    }<% if (relationships) { %>,
+    } <% if (relationships) { %>,
 
     {
       roleName: 'FlowRelationship',
@@ -85,7 +85,7 @@ export function generatedLambdaRole() {
           Effect: 'Allow',
           Action: ['lambda:InvokeFunction'],
           Resource: [
-            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'GetRelationshipHdrInv' ,'GraphHandler')}`
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'GetRelationshipHdrInv', 'GraphHandler')}`
           ]
         },
 
@@ -104,10 +104,9 @@ export function generatedLambdaRole() {
         //(<createFlowRelationshipRole>)
         //(</createFlowRelationshipRole>)
       ]
-    }<% } -%>
-<% s3Flows.forEach(function(flow) { -%>,
+    } <% } -%>,
 
-    {
+    <% s3Flows.forEach(function(flow) { -%> {
       roleName: '<%= flow.roleName %>',
       statement: [
         {
@@ -130,7 +129,7 @@ export function generatedLambdaRole() {
         //(<create<%= flow.roleName %>Role>)
         //(</create<%= flow.roleName %>Role>)
       ]
-    }<% }); %>
+    } <% }); %>
     //(<additionalRole>)
     //(</additionalRole>)
   ];