@izara_project/izara-market-library-service-schemas 1.0.31 → 1.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -20,15 +20,15 @@
     "testEnvironment": "node"
   },
   "dependencies": {
+    "@izara_project/izara-core-library-calling-flow": "^1.0.3",
     "@izara_project/izara-core-library-core": "^1.0.18",
-    "@izara_project/izara-core-library-external-request": "^1.0.17",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.48",
-    "@izara_project/izara-shared": "^1.0.125",
-    "@izara_project/izara-shared-service-schemas": "^1.0.5",
-    "@izara_project/izara-core-library-sns": "^1.0.3",
-    "@izara_project/izara-core-library-sqs": "^1.0.3",
-    "@izara_project/izara-core-library-calling-flow": "^1.0.2",
-    "@izara_project/izara-core-library-logger": "^1.0.6",
+    "@izara_project/izara-core-library-external-request": "^1.0.18",
+    "@izara_project/izara-core-library-logger": "^1.0.7",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.49",
+    "@izara_project/izara-core-library-sns": "^1.0.4",
+    "@izara_project/izara-core-library-sqs": "^1.0.4",
+    "@izara_project/izara-shared": "^1.0.126",
+    "@izara_project/izara-shared-service-schemas": "^1.0.6",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",
     "lodash": "^4.17.21",

package/src/GenerateCodeLibs/src/Consts.js

@@ -28,19 +28,34 @@ const PREFIX = {
   getRel: "getRelationshipEndpoint"
 }
 
+// const TOPIC_NAME_GRAPH_HANDLER = {
+//   inUpdateRel: "InUpdateRelationship",
+//   inCreateRel: "InCreateRelationshipV2",
+//   outUpdateRel: "OutUpdateRelationship",
+//   outCreateRel: "OutCreateRelationship",
+//   inDeleteRel: "InDeleteRelationshipV2",
+//   outDeleteRel: "OutDeleteRelationshipV2",
+//   inUpdateNode: "InUpdateNode",
+//   outUpdateNode: "OutUpdateNode",
+//   inCreateNode: "InCreateNodeV2",
+//   outCreateNode: "OutCreateNodeV2",
+//   inDeleteNode: "InDeleteNodeV2",
+//   outDeleteNode: "OutDeleteNodeV2",
+// }
+
 const TOPIC_NAME_GRAPH_HANDLER = {
-  inUpdateRel: "InUpdateRelationship",
-  inCreateRel: "InCreateRelationshipV2",
-  outUpdateRel: "OutUpdateRelationship",
-  outCreateRel: "OutCreateRelationship",
-  inDeleteRel: "InDeleteRelationshipV2",
-  outDeleteRel: "OutDeleteRelationshipV2",
-  inUpdateNode: "InUpdateNode",
-  outUpdateNode: "OutUpdateNode",
-  inCreateNode: "InCreateNodeV2",
-  outCreateNode: "OutCreateNodeV2",
-  inDeleteNode: "InDeleteNodeV2",
-  outDeleteNode: "OutDeleteNodeV2",
+  inUpdateRel: "UpdateRelationship_In",
+  inCreateRel: "CreateRelationship_In",
+  outUpdateRel: "UpdateRelationship_Out",
+  outCreateRel: "CreateRelationship_Out",
+  inDeleteRel: "DeleteRelationship_In",
+  outDeleteRel: "DeleteRelationship_Out",
+  inUpdateNode: "UpdateNode_In",
+  outUpdateNode: "UpdateNode_Out",
+  inCreateNode: "CreateNode_In",
+  outCreateNode: "CreateNode_Out",
+  inDeleteNode: "DeleteNode_In",
+  outDeleteNode: "DeleteNode_Out"
 }
 
 const TOPIC_NAME_GENERATE_CODE = {
@@ -62,7 +77,8 @@ const TOPIC_NAME_GENERATE_CODE = {
   outGetNodeComplete: "GetNodeComplete_Out",
   reservedLimitComplete: "ReservedLimitComplete",
   createPresignUrl: "CreatePresignUrl",
-  flowSchemaOwnTopicComplete: "FlowSchemaOwnTopicComplete"
+  flowSchemaOwnTopicComplete: "FlowSchemaOwnTopicComplete",
+  flowSchemaOwnTopicEndpointComplete: "flowSchemaOwnTopicEndpointComplete",
 }
 
 const GRAPH_HANDLER_SERVICE_NAME = {

package/src/MainLibs/src/Consts.js

@@ -119,7 +119,11 @@ const SOURCE_PATH = {
   webSocket: "../src/generatedCode/FlowSchema/UploadS3/",
   resourceLocationWebSocket: "src/generatedCode/FlowSchema/UploadS3/",
   flowSchemaOwnTopic: "../src/generatedCode/FlowSchema/FlowSchemaOwnTopic/",
-  resourceLocationFlowSchemaOwnTopic: "src/generatedCode/flowSchemaOwnTopic/UploadS3/",
+  resourceLocationFlowSchemaOwnTopic: "src/generatedCode/flowSchemaOwnTopic/",
+  flowSchemaExternalTopic: "../src/generatedCode/FlowSchema/FlowSchemaExternalTopic/",
+  resourceLocationFlowSchemaExternalTopic: "src/generatedCode/flowSchemaExternalTopic/",
+  flowSchemaEventBridge: "../src/generatedCode/FlowSchema/EventBridge/",
+  resourceLocationFlowSchemaEventBridge: "src/generatedCode/FlowSchema/EventBridge/",
   generateCodeLib: "../src/generatedCode/libs/source/",
   logicalFunctionHook: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source/",
   resourceLocationLogicalFunctionHook: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source",
@@ -190,7 +194,7 @@ function externalResourceName(resourceClass, resourceName, serviceTag) {
     // [RESOURCE_CLASSES.dynamoDbAcrossService]: "arn:aws:dynamodb:${process.env.iz_region}:${process.env.iz_accountId}:table/*/" + `${resourceName}`,
     [RESOURCE_CLASSES.dynamoDbAcrossService]: "arn:aws:dynamodb:${process.env.iz_region}:${process.env.iz_accountId}:table/" + `"${serviceTag}"` + `"${resourceName}"`,
     [RESOURCE_CLASSES.lambda]: "arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${await lambdaSharedLib.lambdaFunctionName(_izContext, " + `"${resourceName}" ,"${serviceTag}")}`,
-    [RESOURCE_CLASSES.sns]: "arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${await snsSharedLib.snsTopicName(_izContext, " + `"${resourceName}", "${serviceTag}")}`
+    [RESOURCE_CLASSES.sns]: "arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${await snsSharedLib.snsTopicNameByFlowSchema(_izContext, " + `"${resourceName}", "${serviceTag}")}`
 
   }[resourceClass]
 };
@@ -255,7 +259,10 @@ const FUNCTION_NAME = {
   reservedLimit: "reservedLimit",
   createPresignUrl: "createPresignUrl",
   flowSchemaOwnTopic: "flowSchemaOwnTopic",
-  flowSchemaOwnTopicComplete: "flowSchemaOwnTopicComplete"
+  flowSchemaOwnTopicComplete: "flowSchemaOwnTopicComplete",
+  flowSchemaOwnTopicEndpoint: "flowSchemaOwnTopicEndpoint",
+  flowSchemaOwnTopicEndpointComplete: "flowSchemaOwnTopicEndpointComplete",
+  flowSchemaExternalTopic: "externalTopic",
 };
 
 const SHORT_FUNCTION_NAME = {
@@ -372,8 +379,9 @@ const SOURCE_GENERATE_IAM_ROLE = {
   RelationshipCompleteRole: "RelationshipCom",
   FlowSchemaUploadS3Role: "FlowSchemaUploadS3",
   FlowSchemaOwnTopic: "FlowSchemaOwnTopic",
-  FlowSchemaOwnTopic: "FlowSchemaOwnTopic",
-  perActionEndpoint: "PerActionEndpoint"
+  PerActionEndpoint: "PerActionEndpoint",
+  ExternalTopicRole: "ExternalTopic",
+  EventBridge: "EventBridge",
 };
 
 const ADD_ON_DATA_STRUCTURE_TYPE = {

package/src/reStructure/GenerateCode.js

@@ -45,16 +45,17 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     let localServicePath = join(saveFilePath, "../../");
 
     // // define path for store yml file
-    const GENERATE_CODE_SOURCE_PATH = {
-      appYaml: join(saveFilePath, SOURCE_PATH.appYaml),
-      resourceYaml: join(saveFilePath, SOURCE_PATH.resourceYaml),
-      lambdaPerAction: join(saveFilePath, SOURCE_PATH.lambdaPerAction),
-      externalService: join(saveFilePath, SOURCE_PATH.externalService),
-      relationshipPerAction: join(saveFilePath, SOURCE_PATH.relationshipPerAction),
-      webSocketEndpoint: join(saveFilePath, SOURCE_PATH.webSocket),
-      generateCodeLib: join(saveFilePath, SOURCE_PATH.generateCodeLib),
-      generatedMainFunctionPerService: join(saveFilePath, SOURCE_PATH.endpointPerService),
-    };
+    // const GENERATE_CODE_SOURCE_PATH = {
+    //   appYaml: join(saveFilePath, SOURCE_PATH.appYaml),
+    //   resourceYaml: join(saveFilePath, SOURCE_PATH.resourceYaml),
+    //   lambdaPerAction: join(saveFilePath, SOURCE_PATH.lambdaPerAction),
+    //   externalService: join(saveFilePath, SOURCE_PATH.externalService),
+    //   relationshipPerAction: join(saveFilePath, SOURCE_PATH.relationshipPerAction),
+    //   webSocketEndpoint: join(saveFilePath, SOURCE_PATH.webSocket),
+    //   generateCodeLib: join(saveFilePath, SOURCE_PATH.generateCodeLib),
+    //   generatedMainFunctionPerService: join(saveFilePath, SOURCE_PATH.endpointPerService),
+    //   flowSchema: join(saveFilePath,'../src/generatedCode/flowSchema')
+    // };
 
     //------ Start Create Source ------
 
@@ -108,18 +109,15 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       if (status === false) {
         throw Error(errors)
       }
-    }
 
-    // validate path before empty folder
-    for (let folderPathToEmpty of Object.values(GENERATE_CODE_SOURCE_PATH)) {
-      validatePathWithRootServicePath(localServicePath, folderPathToEmpty)
-    }
+      // console.log("templatePath in generateCode", setting.savePath)
+      // empty file by savePath
+      // validate path before empty folder
+      validatePathWithRootServicePath(localServicePath, setting.savePath)
 
-    for (let folderPathToEmpty of Object.values(GENERATE_CODE_SOURCE_PATH)) {
-      await deleteFileInDir(folderPathToEmpty);
+      await deleteFileInDir(setting.savePath);
     }
 
-
     // generate all source
     for (let item of allCreateSource) {
       // throw error if item is invalid

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

@@ -205,9 +205,6 @@ module.exports.createMain = async (
             }
           })
         );
-        if (serviceTag.includes(GRAPH_HANDLER_SERVICE_NAME.graphHandler)) {
-          filteredRequiredOnCreatedLinks.push(requiredLink);
-        }
       })
     )
     _izContext.logger.debug("filteredRequiredOnCreatedLinks", filteredRequiredOnCreatedLinks);
@@ -530,7 +527,7 @@ module.exports.createMain = async (
 
           let messageToCreateObject = {
             Message: JSON.stringify(messageObject),
-            TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GRAPH_HANDLER.inCreateNode, graphServiceName)
+            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inCreateNode, graphServiceName)
           };
           _izContext.logger.debug("RequestParams before send to sqs messageToCreateObject ::::::: ", messageToCreateObject);
           await sns.publishAsync(_izContext, messageToCreateObject);
@@ -621,4 +618,4 @@ module.exports.createMain = async (
   } catch (err) {
     throw (err)
   }
-}
+}

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

@@ -159,7 +159,7 @@ module.exports.deleteMain = async (
         let deleteNodeMessageBody = {
           Message: JSON.stringify(deleteNodeParams),
           MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-          TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GRAPH_HANDLER.inDeleteNode, storageTag)
+          TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inDeleteNode, storageTag)
         }
 
         _izContext.logger.debug("request message params before send to IndeleteNode::", deleteNodeMessageBody);

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

@@ -249,7 +249,7 @@ module.exports.updateMain = async (
             let updateNodeMessageBody = {
               Message: JSON.stringify(updateNodeParams),
               MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-              TopicArn: await snsSharedLib.snsTopicArn(_izContext, TOPIC_NAME_GRAPH_HANDLER.inUpdateNode, storageTag,)
+              TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inUpdateNode, storageTag,)
             }
 
             _izContext.logger.debug('requset param before send to topic InUpdateNode:::', updateNodeMessageBody);

package/src/reStructure/TemplateData/EndpointPerService/yaml/data.js

@@ -66,7 +66,7 @@ async function data(_izContext, allObjSchemas, srcPath) {
 }
 
 async function createParamForCreateSource(_izContext, allObjSchemas, action, handler, srcPath) {
-  let groupBy = SOURCE_GENERATE_IAM_ROLE.perActionEndpoint;
+  let groupBy = SOURCE_GENERATE_IAM_ROLE.PerActionEndpoint;
   let additionalResourcePermission = defaultIamRolePerAction();
   let functionNameConfig = upperCase(action) + upperCase(shortNameHandler(handler))
 

package/src/reStructure/TemplateData/externalService/functionNameConfig/data.js

@@ -21,7 +21,7 @@ const path = require('path');
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/index.js").utils;
 const templateYamlPath = path.join(__dirname, "./templateYaml.ejs");
 const templatePathIntTestPath = path.join(__dirname, "./templateIntTesting.ejs");
-const { SOURCE_PATH, SOURCE_GENERATE_IAM_ROLE } = require("../../../../MainLibs/index.js").consts;
+const { SOURCE_PATH, SOURCE_GENERATE_IAM_ROLE } = require("../../../../MainLibs/src/Consts.js");
 
 
 function data(_izContext, createSourceParams, srcPath) {
@@ -50,13 +50,23 @@ function data(_izContext, createSourceParams, srcPath) {
   const roleNameConcatConfigs = new Set();
 
   // Add default IAM roles from configuration
-  Object.entries(SOURCE_GENERATE_IAM_ROLE)
-    .filter(([_, enabled]) => enabled)
-    .forEach(([_, value]) => {
-      if (value === SOURCE_GENERATE_IAM_ROLE.NodeCompleteRole) return;
-      roleNameConfigs.add(`${upperCase(value)}Role`);
-      roleNameConcatConfigs.add(`${upperCase(value)}`);
-    });
+  // Object.entries(SOURCE_GENERATE_IAM_ROLE)
+  //   .filter(([_, enabled]) => enabled)
+  //   .forEach(([_, value]) => {
+  //     if (value === SOURCE_GENERATE_IAM_ROLE.NodeCompleteRole) return;
+  //     roleNameConfigs.add(`${upperCase(value)}Role`);
+  //     roleNameConcatConfigs.add(`${upperCase(value)}`);
+  //   });
+  for (const data of createSourceParams) {
+    let roleName = data.templateData?.roleName
+    if (roleName) {
+      if (roleName === SOURCE_GENERATE_IAM_ROLE.NodeCompleteRole) {
+        return
+      }
+      roleNameConfigs.add(`${upperCase(roleName)}Role`);
+      roleNameConcatConfigs.add(`${upperCase(roleName)}`);
+    }
+  }
 
   // Extract role names from templateData in createSourceParams
   createSourceParams.forEach(({ templateData }) => {

package/src/reStructure/TemplateData/externalService/lambdaRole/data.js

@@ -115,7 +115,7 @@ async function externalLambdaIamRoleDataPerAction(_izContext, allObjSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         storageResourceAllLocalObjectSchemas.resourceGraphServiceTag.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InUpdateNode", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "UpdateNode_In", graphServiceName)
         )
       ),
       createIamRole(
@@ -123,7 +123,7 @@ async function externalLambdaIamRoleDataPerAction(_izContext, allObjSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         storageResourceAllLocalObjectSchemas.resourceGraphServiceTag.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InCreateNodeV2", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "CreateNode_In", graphServiceName)
         )
       )
     )
@@ -151,7 +151,7 @@ async function externalLamdaIamRoleRelationships(_izContext, allRelSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InUpdateRelationship", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "UpdateRelationship_In", graphServiceName)
         )
       ),
       createIamRole(
@@ -159,7 +159,7 @@ async function externalLamdaIamRoleRelationships(_izContext, allRelSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InCreateRelationshipV2", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "CreateRelationship_In", graphServiceName)
         )
       ),
       createIamRole(
@@ -167,7 +167,7 @@ async function externalLamdaIamRoleRelationships(_izContext, allRelSchemas) {
           [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
         },
         graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.sns, "InDeleteRelationshipV2", graphServiceName)
+          externalResourceName(RESOURCE_CLASSES.sns, "DeleteRelationship_In", graphServiceName)
         )
       ),
       createIamRole(

package/src/reStructure/TemplateData/externalService/snsTopicSubscriptions/data.js

@@ -75,6 +75,10 @@ const createExternalSnsSubscriptions = async (_izContext, allObjSchemas, allRelS
           const snsServiceConfigForConfirmReserved = await snsSubscriptionConfirmReserved(_izContext);
           snsServiceConfigForConfirmReserved && snsServiceConfigArray.push(snsServiceConfigForConfirmReserved);
         }
+        if (event.includes("extTopic")) {
+          const snsServiceConfigForExtTopic = await snsSubscriptionFlowSchemaExternalTopic(_izContext, localFlowSchema);
+          snsServiceConfigForExtTopic && snsServiceConfigArray.push(snsServiceConfigForExtTopic);
+        }
       }
     }
   }
@@ -95,10 +99,10 @@ const createExternalSnsSubscriptions = async (_izContext, allObjSchemas, allRelS
 
 // update Relationship
 async function snsSubScriptionUpdateRelationshipComplete(_izContext, allRelSchemas) {
-  let serviceNames = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
+  let serviceTag = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outUpdateRel, // external service
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.updateRelComplete // in service
   }
@@ -106,10 +110,10 @@ async function snsSubScriptionUpdateRelationshipComplete(_izContext, allRelSchem
 
 // create Relationship
 async function snsSubscriptionCreateRelationshipComplete(_izContext, allRelSchemas) {
-  let serviceNames = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
+  let serviceTag = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outCreateRel,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.createRelComplete
   }
@@ -118,20 +122,20 @@ async function snsSubscriptionCreateRelationshipComplete(_izContext, allRelSchem
 // topic not create yet will return error when initialSetup
 // create topic for OutUpdateNodeComplete
 async function snsSubscriptionOutUpdateNodeComplete(_izContext, allObjSchemas) {
-  let serviceNames = await getGraphServiceNameFromObjectSchema(_izContext, allObjSchemas)
+  let serviceTag = await getGraphServiceNameFromObjectSchema(_izContext, allObjSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outUpdateNode,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.updateNodeComplete
   }
 }
 
 async function snsSubscriptionCreateNodeComplete(_izContext, allObjectSchemas) {
-  let serviceNames = await getGraphServiceNameFromObjectSchema(_izContext, allObjectSchemas)
+  let serviceTag = await getGraphServiceNameFromObjectSchema(_izContext, allObjectSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outCreateNode,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.createNodeComplete
   }
@@ -148,19 +152,19 @@ async function snsSubscriptionDeleteNodeComplate(_izContext, allObjectSchemas) {
 }
 
 async function snsSubscriptionDeleteRelatipnshipComplete(_izContext, allRelSchemas) {
-  let serviceNames = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
+  let serviceTag = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outDeleteRel,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.deleteRelComplete
   }
 }
 
 function snsSubscriptionReservedLimitCompleteForReservedDynamicUsage(_izContext) {
-  let serviceNames = [EXTERNAL_SERVICE_NAME.accountLimits]
+  let serviceTag = [EXTERNAL_SERVICE_NAME.accountLimits]
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_EXTERNAL_SERVICE.reservedDynamicUsageComplete,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.createPresignUrl + upperCase(HANDLER.hdrSqs)
   }
@@ -168,12 +172,30 @@ function snsSubscriptionReservedLimitCompleteForReservedDynamicUsage(_izContext)
 
 
 function snsSubscriptionConfirmReserved(_izContext) {
-  let serviceNames = [EXTERNAL_SERVICE_NAME.accountLimits];
+  let serviceTag = [EXTERNAL_SERVICE_NAME.accountLimits];
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_EXTERNAL_SERVICE.reservedDynamicUsageComplete,
     sqsEndpoint: "ConfirmNewReserved" + upperCase(HANDLER.hdrSqs)
   }
 }
 
+function snsSubscriptionFlowSchemaExternalTopic(_izContext, localFlowSchema) {
+  const flowSteps = Object.keys(localFlowSchema.flowSteps || {});
+  const lastIndex = flowSteps.length - 1;
+
+  if (lastIndex >= 0) {
+    const flowStep = flowSteps[lastIndex];
+    const splitFlowStepKey = flowStep.split("_");
+
+    return {
+      serviceTag: [splitFlowStepKey[0]],
+      topicName: splitFlowStepKey[2],
+      sqsEndpoint: splitFlowStepKey[3]
+    };
+  }
+
+  return null;
+}
+
 module.exports = createExternalSnsSubscriptions;

package/src/reStructure/TemplateData/externalService/snsTopicSubscriptions/template.ejs

@@ -18,9 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 module.exports.generatedSnsTopicSubscription = [ <% datas.forEach(data => { -%>
-<% data.serviceNames.forEach(serviceName => { _%>
+<% data.serviceTag.forEach(serviceTag => { _%>
   {
-    serviceName: "<%- serviceName %>",
+    serviceTag: "<%- serviceTag %>",
     topicName: "<%- data.topicName %>",
     sqsEndpoint: "<%- data.sqsEndpoint %>"
   },

package/src/reStructure/TemplateData/flowSchema/components/upload/confirmReserved/mainFunction/template.ejs

@@ -21,7 +21,7 @@ const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb')
 const snsSharedLib = require('@izara_project/izara-core-library-sns')
 const sns = require('@izara_project/izara-core-library-external-request').sns
 const consts = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-const { getNestObject } = require('../../libs/source/ImportDataLib')
+const { getNestObject } = require('../../libs/source/GenerateCodeLibs')
 /**
  * description of function.
  * @param {Object} _izContext

package/src/reStructure/TemplateData/flowSchema/components/upload/createObject/functionYaml/template.ejs

@@ -3,10 +3,6 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
-    - websocket:
-        route: $connect
-    - websocket:
-        route: $disconnect
     - websocket:
         route: $default
     - websocket:

package/src/reStructure/TemplateData/flowSchema/components/upload/createObject/handler/template.ejs

@@ -26,7 +26,7 @@ const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-
 const hash = require('object-hash')
 // const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
-const { postToConnection } = require("../../libs/source/ImportDataLib");
+const { postToConnection } = require("../../libs/source/GenerateCodeLibs");
 const createObject = require('./CreateObjectS3_Main');
 module.exports.main = middleware.wrap(async (event, context, callback) => {
 

package/src/reStructure/TemplateData/flowSchema/components/upload/createObjectComplete/mainFunction/template.ejs

@@ -21,7 +21,7 @@ const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 let coreConsts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
 
-const { postToConnection } = require('../../libs/source/ImportDataLib')
+const { postToConnection } = require('../../libs/source/GenerateCodeLibs')
 module.exports.webSocketTaskComplete = async (
   _izContext,
   objType,

package/src/reStructure/TemplateData/flowSchema/components/upload/createObjectComplete/sns-sqs/data.js

@@ -55,7 +55,7 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
   defaultSnsInSqsDataList.push(
     {
       queueName: upperCase(FUNCTION_NAME.createObjectS3Complete) + upperCase(HANDLER.hdrSqs),
-      subScription: "Out" + upperCase(FUNCTION_NAME.updateNodeComplete)
+      subScription: upperCase(FUNCTION_NAME.updateNodeComplete) + "_Out"
     }
   )
 

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/createPresignUrl/mainFunction/template.ejs

@@ -32,11 +32,10 @@ const client = new S3Client({ region: 'us-east-2' });
 const { createPresignedPost } = require('@aws-sdk/s3-presigned-post');
 const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
 
-const { postToConnection } = require("../../libs/source/ImportDataLib");
+const { postToConnection,getNestObject } = require("../../libs/source/GenerateCodeLibs");
 const hash = require('object-hash');
 const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils');
 const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
-const { getNestObject } = require("../../libs/source/ImportDataLib");
 const { EXTERNAL_SERVICE_NAME } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
 /**
  * description of function.

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/reservedLimit/functionYaml/data.js

@@ -88,7 +88,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       functionName,
       handlerType,
       functionNameConfig: functionName + upperCase(handlerType),
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "/source/"),
       additionalResourcePermission,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/reservedLimit/mainFunction/template.ejs

@@ -27,7 +27,7 @@ const lambda = externalRequest.lambda
 const consts = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
 const coreConsts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
 const hash = require('object-hash');
-const importDataLibs = require('../../libs/source/ImportDataLib')
+const importDataLibs = require('../../libs/source/GenerateCodeLibs')
 /**
  * description of function.
  * @param {Object} _izContext

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/reservedLimit/sqs/template.ejs

@@ -1,31 +1,30 @@
 ##===== SNS Subscription
-##===== [Topic In]
-  Subscription<%- queueName %>:
+  SubscriptionOut<%- queueNameSubscription %>:
     Type: AWS::SNS::Subscription
     Properties:
-      TopicArn: !Ref <%- subscription %>
-      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
+      TopicArn: !Ref Out<%- queueNameSubscription %>
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueNameSubscription %>Out"
       Protocol: "sqs"
 ##===== [Queue]
-  <%- queueName %>HdrSqs:
+  <%- queueName %>:
     Type: "AWS::SQS::Queue"
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>
       RedrivePolicy:
         deadLetterTargetArn:
         # !GetAtt
           Fn::GetAtt:
-            - <%- queueName %>HdrSqsDLQ
+            - <%- queueName %>DLQ
             - Arn
         maxReceiveCount: 3
       VisibilityTimeout: 120
 ##==== [QueueDLQ]
-  <%- queueName %>HdrSqsDLQ:
+  <%- queueName %>DLQ:
     Type: AWS::SQS::Queue
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>DLQ
 ##==== [QueuePolicy]
-  <%- queueName %>HdrSqsPolicy:
+  <%- queueName %>Policy:
     Type: AWS::SQS::QueuePolicy
     Properties:
       PolicyDocument:
@@ -37,17 +36,18 @@
             Resource:
             # !GetAtt
               Fn::GetAtt:
-                - <%- queueName %>HdrSqs
+                - <%- queueName %>
                 - Arn
             Action: "SQS:SendMessage"
       Queues:
-        - Ref: <%- queueName %>HdrSqs
+        - 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)
-} _%>
+
+  <%_ 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/components/upload/processFile/mainFunction/template.ejs

@@ -33,7 +33,7 @@ const s3 = new S3Client({ region: 'us-east-2' });
 
 const hash = require('object-hash');
 const Readable = require('stream');
-const { isValidCsv, getNestObject } = require('../../libs/source/ImportDataLib')
+const { isValidCsv, getNestObject } = require('../../libs/source/GenerateCodeLibs')
 const consts = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
 const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
 

package/src/reStructure/TemplateData/flowSchema/components/upload/relate/libs/data.js

@@ -31,7 +31,7 @@ function createSourceParams(_izContext, srcPath) {
     templatePath: templatePath,
     templateData: {},
     setting: {
-      saveFileName: "ImportDataLib",
+      saveFileName: "GenerateCodeLibs",
       savePath: path.join(srcPath, SOURCE_PATH.generateCodeLib),
       fileExtension: ".js",
       isAppend: false