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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@izara_project/izara-core-library-core": "^1.0.14",
     "@izara_project/izara-core-library-external-request": "^1.0.17",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.37",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.41",
     "@izara_project/izara-shared": "^1.0.116",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.1",

package/src/TemplateManager/src/PerActionEndpoint/FunctionYaml/HdrApi/template.ejs

@@ -4,12 +4,12 @@
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
     - http:
-        path: <%- objectType %>/<%- firstLetterUpperCase(action) %>
+        path: <%- firstLetterUpperCase(objectType) %>/<%- firstLetterUpperCase(action) %>
         method: <%- event %>
         cors: true
         #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>Authorizer#>
         #<#/<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>Authorizer#>
-  role: <%- objectType %>Role
+  role: <%- firstLetterUpperCase(objectType) %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

package/src/TemplateManager/src/PerActionEndpoint/FunctionYaml/HdrDsq/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
-  role: <%- roleName %>Role
+  role: <%- firstLetterUpperCase(roleName) %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

package/src/TemplateManager/src/PerActionEndpoint/FunctionYaml/HdrInv/template.ejs

@@ -2,7 +2,7 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
-  role: <%- objectType %>Role
+  role: <%- firstLetterUpperCase(objectType) %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

package/src/TemplateManager/src/PerActionEndpoint/FunctionYaml/HdrSqs/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
-  role: <%- roleName %>Role
+  role: <%- firstLetterUpperCase(roleName) %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

package/src/TemplateManager/src/Role/createSharedResource.js

@@ -165,10 +165,10 @@ module.exports.createSharedResource = (_izContext, createSourceParams, srcPath)
         templateData.functionName.includes('FindData') ||
         templateData.functionName.includes('ProcessLogical'))) {
       // Handle ProcessFindData items
-      groupedByObjectType.ProcessFindData.handlerType.push(templateData.handlerType);
+      groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole].handlerType.push(templateData.handlerType);
       processResourcePermissions(
         templateData.additionalResourcePermission,
-        groupedByObjectType.ProcessFindData.resources
+        groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole].resources
       );
     }
     else {
@@ -199,7 +199,6 @@ module.exports.createSharedResource = (_izContext, createSourceParams, srcPath)
   });
   // Prepare results
 
-
   // Process and prepare data for role definitions and extract any resources
   // that might be related to object types but weren't categorized properly
   const roles = [];

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

@@ -23,61 +23,137 @@ const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = req
 const { SOURCE_PATH } = require('../../libs/Consts');
 const templateYamlPath = path.join(__dirname, "./templateYaml.ejs");
 const templatePathIntTestPath = path.join(__dirname, "./templateIntTesting.ejs");
+const { SOURCE_GENERATE_IAM_ROLE } = require("../../libs/Consts");
 
 
 function data(_izContext, createSourceParams, srcPath) {
-  // console.log("createSourceParams in Data", createSourceParams);
-  const functionNameConfigs = new Set();
-  let createFunctionNameConfig = []
-  for (let { templatePath, templateData, setting } of createSourceParams) {
-    if (templateData?.functionNameConfig !== undefined) {
-      functionNameConfigs.add(templateData.functionNameConfig)
+
+  // ! old code
+  // function createFunctionNameConfigFileYaml(functionNameConfigs, srcPath) {
+  //   let createFunctionNameConfigYaml = []
+  //   createFunctionNameConfigYaml.push(
+  //     {
+  //       templatePath: templateYamlPath,
+  //       templateData: {
+  //         functionNameConfigs: functionNameConfigs
+  //       },
+  //       setting: {
+  //         savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+  //         saveFileName: "FunctionNameConfig",
+  //         fileExtension: ".yml",
+  //         isAppend: true
+  //       }
+  //     }
+  //   )
+  //   return createFunctionNameConfigYaml
+  // }
+
+  // Extract role names from object types in createSourceParams
+  const roleNameConfigs = new Set();
+  const roleNameConcatConfigs = new Set();
+
+  // Add default IAM roles from configuration
+  Object.entries(SOURCE_GENERATE_IAM_ROLE)
+    .filter(([_, enabled]) => enabled)
+    .forEach(([_, value]) => {
+      roleNameConfigs.add(`${upperCase(value)}Role`);
+      roleNameConcatConfigs.add(`${upperCase(value)}`);
+    });
+
+  for (const { templateData } of createSourceParams) {
+    if (templateData?.objectType) {
+      roleNameConfigs.add(`${upperCase(templateData.objectType)}Role`);
+      roleNameConcatConfigs.add(`${upperCase(templateData.objectType)}`);
     }
   }
-  let createFunctionNameConfigYaml = createFunctionNameConfigFileYaml(functionNameConfigs, srcPath);
-  let createFunctionNameConfigJs = createFunctionNameConfigFileJs(functionNameConfigs, srcPath);
-  createFunctionNameConfig.push(...createFunctionNameConfigYaml, ...createFunctionNameConfigJs)
-  return createFunctionNameConfig
 
+  // Generate YAML and JS configurations
+  const roleConfigYaml = createRoleNameConfigFileYaml(roleNameConfigs, srcPath);
+  const roleConfigJs = createRoleNameConfigFileJs(roleNameConcatConfigs, srcPath);
+
+  // Combine and return all configurations
+  return [...roleConfigYaml, ...roleConfigJs];
 }
 
-function createFunctionNameConfigFileYaml(functionNameConfigs, srcPath) {
-  let createFunctionNameConfigYaml = []
-  createFunctionNameConfigYaml.push(
+
+// ! old code
+// function createFunctionNameConfigFileYaml(functionNameConfigs, srcPath) {
+//   let createFunctionNameConfigYaml = []
+//   createFunctionNameConfigYaml.push(
+//     {
+//       templatePath: templateYamlPath,
+//       templateData: {
+//         functionNameConfigs: functionNameConfigs
+//       },
+//       setting: {
+//         savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+//         saveFileName: "FunctionNameConfig",
+//         fileExtension: ".yml",
+//         isAppend: true
+//       }
+//     }
+//   )
+//   return createFunctionNameConfigYaml
+// }
+
+// ! old code
+// function createFunctionNameConfigFileJs(functionNameConfigs, srcPath) {
+//   let createFunctionNameConfigJs = []
+//   createFunctionNameConfigJs.push(
+//     {
+//       templatePath: templatePathIntTestPath,
+//       templateData: {
+//         functionNameConfigs: functionNameConfigs
+//       },
+//       setting: {
+//         savePath: path.join(srcPath, SOURCE_PATH.externalService),
+//         saveFileName: "FunctionNameConfig",
+//         fileExtension: ".js",
+//         isAppend: true
+//       }
+//     }
+//   )
+
+//   return createFunctionNameConfigJs
+// }
+
+function createRoleNameConfigFileYaml(roleNameConfigs, srcPath) {
+  let createRoleNameConfigYaml = []
+  createRoleNameConfigYaml.push(
     {
       templatePath: templateYamlPath,
       templateData: {
-        functionNameConfigs: functionNameConfigs
+        roleNameConfigs: roleNameConfigs
       },
       setting: {
         savePath: path.join(srcPath, SOURCE_PATH.appYaml),
-        saveFileName: "FunctionNameConfig",
+        saveFileName: "RoleNameConfig",
         fileExtension: ".yml",
         isAppend: true
       }
     }
   )
-  return createFunctionNameConfigYaml
+  return createRoleNameConfigYaml
 }
 
-function createFunctionNameConfigFileJs(functionNameConfigs, srcPath) {
-  let createFunctionNameConfigJs = []
-  createFunctionNameConfigJs.push(
+function createRoleNameConfigFileJs(roleNameConfigs, srcPath) {
+  let createRoleNameConfigJs = []
+  createRoleNameConfigJs.push(
     {
       templatePath: templatePathIntTestPath,
       templateData: {
-        functionNameConfigs: functionNameConfigs
+        roleNameConfigs: roleNameConfigs
       },
       setting: {
         savePath: path.join(srcPath, SOURCE_PATH.externalService),
-        saveFileName: "FunctionNameConfig",
+        saveFileName: "RoleNameConfig",
         fileExtension: ".js",
         isAppend: true
       }
     }
   )
 
-  return createFunctionNameConfigJs
+  return createRoleNameConfigJs
 }
 
 module.exports = data;

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

@@ -17,13 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-module.exports.generatedIntTestFunctionNameConfig = () => {
-let functionNameConfigIntTest = [
-  <% functionNameConfigs.forEach(functionNameConfig => { _%>
-    "<%- firstLetterUpperCase(functionNameConfig) %>",
+module.exports.generatedIntTestRoleNameConfig = () => {
+let roleNameConfigIntTest = [
+    <% roleNameConfigs.forEach(roleNameConfig => { _%>
+    "<%- firstLetterUpperCase(roleNameConfig) %>",
     <% }) _%>
     ]
-    return functionNameConfigIntTest
+    return roleNameConfigIntTest
   }
 
 <%_function firstLetterUpperCase(text) {

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

@@ -1,7 +1,7 @@
 # for createIamRole
 
-<% functionNameConfigs.forEach(functionNameConfig => { _%>
-- ${self:custom.iz_prefixIamRole}<%- firstLetterUpperCase(functionNameConfig) %>${self:custom.iz_suffixIamRole}
+<% roleNameConfigs.forEach(roleNameConfig => { _%>
+- arn:aws:iam::${self:custom.iz_accountId}:role/${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(roleNameConfig) %>
 <% }) _%>
 
 

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

@@ -25,11 +25,12 @@ const { getGraphServiceNameFromGraphServerTagWithCache,
 } = require('@izara_project/izara-core-library-service-schemas/src/ServiceConfig')
 
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/src/Utils")
-const { DEFAULT_HANDLER_PER_ACTION, createIamRole, RESOURCE_CLASSES, SOURCE_PATH, externalResourceName, getGraphServiceNameFromAllRelSchema, SAVE_FILE_NAME, LAMBDA_RESOURCE, SNS_RESOURCE, getGraphServiceNameFromObjectSchema, shortNameHandler, SHORT_FUNCTION_NAME, defaultIamRolePerAction, resourceNames } = require("../../libs/Consts");
+const { DEFAULT_HANDLER_PER_ACTION, createIamRole, RESOURCE_CLASSES, SOURCE_PATH, externalResourceName, getGraphServiceNameFromAllRelSchema, SAVE_FILE_NAME, LAMBDA_RESOURCE, SNS_RESOURCE, getGraphServiceNameFromObjectSchema, shortNameHandler, SHORT_FUNCTION_NAME, defaultIamRolePerAction, resourceNames, SOURCE_GENERATE_IAM_ROLE } = 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')
 const { EXTERNAL_SERVICE_NAME } = require("../../../../GenerateCodeLibs/src/Consts")
+
 const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas, allLocalFlowSchemas, srcPath) => {
   const allRelationshipSchemas = getAllLocalRelationshipSchemas(_izContext, srcPath)
   // console.log("allRelationshipSchemas", allRelationshipSchemas);
@@ -78,7 +79,6 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
     const externalLambdaIamRoleFindData = externalLambdaIamRoleDataFindData(_izContext);
     externalLambdaIamRoleFindData && externalLambdaIamRoleArray.push(externalLambdaIamRoleFindData)
 
-
     // updateRelationshipComplete external lambda role
 
     // ... another external lambda role data
@@ -195,6 +195,7 @@ async function externalLambdaIamRoleDataPerAction(_izContext, objectSchema, acti
 
 
   return {
+    objectType: upperCase(objectType),
     functionName: functionName,
     action: action,
     additionalResourcePermission
@@ -207,7 +208,7 @@ async function externalLambdaIamRoleDataUpdateRelationshipSchema(_izContext, all
   const functionName = upperCase(SHORT_FUNCTION_NAME.updateRel) + upperCase(shortNameHandler(handler));
   const additionalResourcePermission = [];
   const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
-
+  const objectType = SOURCE_GENERATE_IAM_ROLE.RelationshipRole
 
   additionalResourcePermission.push(
     createIamRole(
@@ -222,7 +223,8 @@ async function externalLambdaIamRoleDataUpdateRelationshipSchema(_izContext, all
 
   return {
     functionName,
-    additionalResourcePermission
+    additionalResourcePermission,
+    objectType
   }
 }
 
@@ -233,6 +235,7 @@ async function externalLambdaIamRoleDataCreateRelationshipSchema(_izContext, all
   const functionName = upperCase(SHORT_FUNCTION_NAME.createRel) + upperCase(shortNameHandler(handler));
   const additionalResourcePermission = [];
   const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
+  const objectType = SOURCE_GENERATE_IAM_ROLE.RelationshipRole
 
   additionalResourcePermission.push(
     createIamRole(
@@ -246,7 +249,8 @@ async function externalLambdaIamRoleDataCreateRelationshipSchema(_izContext, all
   )
   return {
     functionName,
-    additionalResourcePermission
+    additionalResourcePermission,
+    objectType
   }
 }
 
@@ -255,6 +259,7 @@ async function externalLambdaIamRoleDataDeleteRelationshipSchema(_izContext, all
   const functionName = upperCase(SHORT_FUNCTION_NAME.deleteRel) + upperCase(shortNameHandler(handler))
   const additionalResourcePermission = [];
   const graphServiceNamesFromAllRelSchemas = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas);
+  const objectType = SOURCE_GENERATE_IAM_ROLE.RelationshipRole
 
   additionalResourcePermission.push(
     createIamRole(
@@ -268,14 +273,15 @@ async function externalLambdaIamRoleDataDeleteRelationshipSchema(_izContext, all
   )
   return {
     functionName,
-    additionalResourcePermission
+    additionalResourcePermission,
+    objectType
   }
 }
 
 function externalLambdaIamRoleDataFindData(_izContext) {
   let functionName = upperCase(SHORT_FUNCTION_NAME.findData) + upperCase(shortNameHandler(HANDLER.hdrSqs));
   let additionalResourcePermission = [];
-
+  let objectType = SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -286,10 +292,11 @@ function externalLambdaIamRoleDataFindData(_izContext) {
       ]
     )
   )
-  console.log("findData template data:", { functionName, additionalResourcePermission })
+  // console.log("findData template data:", { functionName, additionalResourcePermission })
   return {
     functionName,
-    additionalResourcePermission
+    additionalResourcePermission,
+    objectType
   }
 }
 
@@ -298,6 +305,8 @@ async function externalLambdaIamRoleDataProcessLogical(_izContext, allObjectSche
   let functionName = upperCase(SHORT_FUNCTION_NAME.processLogical) + upperCase(shortNameHandler(HANDLER.hdrSqs));
   let additionalResourcePermission = [];
   let graphServiceNames = await getGraphServiceNameFromObjectSchema(_izContext, allObjectSchemas)
+  let objectType = SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole
+
   // console.log("graphServiceNameFromProcessLogical::", graphServiceNames)
   additionalResourcePermission.push(
     createIamRole(
@@ -311,7 +320,8 @@ async function externalLambdaIamRoleDataProcessLogical(_izContext, allObjectSche
   )
   return {
     functionName,
-    additionalResourcePermission
+    additionalResourcePermission,
+    objectType
   }
 }
 

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

@@ -29,7 +29,7 @@ const _izContext = {logger : Logger}
 module.exports.generatedLambdaRole = async () => {
   let externalLambdaRole = [ <%_ datas.forEach((data,dataIndex) => { %>
   {
-    functionName: "<%- data.functionName %>",
+    roleName: "<%- data.objectType %>",
     statement: [
     <%_ data.additionalResourcePermission.forEach((resourcePermission, resourceIdx) => { _%>
       {

package/src/TemplateManager/src/libs/Consts.js

@@ -115,8 +115,8 @@ 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/",
   logicalFunctionHook: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source/",
   resourceLocationLogicalFunctionHook: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source",
@@ -359,10 +359,10 @@ function shortNameHandler(fullNameHandler) {
 };
 
 const SOURCE_GENERATE_IAM_ROLE = {
-  ProcessFindDataRole: "ProcessFindData",
-  ObjectCompleteRole: "ObjectComplete",
+  ProcessFindDataRole: "ProcFindData",
+  ObjectCompleteRole: "ObjectCom",
   RelationshipRole: "Relationship",
-  RelationshipCompleteRole: "RelationshipComplete",
+  RelationshipCompleteRole: "RelationshipCom",
 };