@izara_project/izara-market-library-service-schemas 1.0.32 → 1.0.34

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/sns-in/data.js

@@ -25,16 +25,15 @@ const path = require("path")
 // STORAGE_TYPES
 // } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/utils.js");
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/src/Utils.js");
 const STORAGE_TYPES = {
   dynamoDB: "dynamoDB",
   graph: "graph"
 }
 
-const snsTemplatePath = path.join(__dirname, './snsTemplate.ejs');
+const snsTemplatePath = path.join(__dirname, '../../../resourceYaml/sns-in-sqs/snsTemplate.ejs');
 const sqsTemplatePath = path.join(__dirname, './sqsTemplate.ejs');
-const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../../MainLibs/src/Consts.js')
-
+const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts.js');
 
 /**
  * create data for dynamoDbYaml tempalte from objectSchema
@@ -46,9 +45,9 @@ const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../.
  * @returns {Object[]}              - data of multiple dynamoDb template
  */
 
-function createDataForDefaultSnsInSqs(_izContext, srcPath) {
+function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
   let resultsForCreateDefaultSnsInSqs = [];
-  const defaultSnsInSqsDataList = [];
+
   const setting = {
     initialData: "Resources:\n",
     savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
@@ -58,19 +57,15 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
   }
 
   //  GCTpBasTestInPersonCreate => GCTpBas_Test_PersonCreate_In
-  defaultSnsInSqsDataList.push(
-    {
-      queueName: upperCase(FUNCTION_NAME.findData)
-    },
+  let flowSteps = Object.keys(flowSchema.flowSteps)
+  const generatedSnsTopicInForFlowSchema = [
     {
-      queueName: upperCase(FUNCTION_NAME.processLogical)
+      queueName: upperCase(flowSteps[0].split("_")[0]),
     },
-    {
-      queueName: upperCase(FUNCTION_NAME.paginateProcessLogical)
-    }
-  )
+  ];
+
 
-  for (let defaultSnsInSqsData of defaultSnsInSqsDataList) {
+  for (let defaultSnsInSqsData of generatedSnsTopicInForFlowSchema) {
     resultsForCreateDefaultSnsInSqs.push({
       templatePath: snsTemplatePath,
       templateData: defaultSnsInSqsData,
@@ -80,8 +75,12 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
 
   let defaultDsqQueueDataList = [
     {
-      queueName: upperCase(FUNCTION_NAME.paginateProcessLogical) + upperCase(HANDLER.hdrDsq)
-    }
+      queueName: upperCase(FUNCTION_NAME.flowSchemaOwnTopicEndpointComplete) + upperCase(HANDLER.hdrSqs),
+      subscribeTo: upperCase(flowSteps[1].split("_")[0])
+    },
+    // {
+    //   queueName: upperCase(FUNCTION_NAME.flowSchemaOwnTopicComplete) + upperCase(HANDLER.hdrSqs)
+    // }
   ]
   for (let defaultDsqQueueData of defaultDsqQueueDataList) {
     resultsForCreateDefaultSnsInSqs.push({
@@ -90,6 +89,7 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
       setting: setting
     })
   }
+  console.log()
   return resultsForCreateDefaultSnsInSqs;
 }
 

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/sns-in/sqsTemplate.ejs

@@ -0,0 +1,53 @@
+<% if (subscribeTo) { %>
+##===== SNS Subscription
+##===== [Topic In]
+  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"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>
+      RedrivePolicy:
+        deadLetterTargetArn: #!GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>DLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+
+  <%- queueName %>DLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>DLQ
+
+  <%- queueName %>Policy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource: #!GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>
+  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+
+<%_ function firstLetterUpperCase(text){
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>
+<%_ function firstLetterLowerCase(str) {
+  return str.charAt(0).toLowerCase() + str.slice(1)
+} _%>

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/sns-out/data.js

@@ -0,0 +1,77 @@
+/*
+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 path = require("path")
+
+
+// const {
+//   HANDLER,
+// STORAGE_TYPES
+// } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
+
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/src/Utils.js");
+const STORAGE_TYPES = {
+  dynamoDB: "dynamoDB",
+  graph: "graph"
+}
+
+const templatePath = path.join(__dirname, '../../../resourceYaml/sns-out/template.ejs');
+const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts.js')
+
+/**
+ * create data for dynamoDbYaml template from objectSchema
+ * return array of dynamoDb data
+ * because one objectSchema can create multiple dynamoDb table
+ *
+ * @param {Object} _izContext
+ * @param {String} saveFilePath
+ * @returns {Object[]}              - data of multiple dynamoDb template
+ */
+
+function createDataForSnsOut(_izContext, flowSchema, srcPath) {
+  let resultsForCreateDefaultSnsInSqs = [];
+
+  //  GCTpBasTestInPersonCreate => GCTpBas_Test_PersonCreate_In
+  let flowSteps = Object.keys(flowSchema.flowSteps)
+  const generatedSnsTopicOutForFlowSchema = [
+    {
+      queueName: upperCase(flowSteps[1].split("_")[0])
+    }
+  ];
+
+
+  for (let defaultSnsOutData of generatedSnsTopicOutForFlowSchema) {
+    resultsForCreateDefaultSnsInSqs.push({
+      templatePath: templatePath,
+      templateData: defaultSnsOutData,
+      setting: {
+        initialData: "Resources:\n",
+        savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+        saveFileName: SAVE_FILE_NAME.snsOutYaml,
+        fileExtension: ".yml",
+        isAppend: true
+      }
+
+    })
+  }
+
+  return resultsForCreateDefaultSnsInSqs;
+}
+
+module.exports = createDataForSnsOut;

package/src/reStructure/TemplateData/flowSchema/generateTemplateData.js

@@ -81,18 +81,35 @@ const createExternalTopicSnsInSqs = require('./externalTopic/sns-in-sqs/data');
 const createExternalTopicSnsOut = require('./externalTopic/sns-out/data');
 
 // flowSchema OwnTopic component
-const createFlowSchemaOwnTopicFunctionYaml = require('./flowSchemaOwnTopic/FlowSchemaComponent/functionYaml/data')
-const createFlowSchemaOwnTopicHandler = require('./flowSchemaOwnTopic/FlowSchemaComponent/handler/data')
-const createFlowSchemaOwnTopicMainFunction = require('./flowSchemaOwnTopic/FlowSchemaComponent/mainFunction/data')
+const createFlowSchemaOwnTopicFunctionYaml = require('./flowSchemaOwnTopic/FlowSchemaComponent/functionYaml/data');
+const createFlowSchemaOwnTopicHandler = require('./flowSchemaOwnTopic/FlowSchemaComponent/handler/data');
+const createFlowSchemaOwnTopicMainFunction = require('./flowSchemaOwnTopic/FlowSchemaComponent/mainFunction/data');
 
 // flowSchema OwnTopicComplete component
-const createFlowSchemaOwnTopicCompleteFunctionYaml = require("./flowSchemaOwnTopic/FlowSchemaCompleteComponent/functionYaml/data")
-const createFlowSchemaOwnTopicCompleteHandler = require("./flowSchemaOwnTopic/FlowSchemaCompleteComponent/handler/data")
-const createFlowSchemaOwnTopicCompleteMainFunction = require("./flowSchemaOwnTopic/FlowSchemaCompleteComponent/mainFunction/data")
+const createFlowSchemaOwnTopicCompleteFunctionYaml = require("./flowSchemaOwnTopic/FlowSchemaCompleteComponent/functionYaml/data");
+const createFlowSchemaOwnTopicCompleteHandler = require("./flowSchemaOwnTopic/FlowSchemaCompleteComponent/handler/data");
+const createFlowSchemaOwnTopicCompleteMainFunction = require("./flowSchemaOwnTopic/FlowSchemaCompleteComponent/mainFunction/data");
+
+// flowSchema OwnTopicEndpoint component
+const createFlowSchemaOwnTopicEndpointFuntionYaml = require('./flowSchemaOwnTopic/EndpointComponent/functionYaml/data');
+const createFlowSchemaOwnTopicEndpointHandler = require('./flowSchemaOwnTopic/EndpointComponent/handler/data');
+const createFlowSchemaOwnTopicEndpointMainFunction = require('./flowSchemaOwnTopic/EndpointComponent/mainFunction/data');
+
+// flowSchema OwnTopicEndpointComplete component
+const createFlowSchemaOwnTopicEndpointCompleteFuntionYaml = require('./flowSchemaOwnTopic/EndpointComplete/functionYaml/data');
+const createFlowSchemaOwnTopicEndpointCompleteHandler = require('./flowSchemaOwnTopic/EndpointComplete/handler/data');
+const createFlowSchemaOwnTopicEndpointCompleteMainFunction = require('./flowSchemaOwnTopic/EndpointComplete/mainFunction/data');
+
+const createFlowSchemaOwnTopicQueue = require('./flowSchemaOwnTopic/sns-in/data');
+const createFlowSchemaOwnTopicSnsOut = require('./flowSchemaOwnTopic/sns-out/data');
+// ** EventBridge **
+const createFlowSchemaEventBridgeFunctionYaml = require('./eventBridge/functionYaml/data');
+const createFlowSchemaEventBridgeHandler = require('./eventBridge/handler/inv/data');
+const createFlowSchemaEventBridgeMainFunction = require('./eventBridge/mainFunction/data');
+
+const createFlowSchemaDynamoDb = require('./dynamoDb/data')
+
 
-const createFlowSchemaOwnTopicEndpointFuntionYaml = require('./flowSchemaOwnTopic/EndpointComponent/functionYaml/data')
-const createFlowSchemaOwnTopicEndpointHandler = require('./flowSchemaOwnTopic/EndpointComponent/handler/data')
-const createFlowSchemaOwnTopicEndpointMainFunction = require('./flowSchemaOwnTopic/EndpointComponent/mainFunction/data')
 /**
  * Generates code with templates for different actions
  * @param {Object} _izContext - Context object
@@ -100,6 +117,7 @@ const createFlowSchemaOwnTopicEndpointMainFunction = require('./flowSchemaOwnTop
  * @returns {Array} Array of generated code parameters
  */
 async function generateCodeWithTemplate(_izContext, objSchemaPath) {
+  console.log("objSchemaPath", objSchemaPath);
   try {
     const saveFilePath = join(objSchemaPath, '../');
     let createSourceParams = [];
@@ -259,15 +277,42 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const flowSchemaOwnTopicEndpointMainFunction = createFlowSchemaOwnTopicEndpointMainFunction(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicEndpointComponent = [...flowSchemaOwnTopicEndpointFuntionYaml, ...flowSchemaOwnTopicEndpointHandler, ...flowSchemaOwnTopicEndpointMainFunction]
 
+          // flowSchemaOwnTopic EndpointComplete
+          const flowSchemaOwnTopicEndpointCompleteFuntionYaml = createFlowSchemaOwnTopicEndpointCompleteFuntionYaml(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicEndpointCompleteHandler = createFlowSchemaOwnTopicEndpointCompleteHandler(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicEndpointCompleteMainFunction = createFlowSchemaOwnTopicEndpointCompleteMainFunction(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicEndpointCompleteComponent = [...flowSchemaOwnTopicEndpointCompleteFuntionYaml, ...flowSchemaOwnTopicEndpointCompleteHandler, ...flowSchemaOwnTopicEndpointCompleteMainFunction];
+
+          const flowSchemaOwnTopicQueue = createFlowSchemaOwnTopicQueue(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicSnsOut = createFlowSchemaOwnTopicSnsOut(_izContext, flowSchema, saveFilePath);
           // Group the resources
           const ownTopicResources = [
-            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicCompleteComponent, ...flowSchemaOwnTopicEndpointComponent
+            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicCompleteComponent, ...flowSchemaOwnTopicEndpointComponent, ...flowSchemaOwnTopicQueue, ...flowSchemaOwnTopicSnsOut, ...flowSchemaOwnTopicEndpointCompleteComponent
           ];
 
           console.log("event ownTopic generated")
           createSourceParams.push(...ownTopicResources);
 
 
+        } else if (event.includes("eventBridge")) {
+          const flowSchemaEventBridgeHandler = createFlowSchemaEventBridgeHandler(_izContext, flowSchema, saveFilePath);
+          const flowSchemaEventBridgeMainFunction = createFlowSchemaEventBridgeMainFunction(_izContext, flowSchema, saveFilePath);
+          const flowSchemaEventBridgeFunctionYaml = createFlowSchemaEventBridgeFunctionYaml(_izContext, flowSchema, saveFilePath);
+
+          // Group the resources
+          const eventBridgeResources = [
+            ...flowSchemaEventBridgeHandler,
+            ...flowSchemaEventBridgeMainFunction,
+            ...flowSchemaEventBridgeFunctionYaml
+          ];
+
+          console.log("event eventBridge generated")
+          createSourceParams.push(...eventBridgeResources);
+        }
+
+        if (flowSchema.statusType === "storedCache") {
+          const flowSchemaDynamoDb = createFlowSchemaDynamoDb(_izContext, flowSchema, saveFilePath)
+          createSourceParams.push(...flowSchemaDynamoDb);
         }
       }
     }

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

@@ -106,7 +106,7 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
       handlerType: [],
       resources: {}
     },
-    [SOURCE_GENERATE_IAM_ROLE.perActionEndpoint]: {
+    [SOURCE_GENERATE_IAM_ROLE.PerActionEndpoint]: {
       handlerType: [],
       resources: {}
     },
@@ -118,6 +118,14 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
       handlerType: [],
       resources: {}
     },
+    "WebsocketConnect": {
+      handlerType: [],
+      resources: {}
+    },
+    [SOURCE_GENERATE_IAM_ROLE.EventBridge]: {
+      handlerType: [],
+      resources: {}
+    },
     Other: []
   };
   const objectTypeList = [];
@@ -193,30 +201,42 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
         templateData.additionalResourcePermission,
         groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole].resources
       );
-    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role)) {
+    } else if (templateData?.roleName?.includes(SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role)) {
       groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role].handlerType.push(templateData);
       processResourcePermissions(
         templateData.additionalResourcePermission,
         groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role].resources
       )
-    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.perActionEndpoint)) {
-      groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.perActionEndpoint].handlerType.push(templateData);
+    } else if (templateData?.roleName?.includes(SOURCE_GENERATE_IAM_ROLE.PerActionEndpoint)) {
+      groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.PerActionEndpoint].handlerType.push(templateData);
       processResourcePermissions(
         templateData.additionalResourcePermission,
-        groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.perActionEndpoint].resources
+        groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.PerActionEndpoint].resources
       )
-    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic)) {
+    } else if (templateData?.roleName?.includes(SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic)) {
       groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic].handlerType.push(templateData);
       processResourcePermissions(
         templateData.additionalResourcePermission,
         groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic].resources
       )
-    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.ExternalTopicRole)) {
+    } else if (templateData?.roleName?.includes(SOURCE_GENERATE_IAM_ROLE.ExternalTopicRole)) {
       groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.ExternalTopicRole].handlerType.push(templateData);
       processResourcePermissions(
         templateData.additionalResourcePermission,
         groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.ExternalTopicRole].resources
       )
+    } else if (templateData?.roleName?.includes("WebsocketConnect")) {
+      groupedByObjectType["WebsocketConnect"].handlerType.push(templateData);
+      processResourcePermissions(
+        templateData.additionalResourcePermission,
+        groupedByObjectType["WebsocketConnect"].resources
+      )
+    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.EventBridge)) {
+      groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.EventBridge].handlerType.push(templateData);
+      processResourcePermissions(
+        templateData.additionalResourcePermission,
+        groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.EventBridge].resources
+      )
     }
     else {
       // Handle other items

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

@@ -22,7 +22,7 @@ const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const sns = require('@izara_project/izara-core-library-external-request/src/resources/Sns');
 const _ = require('lodash');
 const hash = require("object-hash")
-
+const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
 const PREFIX = {
   CREATE_OBJECT_ASYNC: "createObjectAsync",
   CREATE_OBJECT_ASYNC_COMPLETE: "createObjectAsyncComplete"
@@ -77,7 +77,7 @@ module.exports.createObjectComplete = async (
     };
 
     if (status == "error" && errorsFound.length > 0) {
-      errorsFound.push(errorsFound);
+      errorsFound.push("error before validate");
     } else if (status == "error" && errorsFound.length == 0) {
       errorsFound.push("[invalid]statur is error not have errorfound form graphService");
 
@@ -141,7 +141,7 @@ module.exports.createObjectComplete = async (
           let sendMessageOutCreateObjectComplete = {
             Message: JSON.stringify(messageObject),
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, "OutCreateObjectComplete")
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete)
           };
           _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
           await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);

package/src/reStructure/TemplateData/perActionComplete/create/yaml/data.js

@@ -89,15 +89,21 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
           SQS_RESOURCE.getQueueUrl,
           SQS_RESOURCE.receiveMessage,
           SQS_RESOURCE.sendMessage
-        ],
+        ]
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ")
+      ]
+    ),
+    createIamRole(
+      {
         [RESOURCE_CLASSES.sns]: [
           SNS_RESOURCE.publish,
           SNS_RESOURCE.subscribe
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ]

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

@@ -72,7 +72,7 @@ module.exports.deleteNodeComplete = async (
     let sendMessageToOutUpdateNodeComplete = {
       Message: JSON.stringify(deleteNodeComplete),
       MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete)
+      TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete)
     };
     _izContext.logger.debug("Send Message to DeleteNodeComplete::", sendMessageToOutUpdateNodeComplete);
     await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)

package/src/reStructure/TemplateData/perActionComplete/delete/yaml/data.js

@@ -87,15 +87,21 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
           SQS_RESOURCE.getQueueUrl,
           SQS_RESOURCE.receiveMessage,
           SQS_RESOURCE.sendMessage
-        ],
+        ]
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ")
+      ]
+    ),
+    createIamRole(
+      {
         [RESOURCE_CLASSES.sns]: [
           SNS_RESOURCE.publish,
           SNS_RESOURCE.subscribe
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ]

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

@@ -101,7 +101,7 @@ module.exports.updateNodeComplete = async (
           let sendMessageToOutUpdateNodeComplete = {
             Message: JSON.stringify(updateCompleteMsg),
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete)
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete)
           };
           _izContext.logger.debug("Send Message to OutUpdateNodeComplete::", sendMessageToOutUpdateNodeComplete);
           await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)

package/src/reStructure/TemplateData/perActionComplete/get/yaml/data.js

@@ -67,15 +67,21 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
           SQS_RESOURCE.getQueueUrl,
           SQS_RESOURCE.receiveMessage,
           SQS_RESOURCE.sendMessage
-        ],
+        ]
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ")
+      ]
+    ),
+    createIamRole(
+      {
         [RESOURCE_CLASSES.sns]: [
           SNS_RESOURCE.publish,
           SNS_RESOURCE.subscribe
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ]
@@ -93,7 +99,7 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       additionalResourcePermission,
       resourceLocation: SOURCE_PATH.resourceLocationOutPerActionComplete,
       functionNameConfig,
-      roleName: SOURCE_GENERATE_IAM_ROLE.roleName,
+      roleName: SOURCE_GENERATE_IAM_ROLE.ObjectCompleteRole,
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -101,7 +101,7 @@ module.exports.updateNodeComplete = async (
           let sendMessageToOutUpdateNodeComplete = {
             Message: JSON.stringify(updateCompleteMsg),
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete)
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete)
           };
           _izContext.logger.debug("Send Message to OutUpdateNodeComplete::", sendMessageToOutUpdateNodeComplete);
           await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)

package/src/reStructure/TemplateData/perActionComplete/update/yaml/data.js

@@ -91,15 +91,21 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
           SQS_RESOURCE.getQueueUrl,
           SQS_RESOURCE.receiveMessage,
           SQS_RESOURCE.sendMessage
-        ],
+        ]
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
+        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ")
+      ]
+    ),
+    createIamRole(
+      {
         [RESOURCE_CLASSES.sns]: [
           SNS_RESOURCE.publish,
           SNS_RESOURCE.subscribe
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ]

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/mainFunction/template.ejs

@@ -109,7 +109,7 @@ module.exports.createRelationshipComplete = async (
           let sendMessageToOutCreateRelatonshipComplete = {
             Message: JSON.stringify(createCompleteMsg),
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateRelComplete)
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateRelComplete)
           };
           _izContext.logger.debug("Send message to OutCreateRelationshipComplete :::>", sendMessageToOutCreateRelatonshipComplete);
           await sns.publishAsync(_izContext, sendMessageToOutCreateRelatonshipComplete);

package/src/reStructure/TemplateData/relationshipPerAction/delete/complete/mainFunction/template.ejs

@@ -107,13 +107,13 @@ module.exports.createRelationshipComplete = async (
           let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {});
           _izContext.logger.debug("After addCallingFlowToSnsResponseMessageAttributes", deleteRelComp);
 
-          let sendMessageToOutCreateRelatonshipComplete = {
+          let sendMessageToOutDeleteRelatonshipComplete = {
             Message: JSON.stringify(deleteRelComp),
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateRelComplete)
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outDeleteRelComplete)
           };
-          _izContext.logger.debug("Send message to OutCreateRelationshipComplete :::>", sendMessageToOutCreateRelatonshipComplete);
-          await sns.publishAsync(_izContext, sendMessageToOutCreateRelatonshipComplete);
+          _izContext.logger.debug("Send message to OutCreateRelationshipComplete :::>", sendMessageToOutDeleteRelatonshipComplete);
+          await sns.publishAsync(_izContext, sendMessageToOutDeleteRelatonshipComplete);
 
 
           // remove awaitingMultipleStep after finished
@@ -134,7 +134,7 @@ module.exports.createRelationshipComplete = async (
       errorsFound
     }
   } catch (err) {
-    _izContext.logger.error('error createRelationshipComplete:', err)
+    _izContext.logger.error('error deleteRelationshipComplete:', err)
     throw (err)
   }
 }

package/src/reStructure/TemplateData/relationshipPerAction/get/complete/mainFunction/template.ejs

@@ -107,13 +107,13 @@ module.exports.createRelationshipComplete = async (
           let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {});
           _izContext.logger.debug("After addCallingFlowToSnsResponseMessageAttributes", createCompleteMsg);
 
-          let sendMessageToOutCreateRelatonshipComplete = {
+          let sendMessageToOutGetRelComplete = {
             Message: JSON.stringify(createCompleteMsg),
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outCreateRelComplete)
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outGetRelComplete)
           };
-          _izContext.logger.debug("Send message to OutCreateRelationshipComplete :::>", sendMessageToOutCreateRelatonshipComplete);
-          await sns.publishAsync(_izContext, sendMessageToOutCreateRelatonshipComplete);
+          _izContext.logger.debug("Send message to outGetRelComplete :::>", sendMessageToOutGetRelComplete);
+          await sns.publishAsync(_izContext, sendMessageToOutGetRelComplete);
 
 
           // remove awaitingMultipleStep after finished
@@ -135,7 +135,7 @@ module.exports.createRelationshipComplete = async (
     }
 
   } catch (err) {
-    _izContext.logger.error('error createRelationshipComplete:', err)
+    _izContext.logger.error('error GetRelationshipComplete:', err)
     throw (err)
   }
 }

package/src/reStructure/TemplateData/relationshipPerAction/update/complete/mainFunction/template.ejs

@@ -112,7 +112,7 @@ module.exports.updateRelationshipComplete = async (
           let sendMessageToOutUpdateRelatonshipComplete = {
             Message: JSON.stringify(updateCompleteMsg),
             MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateRelComplete)
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateRelComplete)
           };
           _izContext.logger.debug("Send message to OutUpdateRelationshipComplete :::>", sendMessageToOutUpdateRelatonshipComplete);
           await sns.publishAsync(_izContext, sendMessageToOutUpdateRelatonshipComplete);