@izara_project/izara-market-library-service-schemas 1.0.19 → 1.0.21

package/src/TemplateManager/src/flowSchema/UploadS3Case/hookCode(old)/handler/templateAsyncHandler.ejs

@@ -0,0 +1,110 @@
+/*
+Copyright (C) 2021 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 AWS = require('aws-sdk');
+// const sqs = new AWS.SQS(firstLetterUpperCase{ apiVersion: '2012-11-05' });
+
+const izara = require("@izara_project/izara-middleware");
+const middleware = izara.middlewareHandler;
+const recordHandlerSharedLib = require("@izara_project/izara-shared").recordHandlerSharedLib;
+const Logger = require('@izara_project/izara-core-library-logger');
+const izaraShared = require('@izara_project/izara-shared');
+const callingFlowSharedLib = izaraShared.callingFlowSharedLib;
+
+const <%- hookFunctionName %> = require('./<%- hookFunctionName %>_Main')
+
+// validate event properties in body.Message of sqs event
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+
+// set schema for record.body.Message
+let perRecordsValidatorSchema = {
+  type: "object",
+  required: [
+    'returnMessage',
+    'errorsFound',
+    'passStatus'
+  ],
+  properties: {
+    returnMessage: {
+      type: "object"
+    },
+    errorsFound: {
+      type: "array"
+    },
+    passStatus: {
+      type: 'boolean'
+    }
+  }
+};
+
+perRecordsValidatorSchema = callingFlowSharedLib.addOptionalPassBackPropertiesToValidatorSchema(perRecordsValidatorSchema)
+
+module.exports.main = middleware.wrap(async (event, context, callback) => {
+
+  try {
+
+    let recordPromises = [];
+
+    // loop each record and send to mainFunction
+    await Promise.all(event.Records.map(async record => { // promise.all for map() function
+
+      let passOnProperties = []
+      record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+      // validate message (and MessageAttributes)
+      await recordHandlerSharedLib.validateRecord(
+        record, // one record will send to mainFunction
+        "<%- queueName %>", // queue name that need to retry or send to dlq
+        perRecordsValidatorSchema, // schema for record.Message
+        // messageAttributeValidatorSchema  // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
+      );
+
+      // add argument (to invoke lambda) to passOnProperties[]
+      passOnProperties.push(record.body.Message)
+      passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message))
+      record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
+
+      // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
+      let recordPromise = recordHandlerSharedLib.recordHandler(
+        record, // one record will send to mainFunction
+        <%- hookFunctionName %>, // mainFunction that need to invoke.
+        "<%- queueName %>", // queue name that need to retry or send to dlq
+        passOnProperties, // all parameters that mainFunction needed.
+      );
+      record._izContext.logger.debug('after recordPromise in handler');
+      recordPromises.push(recordPromise); // push promise to recordPromises
+    }))
+
+    Logger.debug('before Promise.all(recordPromises) in handler');
+    try {
+      // --- main await all promises
+      await Promise.all(recordPromises); // await all promises
+
+      return event.Records // return all for local test
+
+    } catch {
+      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
+    }
+    Logger.debug('after Promise.all(recordPromises) in handler');
+
+  } catch (err) {
+    Logger.error('Unhandled Error, <%- hookFunctionName %>: ', err);
+    throw (err);
+  }
+});

package/src/TemplateManager/src/flowSchema/UploadS3Case/hookCode(old)/handler/templateSyncHandler.ejs

@@ -0,0 +1,49 @@
+/*
+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 izara = require("@izara_project/izara-middleware");
+const middleware = izara.middlewareHandler;
+
+// const CorrelationIds = require('@izara_project/izara-core-library-correlation-ids')
+// const Logger = require('@izara_project/izara-core-library-logger');
+// const IntegrationTestDetail = require('@izara_project/izara-core-library-integration-tests')
+
+const <%- hookFunctionName %> = require('./<%- hookFunctionName %>_Main');
+
+// validate event params in middlewware before into function.
+const validatorSchema = {};
+middleware.setValidatorSchema(validatorSchema);
+
+module.exports.main = middleware.wrap(async (event, context, callback) => {
+  event._izContext.logger.debug('Event:', event);
+  event._izContext.logger.debug('context:', context);
+
+  try {
+
+    // invoke LambdaFunction
+    return await <%- hookFunctionName %>(
+      event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
+      event
+    );
+
+  } catch (err) {
+    event._izContext.logger.error('Error, <%- hookFunctionName %>: ', err);
+    throw (err);
+  }
+});

package/src/TemplateManager/src/flowSchema/UploadS3Case/hookCode(old)/hookLogic/data.js

@@ -0,0 +1,65 @@
+/*
+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 fs = require('fs');
+const { HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { createHookFunction } = require('../../../../../../SourceManager/src/Utils')
+const { FLOW_SCHEMA_HOOK_STATE } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
+const { SOURCE_PATH, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, SNS_RESOURCE, resourceNames, DYNAMO_RESOURCE, SAVE_FILE_NAME, FUNCTION_NAME, shortNameHandler, SQS_RESOURCE } = require("../../../../libs/Consts");
+const asyncTemplatePath = path.join(__dirname, "templateAsyncHandler.ejs")
+const syncTemplatePath = path.join(__dirname, "templateSyncHandler.ejs")
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+async function data(_izContext, flowSchema, srcPath) {
+  return [await createSourceParams(_izContext, flowSchema, srcPath)]
+}
+
+async function createSourceParams(_izContext, flowSchema, srcPath) {
+  if (flowSchema?.hook) {
+    await Promise.all(
+      Object.values(flowSchema.hook).map(hookProperties =>
+        Promise.all(
+          hookProperties.functionList.map(hookFunction =>
+            createHookFunction(
+              _izContext,
+              hookFunction.logicFunction,
+              {
+                fileExtension: ".js",
+                isAppend: false,
+                saveFileName: `${hookFunction.name}`,
+                destinationPath: path.join(srcPath, SOURCE_PATH.logicalFunctionHook),
+              }
+            )
+          )
+        )
+      )
+    );
+  }
+}
+
+
+
+module.exports = data

package/src/TemplateManager/src/flowSchema/UploadS3Case/hookCode(old)/mainFunction/data.js

@@ -0,0 +1,67 @@
+/*
+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 fs = require('fs');
+const { createHookFunction } = require('../../../../../../GenerateCodeLibs/src/GenerateCodeLibs')
+const { FLOW_SCHEMA_HOOK_STATE } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
+const { SOURCE_PATH, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, SNS_RESOURCE, resourceNames, DYNAMO_RESOURCE, SAVE_FILE_NAME, FUNCTION_NAME, shortNameHandler } = require("../../../../libs/Consts");
+const templatePath = path.join(__dirname, "template.ejs")
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
+}
+
+function createSourceParams(_izContext, flowSchema, srcPath) {
+  let hook;
+  let hookFunctionName;
+  if (flowSchema?.hook) {
+    for (const [hookName, hookProperties] of Object.entries(flowSchema.hook)) {
+      for (const hookFunction of hookProperties.functionList) {
+        if (hookName === FLOW_SCHEMA_HOOK_STATE.beforeCreate) {
+          if (hookFunction.event.continueFlow === true) {
+            hook = true
+            hookFunctionName = hookFunction.name
+          }
+        }
+      }
+    }
+  }
+  return {
+    templatePath: templatePath,
+    templateData: {
+      hookFunctionName
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.generatedCodeHookFunction),
+      saveFileName: `${upperCase(hookFunctionName)}_Main`,
+      fileExtension: ".js",
+      isAppend: false
+    }
+  }
+}
+
+module.exports = data;

package/src/TemplateManager/src/flowSchema/UploadS3Case/hookCode(old)/mainFunction/template.ejs

@@ -0,0 +1,30 @@
+/*
+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 <%- hookFunctionName %> = require("../../HookLogicFunction/source/<%- upperCase(hookFunctionName) %>");
+const createObjectMain = require("../../../CreateObjectS3_Main")
+
+module.exports.main = async (event, callingFlow) => {
+  const result = await <%- hookFunctionName %>(event);
+  await createObjectMain(...result, callingFlow);
+}
+
+<%_ function upperCase(string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+} _%>

package/src/TemplateManager/src/flowSchema/UploadS3Case/hookCode(old)/queue/data.js

@@ -0,0 +1,125 @@
+/*
+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 fs = require('fs');
+const { HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
+const { SOURCE_PATH, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, SNS_RESOURCE, resourceNames, DYNAMO_RESOURCE, SAVE_FILE_NAME, FUNCTION_NAME, shortNameHandler, SQS_RESOURCE } = require("../../../../libs/Consts");
+const snsTemplatePath = path.join(__dirname, "./snsTemplate.ejs");
+const sqsTemplatePath = path.join(__dirname, "./sqsTemplate.ejs");
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+function createSourceParams(_izContext, flowSchema, srcPath) {
+  let queueNames = [];
+  let resultForCreateQueueHook = []
+  const settings = {
+    saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
+    savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+    fileExtension: ".yml",
+    isAppend: true
+  }
+  if (flowSchema?.hook) {
+    for (const hookProperties of Object.values(flowSchema.hook)) {
+      for (const hookFunction of hookProperties.functionList) {
+        if (hookFunction.event.continueFlow === true) {
+          if (hookFunction.event.handlerType === HANDLER.hdrSqs) {
+            queueNames.push(
+              {
+                queueName: "In" + createResourceSqsAndSns(
+                  hookFunction.event.handlerType,
+                  upperCase(hookProperties.name)
+                )
+              }
+            )
+          } else if (hookFunction.event.handlerType === HANDLER.hdrDsq) {
+            queueNames.push(
+              {
+                queueName: createResourceSqsAndSns(
+                  hookFunction.event.handlerType,
+                  upperCase(hookFunction.name)
+                )
+              }
+            )
+          }
+          if (hookFunction.event.createNewTopic === true) {
+            if (hookFunction.event.handlerType === HANDLER.hdrSqs) {
+              queueNames.push(
+                {
+                  queueName: createResourceSqsAndSns(
+                    hookFunction.event.handlerType,
+                    upperCase(hookFunction.event.topicName)
+                  )
+                }
+              )
+            } else if (hookFunction.event.handlerType === HANDLER.hdrDsq) {
+              queueNames.push(
+                {
+                  queueName: createResourceSqsAndSns(
+                    hookFunction.event.handlerType,
+                    upperCase(hookFunction.event.queueName)
+
+                  )
+                }
+              )
+            }
+          }
+        }
+      }
+    }
+  }
+
+
+  for (const queueName of queueNames) {
+    if (queueName.queueName.includes(upperCase(HANDLER.hdrDsq))) {
+      resultForCreateQueueHook.push({
+        templatePath: sqsTemplatePath,
+        templateData: queueName.queueName,
+        setting: settings
+      })
+    } else {
+      resultForCreateQueueHook.push({
+        templatePath: snsTemplatePath,
+        templateData: queueName,
+        setting: settings
+      })
+    }
+  }
+  console.log("resultForCreateQueueHook: ", resultForCreateQueueHook);
+  return resultForCreateQueueHook;
+}
+
+function createResourceSqsAndSns(handlerType, resourceName) {
+  let queueName
+  if (handlerType === HANDLER.hdrDsq) {
+    queueName = upperCase(resourceName) + handlerType
+  } else if (handlerType === HANDLER.hdrSqs) {
+    if (resourceName.includes("In")) {
+      resourceName.slice(2)
+    }
+    queueName = resourceName
+  }
+  return queueName
+}
+module.exports = createSourceParams;

package/src/TemplateManager/src/flowSchema/UploadS3Case/hookCode(old)/queue/snsTemplate.ejs

@@ -0,0 +1,59 @@
+##===== [Create topic in]
+  In<%- queueName %>:
+    Type: AWS::SNS::Topic
+    Properties:
+      DisplayName: "SNS Message in"
+      TopicName: ${self:custom.iz_resourcePrefix}In<%- queueName %>
+##===== SNS Subscription
+##===== [Topic In]
+  SubscriptionIn<%- queueName %>:
+    Type: AWS::SNS::Subscription
+    Properties:
+      TopicArn: !Ref In<%- queueName %>
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
+      Protocol: "sqs"
+##===== [Queue]
+  <%- queueName %>HdrSqs:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
+      RedrivePolicy:
+        deadLetterTargetArn:
+        # !GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>HdrSqsDLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+##==== [QueueDLQ]
+  <%- queueName %>HdrSqsDLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
+##==== [QueuePolicy]
+  <%- queueName %>HdrSqsPolicy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource:
+            # !GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>HdrSqs
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>HdrSqs
+  #<#<%- 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/TemplateManager/src/flowSchema/UploadS3Case/hookCode(old)/queue/sqsTemplate.ejs

@@ -0,0 +1,43 @@
+#------- 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/TemplateManager/src/libs/Consts.js

@@ -23,6 +23,8 @@ const {
   STORAGE_TYPES
 } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
+const { firstLetterUpperCase: upperCase } = require("../../../MainLibs/src/Utils")
+
 const { getGraphServiceNameFromGraphServerTagWithCache, getGraphServiceTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig');
 
 const DEFAULT_HANDLER_PER_ACTION = {
@@ -37,7 +39,7 @@ const RESOURCE_CLASSES = {
   s3: 's3',
   dynamoDbTable: 'dynamodb',
   dynamoDbAcrossService: 'dynamodb',
-  sns: "SNS",
+  sns: "sns",
   lambda: "lambda",
   webSocket: "webSocket"
 };
@@ -72,7 +74,7 @@ function createIamRole(action, resource = [], effect = "Allow") {
     action.forEach(act => {
       if (act.includes(":")) {
         const [serviceAction, resourceAction] = act.split(":")
-        actionObj[serviceAction] = [resourceAction]
+        actionObj[serviceAction] = [upperCase(resourceAction)]
       }
     });
     action = actionObj
@@ -113,10 +115,13 @@ const SOURCE_PATH = {
   resourceLocationRelationshipPerAction: 'src/generatedCode/RelationshipPerAction/source/',
   resourceLocationTranslateId: 'src/generatedCode/TranslateId/source/',
   resourceLocationProcessLogical: "src/generatedCode/ProcessLogical/source/",
-  webSocket: "../src/generatedCode/WebSocket/source/",
-  resourceLocationWebSocket: "src/generatedCode/WebSocket/source/",
+  webSocket: "../src/generatedCode/FlowSchema/source/",
+  resourceLocationWebSocket: "src/generatedCode/FlowSchema/source/",
   generateCodeLib: "../src/generatedCode/libs/source/",
-  webSocketHook: "../src/generatedCode/WebSocket/source/hookFunction/source/"
+  logicalFunctionHook: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source/",
+  resourceLocationLogicalFunctionHook: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source",
+  generatedCodeHookFunction: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookFunctionGeneratedCode/source/",
+  resourceLocationGeneratedCodeHookFunction: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookFunctionGeneratedCode/source/",
 };
 
 
@@ -178,13 +183,26 @@ function externalResourceName(resourceClass, resourceName, serviceTag) {
   return {
     [RESOURCE_CLASSES.dynamoDbTable]: "arn:aws:dynamodb:${process.env.iz_region}:${process.env.iz_accountId}:table/${await dynamoSharedLib.tableName(_izContext, " + `"${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/*" + `${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}")}`
+
   }[resourceClass]
 };
 
-function externalResourceSns(resourceName, serviceTag) {
-  return "arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${await snsSharedLib.snsTopicName(_izContext, " + `"${resourceName}", "${serviceTag}")}`
+function externalResourceYaml(resourceClass, resourceName, serviceTag) {
+  if (!serviceTag) {
+    serviceTag = "${self:custom.iz_resourcePrefix}"
+  } else {
+    serviceTag = serviceTag + "Test"
+  }
+  return {
+    [RESOURCE_CLASSES.dynamoDbTable]: "arn:aws:dynamodb:${self:custom.iz_region}:${self:custom.iz_accountId}:table/" + `${serviceTag}` + `${resourceName}`,
+    [RESOURCE_CLASSES.lambda]: "arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:" + `${serviceTag}` + `${resourceName}`,
+    [RESOURCE_CLASSES.sns]: "arn:aws:sns:${self:custom.iz_region}:${self:custom.iz_accountId}:" + `${serviceTag}` + `${resourceName}`,
+    [RESOURCE_CLASSES.sqs]: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:" + `${serviceTag}` + `${resourceName}`
+
+  }[resourceClass]
 };
 
 const SAVE_FILE_NAME = {
@@ -199,7 +217,8 @@ const SAVE_FILE_NAME = {
   findData: "findData",
   processLogicalYaml: "processLogical",
   flowSchema: "flowSchema",
-  S3Bucket: "generated-s3-bucket"
+  S3Bucket: "generated-s3-bucket",
+  sharedResourceYaml: "generate-SharedResource",
 };
 
 const FUNCTION_NAME = {
@@ -275,7 +294,6 @@ function defaultIamRolePerAction() {
       },
       [
         resourceNames(RESOURCE_CLASSES.s3, "object-schema/perServiceSchemas/*"),
-        resourceNames(RESOURCE_CLASSES.s3, "object-schema/serviceConfig/ServiceNameConfig.json"),
         resourceNames(RESOURCE_CLASSES.s3, "object-schema/serviceConfig/GraphServerTags.json"),
       ]
     )
@@ -340,6 +358,13 @@ function shortNameHandler(fullNameHandler) {
   return fullNameHandler.slice(3)
 };
 
+const SOURCE_GENERATE_IAM_ROLE = {
+  ProcessFindDataRole: "ProcFindData",
+  ObjectCompleteRole: "ObjectCom",
+  RelationshipRole: "Relationship",
+  RelationshipCompleteRole: "RelationshipCom",
+};
+
 
 module.exports = {
   ACTIONS,
@@ -355,7 +380,7 @@ module.exports = {
   LAMBDA_RESOURCE,
   HANDLER,
   externalResourceName,
-  externalResourceSns,
+  externalResourceYaml,
   SAVE_FILE_NAME,
   FUNCTION_NAME,
   getGraphServiceNameFromAllRelSchema,
@@ -365,5 +390,6 @@ module.exports = {
   awaitingMultipleStepsRole,
   shortNameHandler,
   SHORT_FUNCTION_NAME,
-  S3_RESOURCE
+  S3_RESOURCE,
+  SOURCE_GENERATE_IAM_ROLE
 }