@izara_project/izara-market-library-service-schemas 1.0.7 → 1.0.9

package/src/TemplateManager/src/TranslateIdReq/TranslateIds/functionYaml/HdrDsq/template.ejs

@@ -0,0 +1,30 @@
+<%_ const join = require('path').join; _%>
+<%- firstLetterUpperCase(functionNameConfig) %>:
+  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
+  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  events:
+    - sqs:
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+        batchSize: 10
+  iamRoleStatements:
+    <%_ additionalResourcePermission.forEach(resourcePermission => { _%>
+    - Effect: <%- resourcePermission.effect %>
+      Action:
+        <%_ Object.keys(resourcePermission.action).forEach(resourcePerAction => { _%>
+        <%_ resourcePermission.action[resourcePerAction].forEach(permission => { _%>
+        - <%- resourcePerAction %>:<%- permission %>
+        <%_}) _%>
+        <%_ }) _%>
+      Resource:
+        <%_ resourcePermission.resource.forEach(resource => { _%>
+        - "<%- resource %>"
+        <%_ }) _%>
+    <%_}) _%>
+    #<#<%- functionName %><%- handlerType %>IamRole#>
+    #<#/<%- functionName %><%- handlerType %>IamRole#>
+<%_ 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/TranslateIdReq/TranslateIds/functionYaml/HdrSqs/data.js

@@ -22,35 +22,9 @@ const fs = require('fs');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
-const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, externalResourceName } = require("../../../../libs/Consts");
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SQS_RESOURCE, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, externalResourceName, defaultIamRolePerAction, SNS_RESOURCE, DYNAMO_RESOURCE, shortNameHandler } = require("../../../../libs/Consts");
 
-const templatePath = path.join(__dirname, '../../../../PerActionEndpoint/FunctionYaml/HdrDsq/template.ejs');
-
-function defaultIamRolePerAction() {
-  let defaultIamRole = [];
-
-  defaultIamRole.push(
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.s3]: ["GetObject", "GetObjectVersion"],
-      },
-      [
-        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")
-      ]
-    ),
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.s3]: ["ListBucket"]
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.s3, "object-schema")
-      ]
-    )
-  )
-  return defaultIamRole
-}
+const templatePath = path.join(__dirname, './template.ejs');
 
 /**
  * create data for function yaml for translateIds HdrSqs
@@ -76,7 +50,7 @@ function createTranslateIdFunctionYmlHdrSqs(srcPath) {
         ],
         [RESOURCE_CLASSES.sns]:
           [
-            "Publish", "Subscribe"
+            SNS_RESOURCE.publish, SNS_RESOURCE.subscription
           ]
       },
       [
@@ -88,7 +62,7 @@ function createTranslateIdFunctionYmlHdrSqs(srcPath) {
     ),
     createIamRole(
       {
-        [RESOURCE_CLASSES.dynamoDbTable]: ["GetItem", "UpdateItem"]
+        [RESOURCE_CLASSES.dynamoDbTable]: [DYNAMO_RESOURCE.getItem, DYNAMO_RESOURCE.updateItem]
       },
       [
         resourceNames(RESOURCE_CLASSES.dynamoDbTable, "TranslateIdsCacheMain")
@@ -102,7 +76,8 @@ function createTranslateIdFunctionYmlHdrSqs(srcPath) {
       functionName,
       handlerType,
       resourceLocation: SOURCE_PATH.resourceLocationTranslateId,
-      additionalResourcePermission
+      additionalResourcePermission,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType))
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/TemplateManager/src/TranslateIdReq/TranslateIds/functionYaml/HdrSqs/template.ejs

@@ -0,0 +1,30 @@
+<%_ const join = require('path').join; _%>
+<%- firstLetterUpperCase(functionNameConfig) %>:
+  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
+  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  events:
+    - sqs:
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+        batchSize: 10
+  iamRoleStatements:
+    <%_ additionalResourcePermission.forEach(resourcePermission => { _%>
+    - Effect: <%- resourcePermission.effect %>
+      Action:
+        <%_ Object.keys(resourcePermission.action).forEach(resourcePerAction => { _%>
+        <%_ resourcePermission.action[resourcePerAction].forEach(permission => { _%>
+        - <%- resourcePerAction %>:<%- permission %>
+        <%_ }) _%>
+        <%_ }) _%>
+      Resource:
+        <%_ resourcePermission.resource.forEach(resource => { _%>
+        - "<%- resource %>"
+        <%_ }) _%>
+    <%_}) _%>
+    #<#<%- functionName %><%- handlerType %>IamRole#>
+    #<#/<%- functionName %><%- handlerType %>IamRole#>
+<%_ 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/TranslateIdReq/TranslateIds/handler/HdrDsq/data.js

@@ -21,7 +21,7 @@ const fs = require('fs');
 
 const { ACTIONS, HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, firstLetterUpperCase } = require("../../../../../../MainLibs/src/Utils")
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
 const { DEFAULT_HANDLER_PER_ACTION, SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME } = require("../../../../libs/Consts");
 
 
@@ -46,7 +46,7 @@ function createSourceParamsTranslateIdHandlerDsq(srcPath) {
     templateData: {
       queueName,
       functionName,
-      handlerType
+      handlerType,
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.translateIdsRequestFile),

package/src/TemplateManager/src/TranslateIdReq/TranslateIds/handler/HdrDsq/template.ejs

@@ -29,9 +29,7 @@ const perRecordsValidatorSchema = {
   type: "object",
   required: [
     "fromObjType",
-    // "fromTypeId",
     "toObjType",
-    // "toTypeId",
     "relType",
   ],
   properties: {
@@ -46,8 +44,8 @@ const perRecordsValidatorSchema = {
     fromTypeId: {
       type: "string",
     },
-    concatinateIdentifier: {
-      type: "string",
+    identifiers: {
+      type: "array",
     },
     fromTable: {
       type: "string",
@@ -117,7 +115,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.fromObjType)
       passOnProperties.push(record.body.Message.fromTypeId)
-      passOnProperties.push(record.body.Message.concatinateIdentifier)
+      passOnProperties.push(record.body.Message.identifiers)
       passOnProperties.push(record.body.Message.fromTable)
       passOnProperties.push(record.body.Message.fromPartitionKeyId)
       passOnProperties.push(record.body.Message.fromPartitionKeyFieldName)

package/src/TemplateManager/src/TranslateIdReq/TranslateIds/handler/HdrSqs/data.js

@@ -45,7 +45,7 @@ function createTranslateIdsHandlerSqs(srcPath) {
     templateData: {
       functionName,
       handler,
-      queueName
+      queueName,
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.translateIdsRequestFile),

package/src/TemplateManager/src/TranslateIdReq/TranslateIds/handler/HdrSqs/template.ejs

@@ -25,7 +25,7 @@ const {
 const Logger = require('@izara_project/izara-core-library-logger');
 const recordHandlerSharedLib = require('@izara_project/izara-shared').recordHandlerSharedLib
 
-const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>_Main');
+const translateIdsRequest = require('./TranslateIdsRequest_Main');
 
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
@@ -34,9 +34,7 @@ let validatorSchema = {
   type: "object",
   required: [
     "fromObjType",
-    // "fromTypeId",
     "toObjType",
-    // "toTypeId",
     "relType",
   ],
   properties: {
@@ -51,8 +49,8 @@ let validatorSchema = {
     fromTypeId: {
       type: "string",
     },
-    concatinateIdentifier: {
-      type: "string",
+    identifiers: {
+      type: "array",
     },
     fromTable: {
       type: "string",
@@ -117,7 +115,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // --- validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
-        "<%-firstLetterUpperCase(queueName) %>",                       // queue name that need to retry or send to dlq
+        "TranslateIdsRequestHdrSqs", // queue name that need to retry or send to dlq
         validatorSchema, // schema for record.Message
         // messageAttributeValidatorSchema        // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
@@ -125,7 +123,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.fromObjType)
       passOnProperties.push(record.body.Message.fromTypeId)
-      passOnProperties.push(record.body.Message.concatinateIdentifier)
+      passOnProperties.push(record.body.Message.identifiers)
       passOnProperties.push(record.body.Message.fromTable)
       passOnProperties.push(record.body.Message.fromPartitionKeyId)
       passOnProperties.push(record.body.Message.fromPartitionKeyFieldName)
@@ -142,34 +140,24 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record, // one record will send to mainFunction
-        <%- functionName %>.<%- functionName %>,     // mainFunction that need to invoke.
-        "<%-firstLetterUpperCase(queueName) %>",                          // queue name that need to retry or send to dlq
+        translateIdsRequest.translateIdsRequest, // mainFunction that need to invoke.
+        "TranslateIdsRequestHdrSqs", // 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
-      })) //end record
-
-      Logger.debug('before Promise.all(recordPromises) in handler');
-      try {
-        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');
+      );
+      record._izContext.logger.debug('after recordPromise in handler');
+      recordPromises.push(recordPromise); // push promise to recordPromises
+    })) //end record
+
+    Logger.debug('before Promise.all(recordPromises) in handler');
+    try {
+      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, <%- firstLetterUpperCase(functionName) %>:', err);
+    Logger.error('Unhandled Error, TranslateIdsRequest:', err);
     throw (err);
   }
-})
-
-
-
-
-<%_ 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/TranslateIdReq/TranslateIds/mainFunction/template.ejs

@@ -39,7 +39,7 @@ const sqs = externalRequest.sqs
  * translate ids from one object to another related object
  * @param {Object} _izContext
  * @param {object} fromObjType - the type of object we are translating ids from
- * @param {string} concatinateIdentifier
+ * @param {Object[]} identifiers
  * @param {string} fromTypeId - the type of object we are translating ids from
  * @param {string} fromTable - table name
  * @param {string} fromPartitionKeyId - partition key value
@@ -59,7 +59,7 @@ module.exports.translateIdsRequest = async (
   _izContext,
   fromObjType,
   fromTypeId,
-  concatinateIdentifier,
+  identifiers,
   fromTable,
   fromPartitionKeyId,
   fromPartitionKeyFieldName,
@@ -81,7 +81,7 @@ module.exports.translateIdsRequest = async (
     _izContext.logger.debug("=== Function:TranslateIdsRequest ===", {
       fromObjType: fromObjType,
       fromTypeId: fromTypeId,
-      concatinateIdentifier: concatinateIdentifier,
+      identifiers: identifiers,
       fromTable: fromTable,
       fromPartitionKeyId: fromPartitionKeyId,
       fromPartitionKeyFieldName: fromPartitionKeyFieldName,
@@ -103,7 +103,7 @@ module.exports.translateIdsRequest = async (
     let [translateIdsCacheMainStatus, translateIdsCacheId, translateIdsCacheMain] = await translateIdsSharedLib.translateIdsCheckCacheMain(
       _izContext,
       fromObjType,
-      concatinateIdentifier,
+      identifiers,
       fromTable,
       fromPartitionKeyId,
       fromPartitionKeyFieldName,
@@ -126,7 +126,7 @@ module.exports.translateIdsRequest = async (
       MessageBody: JSON.stringify({
         fromObjType: fromObjType,
         fromTypeId: fromTypeId,
-        concatinateIdentifier: concatinateIdentifier,
+        identifiers: identifiers,
         fromTable: fromTable,
         fromPartitionKeyId: fromPartitionKeyId,
         fromPartitionKeyFieldName: fromPartitionKeyFieldName,

package/src/TemplateManager/src/externalService/FunctionNameConfig/data.js

@@ -0,0 +1,50 @@
+/*
+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 { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils");
+const { SOURCE_PATH } = require('../../libs/Consts');
+const templatePath = path.join(__dirname, "./template.ejs");
+
+
+function data(_izContext, createSourceParams, srcPath) {
+  // console.log("createSourceParams in Data", createSourceParams);
+  const functionNameConfigs = new Set();
+  for (let { templatePath, templateData, setting } of createSourceParams) {
+    if (templateData.functionNameConfig !== undefined) {
+      functionNameConfigs.add(templateData.functionNameConfig)
+    }
+  }
+
+  return {
+    templatePath: templatePath,
+    templateData: {
+      functionNameConfigs: functionNameConfigs
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+      saveFileName: "FunctionNameConfig",
+      fileExtension: ".yml",
+      isAppend: true
+    }
+  }
+}
+
+module.exports = data;

package/src/TemplateManager/src/externalService/FunctionNameConfig/template.ejs

@@ -0,0 +1,14 @@
+# for createIamRole
+
+<% functionNameConfigs.forEach(functionNameConfig => { _%>
+- ${self:custom.iz_prefixIamRole}<%- firstLetterUpperCase(functionNameConfig) %>${self:custom.iz_suffixIamRole}
+<% }) _%>
+
+# for createIntTest
+<% functionNameConfigs.forEach(functionNameConfig => { _%>
+  "<%- firstLetterUpperCase(functionNameConfig) %>",
+<% }) _%>
+
+<%_function firstLetterUpperCase(text) {
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} %>

package/src/TemplateManager/src/externalService/LambdaRole/data.js

@@ -22,10 +22,11 @@ const fs = require('fs');
 const { ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
 const { getGraphServiceNameFromGraphServerTagWithCache } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils")
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, renameObjectType } = require("../../../../MainLibs/src/Utils")
 const {
   DEFAULT_HANDLER_PER_ACTION, createIamRole, resourceNames, RESOURCE_CLASSES, DEFAULT_LAMBDA_ROLE_PER_ACTION, SOURCE_PATH, externalResourceName, externalResourceSns, FUNCTION_NAME, getGraphServiceNameFromAllRelSchema, SAVE_FILE_NAME, getComplexFilterServiceTag,
-  LAMBDA_RESOURCE, SNS_RESOURCE, DYNAMO_RESOURCE, getGraphServiceNameFromObjectSchema } = require("../../libs/Consts");
+  LAMBDA_RESOURCE, SNS_RESOURCE, DYNAMO_RESOURCE, getGraphServiceNameFromObjectSchema,
+  shortNameHandler } = require("../../libs/Consts");
 // const templatePath = path.join(__dirname, "./template.ejs");
 const templatePath = path.join(__dirname, "./template.ejs");
 const { getAllLocalRelationshipSchemas } = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema')
@@ -36,17 +37,18 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
   const externalLambdaIamRoleArray = [];
   for (const objectSchema of allObjSchemas) {
 
+    const newObjectSchema = renameObjectType(objectSchema, srcPath)
     // per action external lambda role
     for (const action of Object.values(ACTIONS)) {
       if (objectSchema.overWriteHandlers?.[action]) {
         for (const handler of objectSchema.overWriteHandlers[action]) {
-          const externalLambdaIamRole = await externalLambdaIamRoleDataPerAction(_izContext, objectSchema, action, handler)
+          const externalLambdaIamRole = await externalLambdaIamRoleDataPerAction(_izContext, newObjectSchema, action, handler)
           externalLambdaIamRole && externalLambdaIamRoleArray.push(externalLambdaIamRole);
         }
 
       } else {
         for (const handler of DEFAULT_HANDLER_PER_ACTION[action]) {
-          const externalLambdaIamRole = await externalLambdaIamRoleDataPerAction(_izContext, objectSchema, action, handler)
+          const externalLambdaIamRole = await externalLambdaIamRoleDataPerAction(_izContext, newObjectSchema, action, handler)
           externalLambdaIamRole && externalLambdaIamRoleArray.push(externalLambdaIamRole);
         }
       }
@@ -59,19 +61,19 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
 
     // updateRelationship external lambda role
     for (const handler of Object.values(HANDLER)) {
-      if (handler !== HANDLER.hdrApi) {
-        const externalLambdaIamRoleUpdateRelationship = await externalLambdaIamRoleDataUpdateRelationshipSchema(_izContext, allRelSchemas, handler);
-        externalLambdaIamRoleUpdateRelationship && externalLambdaIamRoleArray.push(externalLambdaIamRoleUpdateRelationship)
-
-      }
+      const externalLambdaIamRoleUpdateRelationship = await externalLambdaIamRoleDataUpdateRelationshipSchema(_izContext, allRelSchemas, handler);
+      externalLambdaIamRoleUpdateRelationship && externalLambdaIamRoleArray.push(externalLambdaIamRoleUpdateRelationship)
     }
 
     // CreateRelationship external lambda role
     for (const handler of Object.values(HANDLER)) {
-      if (handler !== HANDLER.hdrApi) {
-        const externalLambdaIamRoleCreateRelationship = await externalLambdaIamRoleDataCreateRelationshipSchema(_izContext, allRelSchemas, handler);
-        externalLambdaIamRoleCreateRelationship && externalLambdaIamRoleArray.push(externalLambdaIamRoleCreateRelationship)
-      }
+      const externalLambdaIamRoleCreateRelationship = await externalLambdaIamRoleDataCreateRelationshipSchema(_izContext, allRelSchemas, handler);
+      externalLambdaIamRoleCreateRelationship && externalLambdaIamRoleArray.push(externalLambdaIamRoleCreateRelationship)
+    }
+
+    for (const handler of Object.values(HANDLER)) {
+      const externalLambdaIamRoleDeleteRelationship = await externalLambdaIamRoleDataDeleteRelationshipSchema(_izContext, allRelSchemas, handler);
+      externalLambdaIamRoleDeleteRelationship && externalLambdaIamRoleArray.push(externalLambdaIamRoleDeleteRelationship)
     }
 
     // findData external lambda role
@@ -93,7 +95,7 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
   }
 
 
-  console.log("createSourceArrayIamRole", JSON.stringify(externalLambdaIamRoleArray))
+  // console.log("createSourceArrayIamRole", JSON.stringify(externalLambdaIamRoleArray))
   // return externalLambdaIamRoleArray
 
   return {
@@ -109,57 +111,74 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
 }
 
 async function externalLambdaIamRoleDataPerAction(_izContext, objectSchema, action, handler) {
-  const objectType = objectSchema.objectType;
+  const objectType = objectSchema?.shortNameObjectType ? objectSchema?.shortNameObjectType : objectSchema.objectType;
   const additionalResourcePermission = [];
   const graphServiceNames = [];
   for (const storgaeResource of Object.values(objectSchema.storageResources)) {
     if (storgaeResource.storageType === STORAGE_TYPES.graph) {
       let getGraphServiceName = await getGraphServiceNameFromGraphServerTagWithCache(_izContext, storgaeResource.graphServerTag)
       if (!graphServiceNames.includes(getGraphServiceName)) {
-        graphServiceNames.push(getGraphServiceName)
+        getGraphServiceName && graphServiceNames.push(getGraphServiceName)
       }
     }
   }
 
-  let functionName = upperCase(objectType) + upperCase(action) + upperCase(handler);
 
-  if (action === ACTIONS.get) {
-    additionalResourcePermission.push(
-      createIamRole(
-        { [RESOURCE_CLASSES.lambda]: [LAMBDA_RESOURCE.invokeFunction] },
-        graphServiceNames.map(graphServiceName =>
-          externalResourceName(RESOURCE_CLASSES.lambda, "GetNodeV2HdrInv", graphServiceName),
+  // let functionName = upperCase(objectType) + upperCase(action) + upperCase(shortNameHandler(handler));
+  let functionName = upperCase(objectType) + upperCase(action) + upperCase(shortNameHandler(handler));
+
+  if (!graphServiceNames.length) {
+    return
+  } else {
+    if (action === ACTIONS.get) {
+      additionalResourcePermission.push(
+        createIamRole(
+          { [RESOURCE_CLASSES.lambda]: [LAMBDA_RESOURCE.invokeFunction] },
+          graphServiceNames.map(graphServiceName =>
+            externalResourceName(RESOURCE_CLASSES.lambda, "GetNodeV2HdrInv", graphServiceName),
+          )
         )
       )
-    )
-
-  } else if (action === ACTIONS.update) {
-    additionalResourcePermission.push(
-      createIamRole(
-        {
-          [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
-        },
-        graphServiceNames.map(graphServiceName =>
-          externalResourceSns("InUpdateNode", graphServiceName)
+      // }
+    } else if (action === ACTIONS.update) {
+      additionalResourcePermission.push(
+        createIamRole(
+          {
+            [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
+          },
+          graphServiceNames.map(graphServiceName =>
+            externalResourceSns("InUpdateNode", graphServiceName)
+          )
         )
       )
-    )
-
-  } else if (action === ACTIONS.create) {
-    additionalResourcePermission.push(
-      createIamRole(
-        {
-          [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
-        },
-        graphServiceNames.map(graphServiceName =>
-          externalResourceSns("InCreateNodeV2", graphServiceName)
+      // }
+    } else if (action === ACTIONS.create) {
+      additionalResourcePermission.push(
+        createIamRole(
+          {
+            [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
+          },
+          graphServiceNames.map(graphServiceName =>
+            externalResourceSns("InCreateNodeV2", graphServiceName)
+          )
         )
       )
-    )
-  } else if (action === ACTIONS.delete) {
-
-  } else {
-    throw new error("Invalid action")
+      // }
+    } else if (action === ACTIONS.delete) {
+      return
+      // additionalResourcePermission.push(
+      //   createIamRole(
+      //     {
+      //       [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
+      //     },
+      //     graphServiceNames.map(graphServiceName =>
+      //       externalResourceSns("InDeleteNode", graphServiceName)
+      //     )
+      //   )
+      // )
+    } else {
+      throw new error("Invalid action")
+    }
   }
 
 
@@ -173,7 +192,7 @@ async function externalLambdaIamRoleDataPerAction(_izContext, objectSchema, acti
 
 // update Relationship
 async function externalLambdaIamRoleDataUpdateRelationshipSchema(_izContext, allRelSchemas, handler) {
-  const functionName = upperCase(FUNCTION_NAME.updateRel) + upperCase(handler);
+  const functionName = upperCase(FUNCTION_NAME.updateRel) + upperCase(shortNameHandler(handler));
   const additionalResourcePermission = [];
   const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
 
@@ -199,7 +218,7 @@ async function externalLambdaIamRoleDataUpdateRelationshipSchema(_izContext, all
 // create relationship
 
 async function externalLambdaIamRoleDataCreateRelationshipSchema(_izContext, allRelSchemas, handler) {
-  const functionName = upperCase(FUNCTION_NAME.createRel) + upperCase(handler);
+  const functionName = upperCase(FUNCTION_NAME.createRel) + upperCase(shortNameHandler(handler));
   const additionalResourcePermission = [];
   const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
 
@@ -219,9 +238,31 @@ async function externalLambdaIamRoleDataCreateRelationshipSchema(_izContext, all
   }
 }
 
+// delete Relationship
+async function externalLambdaIamRoleDataDeleteRelationshipSchema(_izContext, allRelSchemas, handler) {
+  // const functionName = upperCase(FUNCTION_NAME.deleteRel) + upperCase(handler)
+  // const additionalResourcePermission = [];
+  // const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
+
+  // additionalResourcePermission.push(
+  //   createIamRole(
+  //     {
+  //       [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
+  //     },
+  //     graphServiceNamesFromAllRelSchemas.map(graphServiceName =>
+  //       externalResourceSns("InDeleteRelationship", graphServiceName)
+  //     )
+  //   )
+  // )
+  // return {
+  //   functionName,
+  //   additionalResourcePermission
+  // }
+}
+
 // Process TranslateIds Request
 async function externalLambdaIamRoleDataTranslateId(_izContext, allRelSchemas, allObjSchemas) {
-  let functionName = upperCase(FUNCTION_NAME.translateIdsProcess) + upperCase(HANDLER.hdrDsq);
+  let functionName = upperCase(FUNCTION_NAME.translateIdsProcess) + upperCase(shortNameHandler(HANDLER.hdrDsq));
   const additionalResourcePermission = [];
   const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
   let complexFilterServiceTags = getComplexFilterServiceTag(allObjSchemas);
@@ -255,7 +296,7 @@ async function externalLambdaIamRoleDataTranslateId(_izContext, allRelSchemas, a
 }
 
 async function externalLambdaIamRoleDataFindData(_izContext, allObjSchemas) {
-  let functionName = upperCase(FUNCTION_NAME.findData) + upperCase(HANDLER.hdrSqs);
+  let functionName = upperCase(FUNCTION_NAME.findData) + upperCase(shortNameHandler(HANDLER.hdrSqs));
   let additionalResourcePermission = [];
   let graphServiceNames = []
   for (const objectSchema of allObjSchemas) {
@@ -289,7 +330,7 @@ async function externalLambdaIamRoleDataFindData(_izContext, allObjSchemas) {
 
 
 async function externalLambdaIamRoleDataProcessLogical(_izContext, allObjectSchemas) {
-  let functionName = upperCase(FUNCTION_NAME.processLogical) + upperCase(HANDLER.hdrSqs);
+  let functionName = upperCase(FUNCTION_NAME.processLogical) + upperCase(shortNameHandler(HANDLER.hdrSqs));
   let additionalResourcePermission = [];
   let graphServiceNames = await getGraphServiceNameFromObjectSchema(_izContext, allObjectSchemas)
   // console.log("graphServiceNameFromProcessLogical::", graphServiceNames)