@izara_project/izara-core-generate-service-code 1.0.55 → 1.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {

package/src/codeGenerators/app/initial_setup/InitialSetupGenerator.js

@@ -7,143 +7,243 @@ import { getFlowsForGeneration } from '../src/generatedCode/Flow/_shared/shared/
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+const FLOW_OBJECTS_ROLE = 'FlowObjectsRole';
+const CRUD_FLOW_TAGS = new Set(['Create', 'Update', 'Delete', 'Get']);
+const RBAC_FLOW_TAGS = new Set([
+  'CreateTargetRole',
+  'ListTargetRole',
+  'DeleteTargetRole',
+  'CreateRolePermissions',
+  'ListRolePermissions',
+  'DeleteRolePermissions',
+  'CreateUserRole',
+  'ListUserInRoles',
+  'DeleteUserFromRole'
+]);
+const REL_FLOW_TAGS = new Set([
+  'CreateRelationship',
+  'UpdateRelationship',
+  'DeleteRelationship',
+  'GetRelationship',
+  'ChangeRelationship',
+  'MoveRelationship'
+]);
+
+function upperCase(str) {
+  if (!str) return str;
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+function detectRoleNames(allSchemas) {
+  const flows = getFlowsForGeneration(allSchemas);
+  const roleNames = new Set(['ProcFindDataRole']);
+
+  for (const flow of flows) {
+    if (!flow.flowTag) continue;
+
+    const upperFlowTag = upperCase(flow.flowTag);
+
+    if (CRUD_FLOW_TAGS.has(upperFlowTag)) {
+      roleNames.add(FLOW_OBJECTS_ROLE);
+      continue;
+    }
+
+    if (RBAC_FLOW_TAGS.has(upperFlowTag) || upperFlowTag.endsWith('RbacFlow')) {
+      roleNames.add('FlowRbacRole');
+      continue;
+    }
+
+    if (REL_FLOW_TAGS.has(upperFlowTag)) {
+      roleNames.add('FlowRelationshipRole');
+      continue;
+    }
+
+    if ((flow.event || []).includes('ownTopic')) {
+      roleNames.add('WebSocketMainRole');
+      // ponytail: removed continue; so custom flows with ownTopic get their own specific role
+    }
+
+    roleNames.add(`${upperFlowTag}Role`);
+  }
+
+  return { flows, roleNames };
+}
+
 export async function generateInitialSetup(allSchemas, options) {
-    console.log('  [InitialSetupGenerator] Generating Initial Setup Scripts...');
-    const flows = getFlowsForGeneration(allSchemas);
-
-    const setupDir = path.join(options.outputPath, 'app', 'initial_setup');
-    const sourceDir = path.join(setupDir, 'generatedCode', 'source');
-    const hookDir = path.join(setupDir, 'generatedCode', 'hook');
-    
-    await fs.mkdir(sourceDir, { recursive: true });
-    await fs.mkdir(hookDir, { recursive: true });
-
-    // 1. Table Names
-    const tableNames = new Set();
-    const tableNameTpl = await fs.readFile(path.join(__dirname, 'templates', 'InitialSetup_TableName.ejs'), 'utf-8');
-    const tableNameContent = ejs.render(tableNameTpl, { tableNames: Array.from(tableNames) });
-    await fs.writeFile(path.join(sourceDir, 'generatedTableNameConfig.js'), tableNameContent, 'utf-8');
-
-    // 2. SNS Subscriptions
-    const hardcodedSubscriptions = [
-        { serviceTag: "GraphHandler", topicName: "UpdateRelationship_Out", sqsEndpoint: "UpdateRelationshipComplete" },
-        { serviceTag: "GraphHandler", topicName: "CreateRelationship_Out", sqsEndpoint: "CreateRelationshipComplete" },
-        { serviceTag: "GraphHandler", topicName: "DeleteRelationship_Out", sqsEndpoint: "DeleteRelationshipComplete" },
-        { serviceTag: "GraphHandler", topicName: "UpdateNode_Out", sqsEndpoint: "UpdateNodeComplete" },
-        { serviceTag: "GraphHandler", topicName: "CreateNode_Out", sqsEndpoint: "CreateObjectComplete" },
-        { serviceTag: "GraphHandler", topicName: "ChangeRelationshipType_Out", sqsEndpoint: "ChangeRelationshipComplete" },
-        { serviceTag: "GraphHandler", topicName: "MoveRelationship_Out", sqsEndpoint: "MoveRelationshipComplete" }
-    ];
-
-    const snsTpl = await fs.readFile(path.join(__dirname, 'templates', 'InitialSetup_SnsService.ejs'), 'utf-8');
-    const snsContent = ejs.render(snsTpl, { subscriptions: hardcodedSubscriptions });
-    await fs.writeFile(path.join(sourceDir, 'generatedSnsServiceConfig.js'), snsContent, 'utf-8');
-
-    // 3. Lambda Roles
-    const lambdaRoles = [
+  console.log(' [InitialSetupGenerator] Generating Initial Setup Scripts...');
+
+  const { flows, roleNames } = detectRoleNames(allSchemas);
+  const setupDir = path.join(options.outputPath, 'app', 'initial_setup');
+  const sourceDir = path.join(setupDir, 'generatedCode', 'source');
+  const hookDir = path.join(setupDir, 'generatedCode', 'hook');
+
+  await fs.mkdir(sourceDir, { recursive: true });
+  await fs.mkdir(hookDir, { recursive: true });
+
+  const tableNames = new Set();
+  const tableNameTpl = await fs.readFile(
+    path.join(__dirname, 'templates', 'InitialSetup_TableName.ejs'),
+    'utf-8'
+  );
+  const tableNameContent = ejs.render(tableNameTpl, {
+    tableNames: Array.from(tableNames)
+  });
+  await fs.writeFile(
+    path.join(sourceDir, 'generatedTableNameConfig.js'),
+    tableNameContent,
+    'utf-8'
+  );
+
+  const hardcodedSubscriptions = [
+    {
+      serviceTag: 'GraphHandler',
+      topicName: 'UpdateRelationship_Out',
+      sqsEndpoint: 'UpdateRelationshipComplete'
+    },
+    {
+      serviceTag: 'GraphHandler',
+      topicName: 'CreateRelationship_Out',
+      sqsEndpoint: 'CreateRelationshipComplete'
+    },
+    {
+      serviceTag: 'GraphHandler',
+      topicName: 'DeleteRelationship_Out',
+      sqsEndpoint: 'DeleteRelationshipComplete'
+    },
+    {
+      serviceTag: 'GraphHandler',
+      topicName: 'UpdateNode_Out',
+      sqsEndpoint: 'UpdateComplete'
+    },
+    {
+      serviceTag: 'GraphHandler',
+      topicName: 'CreateNode_Out',
+      sqsEndpoint: 'CreateComplete'
+    },
+    {
+      serviceTag: 'GraphHandler',
+      topicName: 'ChangeRelationshipType_Out',
+      sqsEndpoint: 'ChangeRelationshipComplete'
+    },
+    {
+      serviceTag: 'GraphHandler',
+      topicName: 'MoveRelationship_Out',
+      sqsEndpoint: 'MoveRelationshipComplete'
+    }
+  ];
+  const snsTpl = await fs.readFile(
+    path.join(__dirname, 'templates', 'InitialSetup_SnsService.ejs'),
+    'utf-8'
+  );
+  const snsContent = ejs.render(snsTpl, { subscriptions: hardcodedSubscriptions });
+  await fs.writeFile(
+    path.join(sourceDir, 'generatedSnsServiceConfig.js'),
+    snsContent,
+    'utf-8'
+  );
+
+  const lambdaRoles = [
+    {
+      objectType: FLOW_OBJECTS_ROLE,
+      additionalResourcePermission: [
+        {
+          effect: 'Allow',
+          action: { lambda: ['InvokeFunction'] },
+          resource: [
+            'arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, "GetNodeHdrInv" ,"GraphHandler")}'
+          ]
+        },
         {
-            objectType: "PerActionEndpoint",
-            additionalResourcePermission: [
-                {
-                    effect: "Allow",
-                    action: { "lambda": ["InvokeFunction"] },
-                    resource: ["arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, \"GetNodeHdrInv\" ,\"GraphHandler\")}"]
-                },
-                {
-                    effect: "Allow",
-                    action: { "sns": ["Publish"] },
-                    resource: ["arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, \"UpdateNode_In\", \"GraphHandler\")}"]
-                },
-                {
-                    effect: "Allow",
-                    action: { "sns": ["Publish"] },
-                    resource: ["arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, \"CreateNode_In\", \"GraphHandler\")}"]
-                }
-            ]
+          effect: 'Allow',
+          action: { sns: ['Publish'] },
+          resource: [
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "UpdateNode_In", "GraphHandler")}'
+          ]
         },
         {
-            objectType: "ProcFindData",
-            additionalResourcePermission: [
-                {
-                    effect: "Allow",
-                    action: { "lambda": ["InvokeFunction"] },
-                    resource: ["arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, \"GetNodeHdrInv\" ,\"GraphHandler\")}"]
-                }
-            ]
+          effect: 'Allow',
+          action: { sns: ['Publish'] },
+          resource: [
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "CreateNode_In", "GraphHandler")}'
+          ]
         }
-    ];
-
-    if (flows.length > 0) {
-        for (const flow of flows) {
-            if (flow.event && flow.event.includes('s3')) {
-                lambdaRoles.push({
-                    objectType: "FlowSchemaUploadS3Role",
-                    additionalResourcePermission: [
-                        {
-                            effect: "Allow",
-                            action: { "sns": ["Publish"] },
-                            resource: ["arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, \"ReservedDynamicUsage_In\", \"AccountLimits\")}"]
-                        },
-                        {
-                            effect: "Allow",
-                            action: { "lambda": ["InvokeFunction"] },
-                            resource: ["arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, \"StaticLimitProcessHdrInv\" ,\"AccountLimits\")}"]
-                        },
-                        {
-                            effect: "Allow",
-                            action: { "sns": ["Publish"] },
-                            resource: ["arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, \"CancelUsage_In\", \"AccountLimits\")}"]
-                        },
-                        {
-                            effect: "Allow",
-                            action: { "sns": ["Publish"] },
-                            resource: [
-                                "arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, \"ReservedDynamicUsageComplet_Out\", \"AccountLimits\")}",
-                                "arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, \"ConfirmUsage_In\", \"AccountLimits\")}"
-                            ]
-                        }
-                    ]
-                });
-            }
+      ]
+    },
+    {
+      objectType: 'ProcFindDataRole',
+      additionalResourcePermission: [
+        {
+          effect: 'Allow',
+          action: { lambda: ['InvokeFunction'] },
+          resource: [
+            'arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, "GetNodeHdrInv" ,"GraphHandler")}'
+          ]
         }
+      ]
     }
+  ];
 
-    const lambdaTpl = await fs.readFile(path.join(__dirname, 'templates', 'InitialSetup_LambdaRole.ejs'), 'utf-8');
-    const lambdaContent = ejs.render(lambdaTpl, { datas: lambdaRoles });
-    await fs.writeFile(path.join(sourceDir, 'generatedLambdaRoleServiceConfig.js'), lambdaContent, 'utf-8');
-
-    // 4. RoleNameConfig.js
-    const roleNameConfigs = new Set();
-    const upperCase = (str) => {
-        if (!str) return str;
-        return str.charAt(0).toUpperCase() + str.slice(1);
-    };
-
-    if (flows.length > 0) {
-        for (const flow of flows) {
-            if (flow.flowTag) {
-                roleNameConfigs.add(upperCase(flow.flowTag));
-            }
+  for (const flow of flows) {
+    if (!flow.event || !flow.event.includes('s3')) continue;
+
+    lambdaRoles.push({
+      objectType: 'FlowSchemaUploadS3Role',
+      additionalResourcePermission: [
+        {
+          effect: 'Allow',
+          action: { sns: ['Publish'] },
+          resource: [
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "ReservedDynamicUsage_In", "AccountLimits")}'
+          ]
+        },
+        {
+          effect: 'Allow',
+          action: { lambda: ['InvokeFunction'] },
+          resource: [
+            'arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, "StaticLimitProcessHdrInv" ,"AccountLimits")}'
+          ]
+        },
+        {
+          effect: 'Allow',
+          action: { sns: ['Publish'] },
+          resource: [
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "CancelUsage_In", "AccountLimits")}'
+          ]
+        },
+        {
+          effect: 'Allow',
+          action: { sns: ['Publish'] },
+          resource: [
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "ReservedDynamicUsageComplet_Out", "AccountLimits")}',
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "ConfirmUsage_In", "AccountLimits")}'
+          ]
         }
-    }
-    roleNameConfigs.add('ProcFindData');
-    if (flows.length > 0 && flows.some(f => f.event && f.event.includes('webSocket'))) {
-        roleNameConfigs.add('WebSocketMain');
-    }
-    roleNameConfigs.add('PerActionEndpoint');
-    roleNameConfigs.add('Register');
-    roleNameConfigs.add('ObjectCom');
-    roleNameConfigs.add('RelationshipCom');
-    roleNameConfigs.add('Relationship');
+      ]
+    });
+  }
+
+  const lambdaTpl = await fs.readFile(
+    path.join(__dirname, 'templates', 'InitialSetup_LambdaRole.ejs'),
+    'utf-8'
+  );
+  const lambdaContent = ejs.render(lambdaTpl, { datas: lambdaRoles });
+  await fs.writeFile(
+    path.join(sourceDir, 'generatedLambdaRoleServiceConfig.js'),
+    lambdaContent,
+    'utf-8'
+  );
 
-    const roleNameConfigContent = `export function generatedIntTestRoleNameConfig() {
+  const roleNameConfigContent = `export function generatedIntTestRoleNameConfig() {
   let roleNameConfigIntTest = [
-${Array.from(roleNameConfigs).map(r => `        "${r}",`).join('\n')}
+${Array.from(roleNames)
+  .sort()
+  .map(roleName => `    "${roleName}",`)
+  .join('\n')}
   ];
   return roleNameConfigIntTest;
 }
 `;
-    await fs.writeFile(path.join(sourceDir, 'RoleNameConfig.js'), roleNameConfigContent, 'utf-8');
+  await fs.writeFile(path.join(sourceDir, 'RoleNameConfig.js'), roleNameConfigContent, 'utf-8');
 
-    console.log(`  [InitialSetupGenerator] Wrote initial_setup scripts to ${sourceDir}`);
+  console.log(` [InitialSetupGenerator] Wrote initial_setup scripts to ${sourceDir}`);
 }

package/src/codeGenerators/app/initial_setup/templates/InitialSetup_LambdaRole.ejs

@@ -8,7 +8,7 @@ const _izContext = { logger: Logger };
 
 export function generatedLambdaRole() {
   const externalLambdaRole = [
-<% datas.forEach((data, dataIndex) => { %>
+<% datas.forEach((data) => { %>
     {
       roleName: "<%- data.objectType %>",
       statement: [
@@ -17,21 +17,21 @@ export function generatedLambdaRole() {
           "Sid": "<%- data.objectType %>Test<%- resourceIdx %>",
           "Effect": "<%- resourcePermission.effect %>",
           "Action": [
-<% Object.keys(resourcePermission.action).forEach(resourcePerAction => { %>
-<% resourcePermission.action[resourcePerAction].forEach(permission => { %>
+<% Object.keys(resourcePermission.action).forEach((resourcePerAction) => { %>
+<% resourcePermission.action[resourcePerAction].forEach((permission) => { %>
             "<%- resourcePerAction %>:<%- permission %>",
 <% }) %>
 <% }) %>
           ],
           "Resource": [
-<% resourcePermission.resource.forEach(resource => { %>
+<% resourcePermission.resource.forEach((resource) => { %>
             `<%- resource %>`,
 <% }) %>
           ]
         },
 <% }) %>
-        //(<create<%- data.objectType %>Role>)
-        //(</create<%- data.objectType %>Role>)
+        //(<create<%- data.objectType.replace(/Role$/, '') %>Role>)
+        //(</create<%- data.objectType.replace(/Role$/, '') %>Role>)
       ]
     },
 <% }) %>

package/src/codeGenerators/app/sls_yaml/FindDataYamlGenerator.js

@@ -12,7 +12,7 @@ export async function generateFindDataYaml(options) {
     path.join(__dirname, 'templates', 'FindData_Yaml.ejs'),
     path.join(options.outputPath, 'app', 'sls_yaml', 'generatedCode', 'source', 'find-data.yml'),
     {
-      functionName: 'FindData',
+      functionName: 'FindDataHdrSqs',
       handlerPath: 'src/generatedCode/FindData/source/FindData_HdrSqs.main',
       roleName: 'ProcFindData',
       upperFunctionName: 'FINDDATA',