@izara_project/izara-market-library-service-schemas 1.0.26 → 1.0.27

package/index.js

@@ -23,5 +23,6 @@ module.exports = {
   generateCodeLibs: require('./src/GenerateCodeLibs'),
 
   generateSchemaWithTemplate: require('./src/TemplateManager/src/GenerateSchema').generateSchemaWithTemplate,
-  generateCodeWithTemplate: require('./src/reStructure/GenerateCode').generateCodeWithTemplate
+  generateCodeWithTemplate: require('./src/reStructure/GenerateCode').generateCodeWithTemplate,
+  generateSchema: require('./src/reStructure/GenerateSchema')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,9 @@
   "dependencies": {
     "@izara_project/izara-core-library-core": "^1.0.16",
     "@izara_project/izara-core-library-external-request": "^1.0.17",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.44",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.47",
     "@izara_project/izara-shared": "^1.0.125",
+    "@izara_project/izara-shared-service-schemas": "^1.0.4",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",
     "lodash": "^4.17.21",

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -46,7 +46,7 @@ const {
 const Logger = require("@izara_project/izara-core-library-logger");
 
 const nodeLabelRegexPattern = "^[a-zA-Z0-9_-]+(?:\:[a-zA-Z0-9_-]+)?$"
-const { validateObjType } = require('@izara_project/izara-core-library-service-schemas').validateObjType;
+const { validateObjType } = require('@izara_project/izara-shared-service-schemas').validateObjType;
 
 
 

package/src/MainLibs/src/Consts.js

@@ -367,6 +367,7 @@ const SOURCE_GENERATE_IAM_ROLE = {
   NodeCompleteRole: "NodeCom",
   RelationshipRole: "Relationship",
   RelationshipCompleteRole: "RelationshipCom",
+  FlowSchemaUploadS3Role: "FlowSchemaUploadS3"
 };
 
 const ADD_ON_DATA_STRUCTURE_TYPE = {

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

@@ -23,7 +23,6 @@ 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');
 

package/src/reStructure/GenerateCode.js

@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const { join, resolve } = require("path");
 const { readFileSync } = require("fs");
 
+const { validatePathWithRootServicePath } = require("./libs/GenerateCodeLibs")
+
 const templateConfig = require("./TemplateConfig");
 
 // SourceManager
@@ -39,6 +41,9 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     // point to app/src
     let saveFilePath = join(objSchemaPath, `../`);
 
+    // point to root folder of service
+    let localServicePath = join(saveFilePath, "../../");
+
     // // define path for store yml file
     const GENERATE_CODE_SOURCE_PATH = {
       appYaml: join(saveFilePath, SOURCE_PATH.appYaml),
@@ -50,7 +55,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       generateCodeLib: join(saveFilePath, SOURCE_PATH.generateCodeLib),
     };
 
-
     //------ Start Create Source ------
 
     // collect all result of template data for execute createSource
@@ -105,14 +109,22 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       }
     }
 
+    // validate path before empty folder
+    for (let folderPathToEmpty of Object.values(GENERATE_CODE_SOURCE_PATH)) {
+      validatePathWithRootServicePath(localServicePath, folderPathToEmpty)
+    }
 
-    for (let folderPathToEmpty of Object.keys(GENERATE_CODE_SOURCE_PATH)) {
-      await deleteFileInDir(GENERATE_CODE_SOURCE_PATH[folderPathToEmpty]);
+    for (let folderPathToEmpty of Object.values(GENERATE_CODE_SOURCE_PATH)) {
+      await deleteFileInDir(folderPathToEmpty);
     }
 
 
     // generate all source
     for (let item of allCreateSource) {
+      if (item.setting.initialData) {
+        console.log("setting::", item.setting)
+        console.log("templatePath::", item.templatePath)
+      }
       // throw error if item is invalid
       if (!item || !item.templatePath || !item.templateData || !item.setting) {
         console.log('Throwing invalid source item:', item);
@@ -139,4 +151,15 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
 module.exports = {
   generateCodeWithTemplate
-}
+}
+
+
+/*
+  GenerateCode will iterate through templateConfig and generate each template dependOn each templateAndData\
+
+  GenerateSchema now use for generate attribute tree only
+  generateSchema can be modify use used depend on use case eg: some objectType have attribute tree inside addOn
+    when generateSchema in own service need to generate ref objectRelationship only
+    and attribute tree service can generate schema
+
+*/

package/src/reStructure/GenerateSchema.js

@@ -0,0 +1,141 @@
+/*
+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 { join, resolve } = require("path");
+const { readFileSync } = require("fs");
+
+const schemaConfig = require("./SchemaConfig");
+
+// SourceManager
+const { deleteFileInDir, createHookFunction } = require("../SourceManager/src/Utils");
+const { createSource } = require("../SourceManager/src/CreateSource");
+
+const { SOURCE_PATH } = require('../TemplateManager/src/libs/Consts');
+
+
+
+async function generateSchema(_izContext, objSchemaPath, generateSchemaSettings) {
+  try {
+    console.log('objSchemaPath', objSchemaPath);
+    // ---------  Prepare path  -------------
+    // point to app/src
+    let saveFilePath = join(objSchemaPath, `../`);
+    console.log("saveFilePath: ", saveFilePath);
+
+    // point to root folder of service
+    let localServicePath = join(saveFilePath, "../../");
+    console.log("localServicePath: ", localServicePath);
+
+
+    //------ Start Create Source ------
+
+    // collect all result of template data for execute createSource
+    let allCreateSource = [];
+    // collect all path that need to empty before createSource
+    let allEmptyPath = [];
+
+
+    // Validate that all generateNames in generateSettings are present in the schemaConfig
+    const generateNameSet = new Set(Object.keys(schemaConfig.TemplateAndData));
+
+    // Find any missing generateNames that are not in the schemaConfig
+    let missingGenerateName = generateSchemaSettings.
+      filter(({ generateName }) => !generateNameSet.has(generateName));
+
+    // If there are missing generateNames, throw an error with the list of missing names
+    if (missingGenerateName.length) {
+      throw Error(`Invalid generateName:[ ${missingGenerateName.map(({ generateName }) => generateName).join(", ")} ]`);
+    }
+
+
+    // start create generateSchema depend on
+    for (const { generateName, settingData } of generateSchemaSettings) {
+      let generateSchemaData = require(join(__dirname, schemaConfig.TemplateAndData[generateName]));
+      let createSourceResult = await generateSchemaData(_izContext, objSchemaPath, settingData);
+
+      // Filter out empty or invalid objects before adding to allCreateSource
+      if (Array.isArray(createSourceResult)) {
+        const validResults = createSourceResult.filter(item =>
+          item && item.templatePath && item.templateData && item.setting
+        );
+        allCreateSource.push(...validResults);
+      }
+    }
+
+    // check each allCreateSource valid
+    for (let item of allCreateSource) {
+      // throw Error('Skipping invalid source item:', item);
+      if (!item || !item.templatePath || !item.templateData || !item.setting) {
+        console.log('throw Error Skipping invalid source item:', item);
+        throw Error('Skipping invalid source item:', item);
+      }
+
+      const { templatePath, templateData, setting, emptyPath: returnEmptyPath } = item;
+      setting.checkCreateSourcePass = true;
+
+      let [status, errors] = await createSource(
+        readFileSync(templatePath, 'utf8'),
+        templateData,
+        setting,
+      );
+
+      if (status === false) {
+        throw Error(errors);
+      }
+
+      allEmptyPath.push(returnEmptyPath);
+    }
+
+    // validate path before empty folder
+    for (let emptyPath of allEmptyPath) {
+      validatePathWithRootServicePath(localServicePath, emptyPath)
+    }
+
+    for (let emptyPath of allEmptyPath) {
+      await deleteFileInDir(emptyPath);
+    }
+
+
+    // generate all source
+    for (let item of allCreateSource) {
+      // throw error if item is invalid
+      if (!item || !item.templatePath || !item.templateData || !item.setting) {
+        console.log('Throwing invalid source item:', item);
+        throw Error('Throwing invalid source item:', item);
+      }
+
+      const { templatePath, templateData, setting } = item;
+      setting.checkCreateSourcePass = false;
+
+      await createSource(
+        readFileSync(templatePath, 'utf8'),
+        templateData,
+        setting,
+      );
+    }
+
+    console.log('Generated all source files successfully');
+    return 'return values';
+  } catch (error) {
+    console.error('Error generating code:', error);
+    throw error;
+  }
+}
+
+module.exports = generateSchema

package/src/reStructure/SchemaConfig.js

@@ -0,0 +1,28 @@
+/*
+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';
+
+module.exports = {
+  TemplateAndData: {
+    // ** mock schema config **
+    mainAttributeTree: './TemplateData/mainAttributeTree/generateTemplateData.js',
+  },
+  Plugin: {
+
+  }
+}

package/src/reStructure/TemplateConfig.js

@@ -1,3 +1,23 @@
+/*
+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';
+
+
 module.exports = {
   TemplateAndData: {
     // ** PerActionEndpoint **

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

@@ -0,0 +1,52 @@
+/*
+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';
+
+// Import required modules
+const { join } = require('path');
+
+const modules = {
+  mainAttributeTreeSchema: {}
+}
+/**
+ * Generates code with templates for different actions
+ * @param {Object} _izContext - Context object
+ * @param {string} objSchemaPath - Path to the schema
+ * @returns {Array} Array of generated code parameters
+ */
+async function generateCodeWithTemplate(_izContext, objSchemaPath) {
+  try {
+    const saveFilePath = join(objSchemaPath, '../');
+
+
+    // will receive objSchemaPath and prepare params for each data function
+    // then data function will return params for createSource
+
+    // (template, data, { savePath, hookPath, saveFileName, fileExtension, initialData, isAppend = false, checkCreateSourcePass = false })
+
+
+    return {
+
+    };
+  } catch (error) {
+    _izContext.logger.error('Error generating code with template perActionComplete:', error);
+    return [];
+  }
+}
+
+module.exports = generateCodeWithTemplate;

package/src/reStructure/TemplateData/attributeTreeSchema/mainAttributeTreeSchema/attributeLink.ejs

@@ -0,0 +1,21 @@
+const izara = require("@izara_project/izara-middleware");
+let { pattern } = izara.validatorSchema.stringNotEmpty(); // should not be empty string
+
+module.exports = [
+  {
+    objectType: "<%- objectType %>",
+    overWriteHandlers: { // optional, if not set will create default handlers, if empty will not create handler and main function
+      //(<overWriteHandlers<%- objectType %>>)
+      //(</overWriteHandlers<%- objectType %>>)
+    },
+    overwriteGeneratedMainFunction: [
+    //(<overwriteGeneratedMainFunction<%- objectType %>>)
+    //(</overwriteGeneratedMainFunction<%- objectType %>>)
+    ],
+    canDelete: true,
+    storageResources: <%- storageResources %>,
+    fieldNames: <%- fieldNames %>,
+    compositeKeyDeliminator: "<%- compositeKeyDeliminator %>",
+    identifiers: <%- identifiers %>
+  }
+]

package/src/reStructure/TemplateData/attributeTreeSchema/mainAttributeTreeSchema/data.js

@@ -0,0 +1,128 @@
+/*
+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, ADD_ON_DATA_STRUCTURE_TYPE, ATTRIBUTE_TAG, fieldNameSetting, FIELD_NAME_TPYE, SAVE_FILE_NAME } = require('../../libs/Consts');
+const templatePath = path.join(__dirname, "./template.ejs");
+
+function data(_izContext, objectSchema, srcPath) {
+  const createSources = [];
+  let attributeTreeObjSchemas = [];
+  if (objectSchema.hasOwnProperty("addOnDataStructure")) {
+    for (const versionedData of objectSchema.addOnDataStructure) {
+      if (versionedData.type === ADD_ON_DATA_STRUCTURE_TYPE.attributeTree) {
+        const objectType = objectSchema.objectType; // main objectType
+        const storageResources = objectSchema.storageResources // storageResource from main objectType
+        const storageResourceTag = Object.keys(storageResources) // storage ResourceTag from main objectType
+        const compositeKeyDeliminator = objectSchema.compositeKeyDeliminator
+        attributeTreeObjSchemas.push(
+          {
+            objectType: objectType + ATTRIBUTE_TAG.attributeTagLabel,
+            fieldNames: {
+              labelId: fieldNameSetting(FIELD_NAME_TPYE.identifiers)
+            },
+            identifiers: [
+              {
+                type: "identifier",
+                fieldName: "labelId"
+              }
+            ]
+          },
+          {
+            objectType: objectType + ATTRIBUTE_TAG.attributeTagLink,
+            fieldNames: {
+              [objectType + ATTRIBUTE_TAG.attributeTagLink + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.identifiers),
+              [objectType + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.requiredOnCreateFieldName),
+              topLevelParentIdentifierProperties: fieldNameSetting(FIELD_NAME_TPYE.requiredOnCreateFieldName),
+              parentNodeIdentifierLabel: fieldNameSetting(FIELD_NAME_TPYE.requiredOnCreateFieldName),
+              parentNodeIdentifierProperties: fieldNameSetting(FIELD_NAME_TPYE.requiredOnCreateFieldName),
+            },
+            identifiers: [
+              {
+                type: "identifier",
+                fieldName: `${objectType + ATTRIBUTE_TAG.attributeTagLink}Id`
+              }
+            ]
+          },
+          {
+            objectType: objectType + ATTRIBUTE_TAG.attributeTagProperty,
+            fieldNames: {
+              propertyId: fieldNameSetting(FIELD_NAME_TPYE.identifiers),
+              propertyLabelId: fieldNameSetting(FIELD_NAME_TPYE.optionalOnCreate)
+            },
+            identifiers: [
+              {
+                type: "identifier",
+                fieldName: "propertyId"
+              }
+            ]
+          },
+          {
+            objectType: objectType + ATTRIBUTE_TAG.attributeTagPropertyLabel,
+            fieldNames: {
+              propertyLabelId: fieldNameSetting(FIELD_NAME_TPYE.identifiers)
+            },
+            identifiers: [
+              {
+                type: "identifier",
+                fieldName: "propertyLabelId"
+              }
+            ]
+          }
+        )
+        for (let attributeTreeObjSchema of attributeTreeObjSchemas) {
+          Object.assign(attributeTreeObjSchema, {
+            storageResources: storageResources, // add storageResources
+            compositeKeyDeliminator: compositeKeyDeliminator
+          })
+          for (let attributeTreeFieldName of Object.values(attributeTreeObjSchema.fieldNames)) {
+            Object.assign(attributeTreeFieldName, { storageResourceTags: storageResourceTag }) // add storageResourceTags for each fieldName
+          }
+        }
+      }
+
+    }
+    // console.log("attributeTreeObjSchemas", attributeTreeObjSchemas)
+    for (const attributeTreeObjSchema of attributeTreeObjSchemas) {
+      createSources.push({
+        templatePath: templatePath,
+        templateData: {
+          fieldNames: JSON.stringify(attributeTreeObjSchema.fieldNames),
+          identifiers: JSON.stringify(attributeTreeObjSchema.identifiers),
+          objectType: attributeTreeObjSchema.objectType,
+          storageResources: JSON.stringify(attributeTreeObjSchema.storageResources),
+          compositeKeyDeliminator: attributeTreeObjSchema.compositeKeyDeliminator
+        },
+        setting: {
+          savePath: path.join(srcPath, SOURCE_PATH.generatedAttributeTree, attributeTreeObjSchema.objectType + "/"),
+          hookPath: path.join(srcPath, "schemaHook", attributeTreeObjSchema.objectType, "/"),
+          saveFileName: SAVE_FILE_NAME.attributeTreeObjectSchema,
+          fileExtension: ".js",
+          isAppend: false
+        }
+      })
+    }
+  }
+  console.log("createSources", createSources)
+  return createSources;
+}
+
+module.exports = data

package/src/reStructure/TemplateData/attributeTreeSchema/mainAttributeTreeSchema/request.json

@@ -0,0 +1,11 @@
+{
+  "objectType": "objectType",
+  "storageResources": {
+    "StorageTag": "storageTagObject"
+  },
+  "fieldNames": {
+    "fieldNames": "fieldNames"
+  },
+  "compositeKeyDeliminator": "compositeKeyDeliminator",
+  "identifiers": []
+}

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

@@ -76,7 +76,7 @@ const createExternalSnsSubscriptions = async (_izContext, allObjSchemas, allRelS
       }
     }
   }
-  console.log("snsServiceConfigArray::", snsServiceConfigArray)
+  // console.log("snsServiceConfigArray::", snsServiceConfigArray)
 
   return {
     templatePath: templatePath,

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

@@ -37,7 +37,8 @@ const {
   externalResourceSns,
   externalResourceName,
   DYNAMO_RESOURCE,
-  LAMBDA_RESOURCE
+  LAMBDA_RESOURCE,
+  SOURCE_GENERATE_IAM_ROLE
 } = require('../../../../../../../MainLibs/src/Consts');
 
 /**
@@ -105,6 +106,7 @@ function createSourceParams(_izContext, srcPath) {
       resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
       additionalResourcePermission,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {
       saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),

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

@@ -9,20 +9,7 @@
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
         - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>"]}}} # functionName of callingFlow
         - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  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 %>"
-        <%_ }) _%>
-    <%_}) _%>
+  role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

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

@@ -31,7 +31,8 @@ const {
   SAVE_FILE_NAME,
   FUNCTION_NAME,
   shortNameHandler,
-  externalResourceYaml
+  externalResourceYaml,
+  SOURCE_GENERATE_IAM_ROLE
 } = require('../../../../../../../MainLibs/src/Consts');
 
 const templatePath = path.join(__dirname, "template.ejs");
@@ -126,7 +127,8 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       handlerType,
       additionalResourcePermission,
       route,
-      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType))
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -13,20 +13,7 @@
         route: <%- route %>
         # authorizer: ${self:custom.iz_authorizerAppLevel}
       # identifierResource: 'route.request.header.Auth'
-  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 %>
-        <%_ }) _%>
-    <%_}) _%>
+  role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

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

@@ -35,7 +35,8 @@ const {
   shortNameHandler,
   defaultIamRolePerAction,
   DYNAMO_RESOURCE,
-  SHORT_FUNCTION_NAME
+  SHORT_FUNCTION_NAME,
+  SOURCE_GENERATE_IAM_ROLE
 } = require('../../../../../../../MainLibs/src/Consts');
 
 
@@ -102,6 +103,7 @@ function createSourceParams(_izContext, srcPath) {
       handlerType: handlerType,
       additionalResourcePermission: additionalResourcePermission,
       functionNameConfig: upperCase(SHORT_FUNCTION_NAME.createObjectS3Complete) + upperCase(shortNameHandler(handlerType)),
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

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

@@ -9,20 +9,7 @@
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
         - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
         - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  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 %>"
-        <%_ }) _%>
-    <%_}) _%>
+  role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

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

@@ -35,7 +35,8 @@ const {
   SAVE_FILE_NAME,
   awaitingMultipleStepsRole,
   externalResourceSns,
-  externalResourceName
+  externalResourceName,
+  SOURCE_GENERATE_IAM_ROLE
 } = require('../../../../../../../../MainLibs/src/Consts');
 
 const {
@@ -89,6 +90,7 @@ function createSourceParams(_izContext, srcPath) {
       resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
       additionalResourcePermission,
       functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {
       saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),

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

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

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

@@ -37,7 +37,8 @@ const {
   externalResourceSns,
   externalResourceName,
   DYNAMO_RESOURCE,
-  LAMBDA_RESOURCE
+  LAMBDA_RESOURCE,
+  SOURCE_GENERATE_IAM_ROLE
 } = require('../../../../../../../../MainLibs/src/Consts');
 
 const {
@@ -118,6 +119,7 @@ function createSourceParams(_izContext, srcPath) {
       resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
       additionalResourcePermission,
       functionNameConfig: upperCase("ReservedLimitComp") + upperCase(shortNameHandler(handlerType)),
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {
       saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),

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

@@ -9,20 +9,7 @@
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
         - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>"]}}} # functionName of callingFlow
         - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  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 %>"
-        <%_ }) _%>
-    <%_}) _%>
+  role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/functionYml/HdrS3/data.js

@@ -33,7 +33,8 @@ const {
   SNS_RESOURCE,
   shortNameHandler,
   FUNCTION_NAME,
-  LAMBDA_RESOURCE
+  LAMBDA_RESOURCE,
+  SOURCE_GENERATE_IAM_ROLE
 } = require('../../../../../../../../MainLibs/src/Consts');
 
 const templatePath = path.join(__dirname, "./template.ejs")
@@ -113,7 +114,8 @@ function createSourceParam(_izContext, flowSchema, srcPath) {
       additionalResourcePermission,
       resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
       bucketName,
-      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType))
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/functionYml/HdrS3/template.ejs

@@ -14,20 +14,7 @@
         #     - prefix: uploads/
         #     - suffix: .csv
         forceDeploy: true
-  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 %>
-        <%_ }) _%>
-    <%_}) _%>
+  role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){

package/src/reStructure/TemplateData/flowSchema/components/websocket/connect/functionYaml/data.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const path = require('path');
 
-const { SOURCE_PATH, SAVE_FILE_NAME, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, DYNAMO_RESOURCE, resourceNames } = require("../../../../libs/Consts");
+const { SOURCE_PATH, SAVE_FILE_NAME, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, DYNAMO_RESOURCE, resourceNames, SOURCE_GENERATE_IAM_ROLE } = require("../../../../libs/Consts");
 const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils');
 
 const templatePath = path.join(__dirname, "./template.ejs")
@@ -60,7 +60,9 @@ function createWebSocketConnectYaml(_izContext, srcPath) {
     templateData: {
       functionName,
       resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
-      additionalResourcePermission
+      additionalResourcePermission,
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
+
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/flowSchema/components/websocket/dynamoDb/ReservedTableData.js

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const path = require('path');
 const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../../../../../MainLibs/src/Consts');
 
-const templatePath = path.join(__dirname, "../../../ResourceYaml/dynamodb/template.ejs")
+const templatePath = path.join(__dirname, "../../../../resourceYaml/dynamodb/template.ejs")
 
 function data(_izContext, srcPath) {
   let resultForCreateSources = [];

package/src/reStructure/TemplateData/flowSchema/components/websocket/dynamoDb/WebSocketTaskData.js

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const path = require('path');
 const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../../../../../MainLibs/src/Consts');
 
-const templatePath = path.join(__dirname, "../../../ResourceYaml/dynamodb/template.ejs")
+const templatePath = path.join(__dirname, "../../../../resourceYaml/dynamodb/template.ejs")
 
 function data(_izContext, srcPath) {
   let resultForCreateSources = [];

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

@@ -102,6 +102,10 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
       handlerType: [],
       resources: []
     },
+    [SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role]: {
+      handlerType: [],
+      resources: {}
+    },
     Other: []
   };
   const objectTypeList = [];
@@ -177,6 +181,12 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
         templateData.additionalResourcePermission,
         groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.ProcessFindDataRole].resources
       );
+    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role)) {
+      groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role].handlerType.push(templateData);
+      processResourcePermissions(
+        templateData.additionalResourcePermission,
+        groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role].resources
+      )
     }
     else {
       // Handle other items

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

@@ -52,7 +52,7 @@ function data(_izContext, srcPath) {
       templatePath: templatePath,
       templateData: createUpdateNodeCompleteQueueName,
       setting: {
-        initialData: "Resource\n",
+        initialData: "Resources:\n",
         savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
         saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
         fileExtension: ".yml",

package/src/reStructure/libs/GenerateCodeLibs.js

@@ -0,0 +1,38 @@
+/*
+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 { join } = require("path");
+
+
+function validatePathWithRootServicePath(rootServicePath, checkPath) {
+  if (typeof (checkPath) !== "string"
+    || (typeof (checkPath) === "string" && (
+      !checkPath.startsWith(join(rootServicePath, "app"))
+      && !checkPath.startsWith(join(rootServicePath, "resource"))
+      && !checkPath.startsWith(join(rootServicePath, "layer")))
+    )
+  ) {
+    throw Error(`invalid path:${checkPath} not contain inside service`);
+  }
+}
+
+
+module.exports = {
+  validatePathWithRootServicePath
+}