@izara_project/izara-market-library-service-schemas 1.0.29 → 1.0.30

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

@@ -45,16 +45,16 @@ const createWebSocketCreateObjectCompleteHandler = require('./components/upload/
 const createWebSocketCreateObjectCompleteMainFunction = require('./components/upload/createObjectComplete/mainFunction/data');
 
 // PreSign URL components
-const createGetPreSignUrlFunctionYaml = require('./components/upload/preSignUrl/getSignUrls/functionYaml/data');
-const createGetPreSignUrlHandler = require('./components/upload/preSignUrl/getSignUrls/handler/data');
-const createGetPreSignUrlMainFunction = require('./components/upload/preSignUrl/getSignUrls/mainFunction/data');
-const createGetPreSignUrlQueueName = require('./components/upload/preSignUrl/getSignUrls/sqs/data');
-
-// Reserved limit components
 const createReservedLimitFunctionYaml = require('./components/upload/preSignUrl/reservedLimit/functionYaml/data');
-const createReservedLimitHandler = require('./components/upload/preSignUrl/reservedLimit/handler/data');
+const createReservedLimitlHandler = require('./components/upload/preSignUrl/reservedLimit/handler/data');
 const createReservedLimitMainFunction = require('./components/upload/preSignUrl/reservedLimit/mainFunction/data');
-const createReservedLimitQueueName = require('./components/upload/preSignUrl/reservedLimit/queue/data');
+const createReservedLimitQueueName = require('./components/upload/preSignUrl/reservedLimit/sqs/data');
+
+// Reserved limit components
+const createPresignUrlFunctionYaml = require('./components/upload/preSignUrl/createPresignUrl/functionYaml/data');
+const createPresignUrlHandler = require('./components/upload/preSignUrl/createPresignUrl/handler/data');
+const createPresignUrlMainFunction = require('./components/upload/preSignUrl/createPresignUrl/mainFunction/data');
+const createPresignUrlQueueName = require('./components/upload/preSignUrl/createPresignUrl/queue/data');
 
 // Process uploaded file components
 const createProcessAfterUploadS3FunctionYmlS3 = require('./components/upload/processFile/functionYml/HdrS3/data');
@@ -111,15 +111,15 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       // const webSocketCreateObjectStordCache = createWebSocketCreateObjectStoredCache(_izContext, saveFilePath);
       const webSocketGenerateCodeLibs = createWebSocketGenerateCodeLibs(_izContext, saveFilePath)
 
-      const getPreSignUrlFunctionYaml = createGetPreSignUrlFunctionYaml(_izContext, saveFilePath);
-      const getPreSignUrlHandler = createGetPreSignUrlHandler(_izContext, saveFilePath);
-      const getPreSignUrlMainFunction = createGetPreSignUrlMainFunction(_izContext, saveFilePath);
-      const getPreSignUrlQueue = createGetPreSignUrlQueueName(_izContext, saveFilePath);
+      const getPreSignUrlFunctionYaml = createReservedLimitFunctionYaml(_izContext, saveFilePath);
+      const getPreSignUrlHandler = createReservedLimitlHandler(_izContext, saveFilePath);
+      const getPreSignUrlMainFunction = createReservedLimitMainFunction(_izContext, saveFilePath);
+      const getPreSignUrlQueue = createReservedLimitQueueName(_izContext, saveFilePath);
 
-      const reservedLimitCompleteFunctionYaml = createReservedLimitFunctionYaml(_izContext, saveFilePath);
-      const reservedLimitCompleteMainFunction = createReservedLimitMainFunction(_izContext, flowSchema, saveFilePath);
-      const reservedLimitCompleteHandler = createReservedLimitHandler(_izContext, saveFilePath);
-      const reservedLimitCompleteQueue = createReservedLimitQueueName(_izContext, saveFilePath);
+      const reservedLimitCompleteFunctionYaml = createPresignUrlFunctionYaml(_izContext, saveFilePath);
+      const reservedLimitCompleteMainFunction = createPresignUrlMainFunction(_izContext, flowSchema, saveFilePath);
+      const reservedLimitCompleteHandler = createPresignUrlHandler(_izContext, saveFilePath);
+      const reservedLimitCompleteQueue = createPresignUrlQueueName(_izContext, saveFilePath);
 
       const processAfterUploadFunctionYmlS3 = createProcessAfterUploadS3FunctionYmlS3(_izContext, flowSchema, saveFilePath);
       // const processAfterUploadFunctionYamlHdrDsq = createProcessAfterUploadS3FunctionYmlDsq(_izContext, saveFilePath);
@@ -175,28 +175,31 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         ...confirmReservedAfterUploadQueue
       ];
 
-      if (flowSchema.hasOwnProperty("uploadS3") && flowSchema.uploadS3 === true) {
-        // Group all resources related to S3 upload functionality
-        const webSocketUploadS3Resources = [
-          ...webSocketFunctions,
-          ...webSocketGenerateCodeLibs,
-          ...reservedDataTable
-        ];
-
-        // Add all resources to the parameters array
-        createSourceParams.push(
-          ...webSocketUploadS3Resources,
-          ...getPreSignUrlResources,
-          ...reservedLimitResources,
-          ...bucketS3,
-          ...processAfterUploadResources,
-          ...confirmAfterUploadResources
-        );
-      }
-
-      if (flowSchema.hasOwnProperty("initializeRequest") && flowSchema.hasOwnProperty("response")) {
-        const webSocketEndpointResource = []
-        createSourceParams.push(...webSocketEndpointResource)
+      for (const event of flowSchema.event) {
+        if (event.includes("s3")) {
+          // Group all resources related to S3 upload functionality
+          const webSocketUploadS3Resources = [
+            ...webSocketFunctions,
+            ...webSocketGenerateCodeLibs,
+            ...reservedDataTable
+          ];
+
+
+          // Add all resources to the parameters array
+          createSourceParams.push(
+            ...webSocketUploadS3Resources,
+            ...getPreSignUrlResources,
+            ...reservedLimitResources,
+            ...bucketS3,
+            ...processAfterUploadResources,
+            ...confirmAfterUploadResources
+          );
+        }
+
+        // if (flowSchema.hasOwnProperty("initializeRequest") && flowSchema.hasOwnProperty("response")) {
+        //   const webSocketEndpointResource = []
+        //   createSourceParams.push(...webSocketEndpointResource)
+        // }
       }
     }
 

package/src/reStructure/TemplateData/flowSchema/legacy/hookCode-old/queue/snsTemplate.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message in"
-      TopicName: ${self:custom.iz_resourcePrefix}In<%- queueName %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
 ##===== SNS Subscription
 ##===== [Topic In]
   SubscriptionIn<%- queueName %>:

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

@@ -14,7 +14,7 @@ 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/index').consts;
+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');
 
@@ -106,6 +106,10 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
       handlerType: [],
       resources: {}
     },
+    [SOURCE_GENERATE_IAM_ROLE.perActionEndpoint]: {
+      handlerType: [],
+      resources: {}
+    },
     Other: []
   };
   const objectTypeList = [];
@@ -187,6 +191,12 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
         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);
+      processResourcePermissions(
+        templateData.additionalResourcePermission,
+        groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.perActionEndpoint].resources
+      )
     }
     else {
       // Handle other items

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

@@ -113,50 +113,41 @@ module.exports.createObjectComplete = async (
     );
     _izContext.logger.debug("record awaitingSteps::", recordAwaitingSteps);
 
-    nextAwaitingAteps:
-    for (let listRecordAwaitingStep of recordAwaitingSteps.Items) {
-
-      _izContext.logger.debug("iterate RecordAwaitingStep:", listRecordAwaitingStep);
-
-
-      if (!await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
-        _izContext,
-        listRecordAwaitingStep.pendingStepId,
-        awaitingStepId
-      )) {
-        _izContext.logger.debug("!Waiting record form other graph::")
-        // **** add step of remove awaitingMultiplestep!! ??
-        continue nextAwaitingAteps
-      };
-
-      await asyncFlowSharedLib.removeAwaitingMultipleStep(
-        _izContext,
-        awaitingStepId,
-        listRecordAwaitingStep.pendingStepId,
-      );
-      _izContext.logger.debug("Remove awaitingStep finish")
-    };
-
-    // seagame: problem about lambdaComplete is will missing errorsFound from request if have 2 request
-    // one send with errorsFound and one send without errorsFound
-    // this scenario can complete with or without errorsFound
-    let messageObject = {
-      objType: returnValue.objType,
-      objInstanceFull: returnValue.objInstanceFull,
-      errorsFound: errorsFound
-    };
-
-    messageObject = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, messageObject)
-    let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {})
-
-    let sendMessageOutCreateObjectComplete = {
-      Message: JSON.stringify(messageObject),
-      MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, "OutCreateObjectComplete")
-    };
-    _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
-    await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
-
+    await Promise.all(
+      recordAwaitingSteps.Items.map(async ({ pendingStepId }) => {
+        if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
+          _izContext,
+          pendingStepId,
+          awaitingStepId
+        )) {
+          _izContext.logger.debug("finish all awaitingStep");
+
+          let messageObject = {
+            objType: {
+              objectType: returnValue.objType.objectType,
+              serviceTag: returnValue.objType.serviceTag
+            },
+            objInstanceFull: {
+              identifiers: returnValue.objInstanceFull.identifiers,
+              fields: returnValue.objInstanceFull.fields
+            },
+            status: status,
+            errorsFound: errorsFound
+          }
+
+          messageObject = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, messageObject)
+          let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {})
+
+          let sendMessageOutCreateObjectComplete = {
+            Message: JSON.stringify(messageObject),
+            MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
+            TopicArn: await snsSharedLib.snsTopicArn(_izContext, "OutCreateObjectComplete")
+          };
+          _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
+          await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
+        }
+      })
+    )
     return {
       returnValue: returnValue,
       status: status,

package/src/reStructure/TemplateData/perActionComplete/create/sns-out/template.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_resourcePrefix}Out<%- firstLetterUpperCase(queueName) %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- firstLetterUpperCase(queueName) %>_Out
 
   <%_ function firstLetterUpperCase(text) {
     return text.charAt(0).toUpperCase() + text.slice(1)

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

@@ -45,7 +45,7 @@ const { getGraphServiceNameFromGraphServerTagWithCache, getServiceNameWithCache
 const {
   firstLetterLowerCase: lowerCase,
   firstLetterUpperCase: upperCase
-} = require("../../../../../MainLibs/index.js").utils;
+} = require("../../../../../MainLibs/src/Utils.js");
 const {
   DEFAULT_HANDLER_PER_ACTION,
   createIamRole,
@@ -65,7 +65,7 @@ const {
   awaitingMultipleStepsRole,
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE
-} = require("../../../../../MainLibs/index.js").consts;
+} = require("../../../../../MainLibs/src/Consts.js");
 
 const templatePath = path.join(__dirname, './template.ejs');
 
@@ -98,8 +98,8 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName)),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ]
     )
   )
@@ -123,7 +123,6 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       fileExtension: '.yml',
       isAppend: true
     }
-
   }
 }
 

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

@@ -43,7 +43,7 @@ const { getGraphServiceNameFromGraphServerTagWithCache, getServiceNameWithCache
 const {
   firstLetterLowerCase: lowerCase,
   firstLetterUpperCase: upperCase
-} = require("../../../../../MainLibs/index.js").utils;
+} = require("../../../../../MainLibs/src/Utils.js");
 const {
   DEFAULT_HANDLER_PER_ACTION,
   createIamRole,
@@ -60,9 +60,10 @@ const {
   SQS_RESOURCE,
   SNS_RESOURCE,
   DYNAMO_RESOURCE,
+  awaitingMultipleStepsRole,
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE
-} = require("../../../../../MainLibs/index.js").consts;
+} = require("../../../../../MainLibs/src/Consts.js");
 
 const templatePath = path.join(__dirname, './template.ejs');
 
@@ -95,8 +96,8 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName)),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ]
     )
   )

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

@@ -107,14 +107,27 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       }
     }));
 
+    // process get action
+    const getComponent = await Promise.all([
+      actions.get.snsOut
+    ].map(async component => {
+      try {
+        return await component(_izContext, saveFilePath);
+      } catch (err) {
+        console.error(`Error processing get component: ${err.message}`)
+        return []
+      }
+    }))
+
     // Combine all components
     createSourceParams = [
       ...updateComponents.flat(),
       ...createComponents.flat(),
-      ...deleteComponents.flat()
+      ...deleteComponents.flat(),
+      ...getComponent.flat()
     ];
 
-    // console.log('createSourceParams:', createSourceParams);
+    // console.log('createSourceParams:', JSON.stringify(createSourceParams, null, 2));
 
     return createSourceParams;
   } catch (error) {

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

@@ -20,7 +20,10 @@ const path = require('path');
 
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 const { getGraphServiceNameFromGraphServerTagWithCache, getServiceNameWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../#utils");
+const {
+  firstLetterLowerCase: lowerCase,
+  firstLetterUpperCase: upperCase
+} = require("../../../../../MainLibs/src/Utils.js");
 const {
   DEFAULT_HANDLER_PER_ACTION,
   createIamRole,
@@ -40,7 +43,7 @@ const {
   awaitingMultipleStepsRole,
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE
-} = require("../#const");
+} = require("../../../../../MainLibs/src/Consts.js");
 
 const templatePath = path.join(__dirname, './template.ejs');
 
@@ -73,8 +76,8 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName)),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/perActionComplete/update/sns-out/data.js

@@ -32,7 +32,7 @@ const {
   SOURCE_PATH,
   SAVE_FILE_NAME,
   FUNCTION_NAME
-} = require("../../../../../MainLibs/index.js").consts;
+} = require("../../../../../MainLibs/src/Consts.js");
 
 
 const templatePath = path.join(__dirname, "../../../resourceYaml/sns-out/template.ejs")

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

@@ -46,7 +46,7 @@ const { getGraphServiceNameFromGraphServerTagWithCache, getServiceNameWithCache
 const {
   firstLetterLowerCase: lowerCase,
   firstLetterUpperCase: upperCase
-} = require("../../../../../MainLibs/index.js").utils;
+} = require("../../../../../MainLibs/src/Utils.js");
 const {
   DEFAULT_HANDLER_PER_ACTION,
   createIamRole,
@@ -66,7 +66,7 @@ const {
   awaitingMultipleStepsRole,
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE
-} = require("../../../../../MainLibs/index.js").consts;
+} = require("../../../../../MainLibs/src/Consts.js");
 
 
 const templatePath = path.join(__dirname, './template.ejs');
@@ -100,12 +100,13 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName)),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ]
     )
   )
 
+  // console.log("additionalResourcePermission in update", JSON.stringify(additionalResourcePermission, null, 2))
   additionalResourcePermission.push(awaitingMultipleStepsRole())
 
 

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

@@ -100,9 +100,9 @@ async function data(_izContext, objectSchemas, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "InProcessLogical"),
-        resourceNames(RESOURCE_CLASSES.sns, "InPaginateProcessLogical"),
-        resourceNames(RESOURCE_CLASSES.sns, "OutProcessLogicalComplete")
+        resourceNames(RESOURCE_CLASSES.sns, "ProcessLogical_In"),
+        resourceNames(RESOURCE_CLASSES.sns, "PaginateProcessLogical_In"),
+        resourceNames(RESOURCE_CLASSES.sns, "ProcessLogicalComplete_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/processLogicalPagination/yaml/dsq/data.js

@@ -98,7 +98,7 @@ async function data(_izContext, objectSchemas, srcPath) {
         [RESOURCE_CLASSES.sns]: ["Publish"]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "OutProcessLogicalComplete")
+        resourceNames(RESOURCE_CLASSES.sns, "ProcessLogicalComplete_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/processLogicalPagination/yaml/sqs/data.js

@@ -100,8 +100,8 @@ async function data(_izContext, objectSchemas, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "InProcessLogical"),
-        resourceNames(RESOURCE_CLASSES.sns, "OutProcessLogicalComplete")
+        resourceNames(RESOURCE_CLASSES.sns, "ProcessLogical_In"),
+        resourceNames(RESOURCE_CLASSES.sns, "ProcessLogicalComplete_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/api/data.js

@@ -73,7 +73,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.createRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/dsq/data.js

@@ -85,7 +85,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.createRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/inv/data.js

@@ -72,7 +72,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
       [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
     },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.createRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/relationshipPerAction/create/action/functionYaml/sqs/data.js

@@ -84,9 +84,9 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrSqs)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrSqs) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName) + upperCase(HANDLER.hdrSqs)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName) + upperCase(HANDLER.hdrSqs)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.createRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out")
       ]
     ),
   )

package/src/reStructure/TemplateData/relationshipPerAction/create/action/sns-in-sqs/snsTemplate.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message in"
-      TopicName: ${self:custom.iz_resourcePrefix}In<%- queueName %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
 ##===== SNS Subscription
 ##===== [Topic In]
   SubscriptionIn<%- queueName %>:

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/functionYaml/data.js

@@ -80,8 +80,8 @@ function createParamForCreateSource(srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ],
     ))
   additionalResourcePermission.push(awaitingMultipleStepsRole())

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/mainFunction/data.js

@@ -21,7 +21,7 @@ const path = require('path');
 const { ACTIONS, HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, firstLetterUpperCase } = require("../../../../../../MainLibs/index.js").utils;
-const { SOURCE_PATH, FUNCTION_NAME } = require("../../../../../../MainLibs/index.js").consts;
+const { SOURCE_PATH, FUNCTION_NAME } = require("../../../../../../MainLibs/src/Consts.js");
 
 const templatePath = path.join(__dirname, "./template.ejs")
 

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/sns-in-sqs/template.ejs

@@ -44,4 +44,3 @@
   <%_ function firstLetterLowerCase(str) {
     return str.charAt(0).toLowerCase() + str.slice(1)
   } _%>
-

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/sns-out/template.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_resourcePrefix}Out<%- firstLetterUpperCase(queueName) %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- firstLetterUpperCase(queueName) %>_Out
 
   <%_ function firstLetterUpperCase(text) {
     return text.charAt(0).toUpperCase() + text.slice(1)

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/api/data.js

@@ -73,7 +73,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.deleteRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/dsq/data.js

@@ -85,7 +85,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrDsq) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.deleteRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/inv/data.js

@@ -72,7 +72,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
       [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
     },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.deleteRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out")
       ]
     )
   )

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/sqs/data.js

@@ -84,9 +84,9 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrSqs)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + upperCase(HANDLER.hdrSqs) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName) + upperCase(HANDLER.hdrSqs)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName) + upperCase(HANDLER.hdrSqs)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(FUNCTION_NAME.deleteRelComplete))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out")
       ]
     ),
   )

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/sns-in-sqs/snsTemplate.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message in"
-      TopicName: ${self:custom.iz_resourcePrefix}In<%- queueName %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
 ##===== SNS Subscription
 ##===== [Topic In]
   SubscriptionIn<%- queueName %>:

package/src/reStructure/TemplateData/relationshipPerAction/delete/complete/functionYaml/data.js

@@ -80,8 +80,8 @@ function createParamForCreateSource(srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName))
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ],
     ))
   additionalResourcePermission.push(awaitingMultipleStepsRole())

package/src/reStructure/TemplateData/relationshipPerAction/delete/complete/sns-out/template.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_resourcePrefix}Out<%- firstLetterUpperCase(queueName) %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- firstLetterUpperCase(queueName) %>_Out
 
   <%_ function firstLetterUpperCase(text) {
     return text.charAt(0).toUpperCase() + text.slice(1)