@izara_project/izara-market-library-service-schemas 1.0.45 → 1.0.47

package/src/reStructure/TemplateData/flowSchema/register/complete/functionYaml/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/functionYaml/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/sqs/data.js

@@ -32,7 +32,7 @@ const STORAGE_TYPES = {
 }
 
 const templatePath = path.join(__dirname, './template.ejs');
-
+const templateSub = path.join(__dirname, "./templateSub.ejs");
 
 const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts.js');
 
@@ -48,7 +48,6 @@ const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../.
 
 function createDataForDefaultSnsInSqs(_izContext, allFlowSchema, srcPath) {
   let resultsForCreateDefaultSnsInSqs = [];
-  let defaultDsqQueueDataList = [];
   for (const flowSchema of allFlowSchema.records) {
     if (flowSchema.hasOwnProperty("flowSteps")) {
 
@@ -62,36 +61,51 @@ function createDataForDefaultSnsInSqs(_izContext, allFlowSchema, srcPath) {
           if (flowSteps.includes("Out")) {
             if (flowSchema.outputTopic) {
               let topicOut = `${upperCase(flowSchema.flowTag)}`;
-              defaultDsqQueueDataList.push({
-                queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs),
-                subscribeTo: topicOut
-              }
+              resultsForCreateDefaultSnsInSqs.push(createSubscriptionForWebSocketComplete(topicOut, srcPath)
               )
-
             }
           }
         }
       }
     }
   }
+  resultsForCreateDefaultSnsInSqs.push(createWebSocketCompleteQueue(srcPath))
 
-  if (defaultDsqQueueDataList.length) {
-    for (let defaultDsqQueueData of defaultDsqQueueDataList) {
-      resultsForCreateDefaultSnsInSqs.push({
-        templatePath: templatePath,
-        templateData: defaultDsqQueueData,
-        setting: {
-          initialData: "Resources:\n",
-          savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
-          saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
-          fileExtension: ".yml",
-          isAppend: true
-        }
-      })
-    }
-  }
 
   return resultsForCreateDefaultSnsInSqs;
 }
 
+
+function createSubscriptionForWebSocketComplete(subscribeTo, srcPath) {
+  return {
+    templatePath: templateSub,
+    templateData: {
+      subscribeTo,
+      queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs)
+    },
+    setting: {
+      initialData: "Resources:\n",
+      savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+      saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
+      fileExtension: ".yml",
+      isAppend: true
+    }
+  }
+}
+
+function createWebSocketCompleteQueue(srcPath) {
+  return {
+    templatePath: templatePath,
+    templateData: {
+      queueName: "WebSocketComplete" + upperCase(HANDLER.hdrSqs),
+    },
+    setting: {
+      initialData: "Resources:\n",
+      savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+      saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
+      fileExtension: ".yml",
+      isAppend: true
+    }
+  }
+}
 module.exports = createDataForDefaultSnsInSqs;

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/sqs/template.ejs

@@ -1,12 +1,3 @@
-<% if (subscribeTo) { %>
-##===== SNS Subscription
-  SubscriptionToOut<%- subscribeTo %>:
-    Type: AWS::SNS::Subscription
-    Properties:
-      TopicArn: !Ref Out<%- subscribeTo %>
-      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>"
-      Protocol: "sqs"
-  <% } %>
 #------- queue ---------
   <%- queueName %>:
     Type: "AWS::SQS::Queue"

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/sqs/templateSub.ejs

@@ -0,0 +1,7 @@
+##===== SNS Subscription
+  SubscriptionToOut<%- subscribeTo %>:
+    Type: AWS::SNS::Subscription
+    Properties:
+      TopicArn: !Ref Out<%- subscribeTo %>
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>"
+      Protocol: "sqs"

package/src/reStructure/TemplateData/generateRole/data.js

@@ -0,0 +1,94 @@
+/*
+Copyright (C) 2020 Sven Mason <http://izara.io>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+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/>.
+*/
+
+'use strict';
+
+const { SOURCE_GENERATE_IAM_ROLE, SOURCE_PATH, SAVE_FILE_NAME } = require('../../../MainLibs/src/Consts');
+const { firstLetterUpperCase: upperCase } = require("../../../MainLibs/index").utils;
+const path = require('path');
+const templatePath = path.join(__dirname, "./template.ejs")
+
+function generateRole(_izContext, createSourceParams, srcPath) {
+  // console.log("createSourceParams", createSourceParams);
+  let reformCreateSourceParams = {};
+  let createSourceRole = [];
+  for (const createSource of createSourceParams) {
+    const { roleName, additionalResourcePermission } = createSource.templateData
+    if (additionalResourcePermission && roleName) {
+      if (!reformCreateSourceParams[roleName]) {
+        reformCreateSourceParams[roleName] = {
+          resourcePermissions: [...additionalResourcePermission]
+        };
+      } else {
+        let resourcePermission = reformCreateSourceParams[roleName].resourcePermissions
+        let mergeResource = [...resourcePermission, ...additionalResourcePermission]
+
+        const seen = new Set();
+        const unique = [];
+
+        for (const permission of mergeResource) {
+          const key = JSON.stringify(permission);
+          if (!seen.has(key)) {
+            seen.add(key);
+            unique.push(permission);
+          }
+        }
+        reformCreateSourceParams[roleName].resourcePermissions = unique;
+      }
+    }
+  }
+  console.log("reformCreateSourceParams", JSON.stringify(reformCreateSourceParams, null, 2))
+  // console.log("reformCreateSourceParams", reformCreateSourceParams)
+  for (const [roleName, roleData] of Object.entries(reformCreateSourceParams)) {
+    // console.log("roleName in reformCreateSourceParams", roleName)
+    // console.log('roleData', JSON.stringify(roleData, null, 2))
+
+    createSourceRole.push(
+      {
+        templatePath: templatePath,
+        templateData: { roleName, roleData },
+        setting: {
+          initialData: "Resources:\n",
+          savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+          saveFileName: SAVE_FILE_NAME.sharedResourceYaml,
+          fileExtension: '.yml',
+          isAppend: true
+        }
+      }
+    )
+  }
+
+  return createSourceRole;
+}
+
+
+module.exports = {
+  generateRole
+}
+
+/*
+    <%_ additionalResourcePermission.forEach(resourcePermission => { _%>
+    - Effect: <%- resourcePermission.effect %>
+      Action:
+        <%_ Object.keys(resourcePermission.action).forEach(resourcePerAction => { _%>
+        <%_ resourcePermission.action[resourcePerAction].forEach(permission => { _%>
+        - <%- resourcePerAction %>:<%- permission %>
+        <%_ }) _%>
+        <%_ }) _%>
+      Resource:
+        <%_ resourcePermission.resource.forEach(resource => { _%>
+        - "<%- resource %>"
+        <%_ }) _%>
+    <%_}) _%>
+*/

package/src/reStructure/TemplateData/generateRole/template.ejs

@@ -0,0 +1,33 @@
+  <%- roleName %>Role:
+    Type: AWS::IAM::Role
+    Properties:
+      RoleName: ${self:custom.iz_resourcePrefix}<%- roleName %>Role
+      AssumeRolePolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service: "lambda.amazonaws.com"
+            Action: sts:AssumeRole
+      ManagedPolicyArns:
+        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
+      Policies:
+        - PolicyName: ${self:custom.iz_resourcePrefix}<%- roleName %>Policy
+          PolicyDocument:
+            Version: "2012-10-17"
+            Statement:
+              <%_ roleData.resourcePermissions.forEach(resourcePermission => { _%>
+              - Effect: <%- resourcePermission.effect.trim() %>
+                Action:
+                <%_ Object.keys(resourcePermission.action).forEach(action => { _%>
+                  <%_ resourcePermission.action[action].forEach(permission => { _%>
+                  - <%- action.trim() %>:<%- permission.trim() %>
+                  <%_ }) _%>
+                <%_ }) _%>
+                Resource:
+                <%_ resourcePermission.resource.forEach(resource => { _%>
+                  - "<%- resource.trim() _%>"
+                <%_ }) _%>
+              <%_ }) _%>
+                #<#additionalResource<%- roleName %>Role#>
+                #<#/additionalResource<%- roleName %>Role#>

package/src/reStructure/TemplateData/perActionComplete/create/mainFunction/template.ejs

@@ -57,7 +57,7 @@ module.exports.createObjectComplete = async (
       passBackProperties,
     });
 
-    if (_.isEmpty(returnValue)) {
+    if (_.isEmpty(returnValue.requestParams)) {
       _izContext.logger.debug("message callingFlowProperties is empty");
       throw new NoRetryError("message not an object")
     };
@@ -65,36 +65,36 @@ module.exports.createObjectComplete = async (
     if (!returnValue.hasOwnProperty("queryResult")) {
       errorsFound.push("message is not have property queryResult, should be not happen");
     };
-    if (!returnValue.hasOwnProperty("objType")) {
+    if (!returnValue.requestParams.hasOwnProperty("objType")) {
       errorsFound.push("message is not have property objType, should be not happen");
     };
-    if (!returnValue.hasOwnProperty("objInstanceFull")) {
+    if (!returnValue.requestParams.hasOwnProperty("objInstanceFull")) {
       errorsFound.push("message is not have property objInstance, should be not objInstance");
     };
 
     if (status == "error" && errorsFound.length > 0) {
       errorsFound.push("error before validate");
     } else if (status == "error" && errorsFound.length == 0) {
-      errorsFound.push("[invalid]statur is error not have errorfound form graphService");
+      errorsFound.push("[invalid]status is error not have errorsFound form graphService");
 
     };
     if (status === "complete" && errorsFound.length > 0) {
-      errorsFound.push("[Invalid] status is commplete should be not have errorsFound");
+      errorsFound.push("[Invalid] status is complete should be not have errorsFound");
     };
     if (graphServiceTag == null) {
       errorsFound.push("[Invalid] graphServerTag is not empty string");
     };
 
     if (errorsFound.length > 0) {
-      _izContext.logger.debug("Have error form grapService:", errorsFound);
-      errorsFound = errorsFound.concat(errorsFound);
+      _izContext.logger.debug("Have error form graphServerTag:", errorsFound);
+      errorsFound = errorsFound.concat(errorsFound.join(","));
     };
 
     let awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId(
       (hash({
-        objType: returnValue.objType,
+        objType: returnValue.requestParams.objType,
         graphServerTag: graphServiceTag,
-        identifiers: returnValue.objInstanceFull.identifiers
+        identifiers: returnValue.requestParams.objInstanceFull.identifiers
       })),
       PREFIX.CREATE_OBJECT_ASYNC
     )
@@ -114,20 +114,21 @@ module.exports.createObjectComplete = async (
         if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
           _izContext,
           pendingStepId,
-          awaitingStepId
+          awaitingStepId,
+          errorsFound
         )) {
           _izContext.logger.debug("finish all awaitingStep");
 
           let messageObject = {
             objType: {
-              objectType: returnValue.objType.objectType,
-              serviceTag: returnValue.objType.serviceTag
+              objectType: returnValue.requestParams.objType.objectType,
+              serviceTag: returnValue.requestParams.objType.serviceTag
             },
             objInstanceFull: {
-              identifiers: returnValue.objInstanceFull.identifiers,
-              fields: returnValue.objInstanceFull.fields
+              identifiers: returnValue.requestParams.objInstanceFull.identifiers,
+              fields: returnValue.requestParams.objInstanceFull.fields
             },
-            relationships: returnValue.relationships,
+            relationships: returnValue.requestParams.relationships,
             status: status,
             errorsFound: errorsFound
           }
@@ -143,15 +144,18 @@ module.exports.createObjectComplete = async (
           _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
           await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
 
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId
-          );
-          
+
           //(<afterSendMessage>)
           //(</afterSendMessage>)
         }
+
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId,
+          errorsFound
+        );
+
       })
     )
     //(<beforeReturn>)

package/src/reStructure/TemplateData/perActionComplete/create/yaml/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role

package/src/reStructure/TemplateData/perActionComplete/delete/mainFunction/template.ejs

@@ -53,12 +53,12 @@ module.exports.deleteNodeComplete = async (
 
     let deleteNodeComplete = {
       objType: {
-        objectType: returnValue.objType.objectType,
-        serviceTag: returnValue.objType.serviceTag
+        objectType: returnValue.requestParams.objType.objectType,
+        serviceTag: returnValue.requestParams.objType.serviceTag
       },
       objInstance: {
-        identifiers: returnValue.objInstanceFull.identifiers,
-        fields: returnValue.objInstanceFull.fields
+        identifiers: returnValue.requestParams.objInstanceFull.identifiers,
+        fields: returnValue.requestParams.objInstanceFull.fields
       },
       status: status,
       errorsFound: errorsFound
@@ -82,8 +82,8 @@ module.exports.deleteNodeComplete = async (
     //(</beforeReturn>)
 
     return {
-      objType: returnValue.objType,
-      objInstanceFull: returnValue.objInstanceFull,
+      objType: returnValue.requestParams.objType,
+      objInstanceFull: returnValue.requestParams.objInstanceFull,
       errorsFound: errorsFound
     }
 

package/src/reStructure/TemplateData/perActionComplete/delete/yaml/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role

package/src/reStructure/TemplateData/perActionComplete/get/mainFunction/template.ejs

@@ -43,7 +43,7 @@ module.exports.updateNodeComplete = async (
   passBackProperties = {}
 ) => {
   try {
-    _izContext.logger.debug("Function:updateNodeComplete", {
+    _izContext.logger.debug("Function:GetComplete", {
       _izContext: _izContext,
       returnValue: returnValue,
       status: status,
@@ -54,10 +54,10 @@ module.exports.updateNodeComplete = async (
     // start create AwaitingStepId
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
       hash({
-        objectType: returnValue.objType.objectType,
-        serviceTag: returnValue.objType.serviceTag,
-        identifiers: returnValue.objInstanceFull.identifiers,
-        fields: returnValue.objInstanceFull.fields
+        objectType: returnValue.requestParams.objType.objectType,
+        serviceTag: returnValue.requestParams.objType.serviceTag,
+        identifiers: returnValue.requestParams.objInstanceFull.identifiers,
+        fields: returnValue.requestParams.objInstanceFull.fields
       }),
       PREFIX.updateNode
     )
@@ -76,18 +76,19 @@ module.exports.updateNodeComplete = async (
         if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
           _izContext,
           pendingStepId,
-          awaitingStepId
+          awaitingStepId,
+          errorsFound
         )) {
           _izContext.logger.debug("finished all awaitingStep");
 
           let updateCompleteMsg = {
             objType: {
-              objectType: returnValue.objType.objectType,
-              serviceTag: returnValue.objType.serviceTag
+              objectType: returnValue.requestParams.objType.objectType,
+              serviceTag: returnValue.requestParams.objType.serviceTag
             },
             objInstance: {
-              identifiers: returnValue.objInstanceFull.identifiers,
-              fields: returnValue.objInstanceFull.fields
+              identifiers: returnValue.requestParams.objInstanceFull.identifiers,
+              fields: returnValue.requestParams.objInstanceFull.fields
             },
             status: status,
             errorsFound: errorsFound
@@ -107,12 +108,14 @@ module.exports.updateNodeComplete = async (
           _izContext.logger.debug("Send Message to OutUpdateNodeComplete::", sendMessageToOutUpdateNodeComplete);
           await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)
 
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId
-          );
         }
+
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId,
+          errorsFound
+        );
       })
     )
 
@@ -120,8 +123,8 @@ module.exports.updateNodeComplete = async (
     //(</beforeReturn>)
 
     return {
-      objType: returnValue.objType,
-      objInstanceFull: returnValue.objInstanceFull,
+      objType: returnValue.requestParams.objType,
+      objInstanceFull: returnValue.requestParams.objInstanceFull,
       errorsFound: errorsFound
     }
 

package/src/reStructure/TemplateData/perActionComplete/get/yaml/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role

package/src/reStructure/TemplateData/perActionComplete/update/mainFunction/template.ejs

@@ -54,10 +54,10 @@ module.exports.updateNodeComplete = async (
     // start create AwaitingStepId
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
       hash({
-        objectType: returnValue.objType.objectType,
-        serviceTag: returnValue.objType.serviceTag,
-        identifiers: returnValue.objInstanceFull.identifiers,
-        fields: returnValue.objInstanceFull.fields
+        objectType: returnValue.requestParams.objType.objectType,
+        serviceTag: returnValue.requestParams.objType.serviceTag,
+        identifiers: returnValue.requestParams.objInstanceFull.identifiers,
+        fields: returnValue.requestParams.objInstanceFull.fields
       }),
       PREFIX.updateNode
     )
@@ -76,18 +76,19 @@ module.exports.updateNodeComplete = async (
         if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
           _izContext,
           pendingStepId,
-          awaitingStepId
+          awaitingStepId,
+          errorsFound
         )) {
           _izContext.logger.debug("finished all awaitingStep");
 
           let updateCompleteMsg = {
             objType: {
-              objectType: returnValue.objType.objectType,
-              serviceTag: returnValue.objType.serviceTag
+              objectType: returnValue.requestParams.objType.objectType,
+              serviceTag: returnValue.requestParams.objType.serviceTag
             },
             objInstanceFull: {
-              identifiers: returnValue.objInstanceFull.identifiers,
-              fields: returnValue.objInstanceFull.fields
+              identifiers: returnValue.requestParams.objInstanceFull.identifiers,
+              fields: returnValue.requestParams.objInstanceFull.fields
             },
             status: status,
             errorsFound: errorsFound
@@ -107,21 +108,23 @@ module.exports.updateNodeComplete = async (
           _izContext.logger.debug("Send Message to OutUpdateNodeComplete::", sendMessageToOutUpdateNodeComplete);
           await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)
 
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId
-          );
         }
+
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId,
+          errorsFound
+        );
       })
     )
 
     //(<beforeReturn>)
     //(</beforeReturn>)
-    
+
     return {
-      objType: returnValue.objType,
-      objInstanceFull: returnValue.objInstanceFull,
+      objType: returnValue.requestParams.objType,
+      objInstanceFull: returnValue.requestParams.objInstanceFull,
       errorsFound: errorsFound
     }
 

package/src/reStructure/TemplateData/perActionComplete/update/yaml/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role

package/src/reStructure/TemplateData/processLogicalPagination/yaml/dsq/template.ejs

@@ -7,6 +7,6 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){ return text.charAt(0).toUpperCase() + text.slice(1) } _%>

package/src/reStructure/TemplateData/processLogicalPagination/yaml/sqs/template.ejs

@@ -7,6 +7,6 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){ return text.charAt(0).toUpperCase() + text.slice(1) } _%>

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/api/template.ejs

@@ -10,8 +10,8 @@
         #<#Authorizer#>
         #<#/Authorizer#>
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/dsq/template.ejs

@@ -7,8 +7,8 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/inv/template.ejs

@@ -3,8 +3,8 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/sqs/template.ejs

@@ -7,8 +7,8 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>