@izara_project/izara-core-generate-service-code 1.0.61 → 1.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "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": {
@@ -18,15 +18,14 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@izara_project/izara-attribute-tree": "^1.0.15",
     "@izara_project/izara-core-library-core": "^1.0.32",
     "@izara_project/izara-core-library-logger": "^1.0.9",
-    "@izara_project/izara-core-library-s3": "^1.0.10",
-    "@izara_project/izara-property-nodes": "^1.0.16",
     "@izara_project/izara-shared-core": "^1.0.12",
     "ejs": "^5.0.1",
-    "js-beautify": "^1.15.4",
-    "yaml": "^2.9.0"
+    "js-beautify": "^2.0.3",
+    "yaml": "^2.9.0",
+    "@izara_project/izara-property-nodes": "^1.0.16",
+    "@izara_project/izara-attribute-tree": "^1.0.15"
   },
   "peerDependencies": {
     "@izara_project/izara-core-library-service-schemas": "^1.0.157",

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

@@ -2,146 +2,27 @@ import path from 'path';
 import fs from 'fs/promises';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
-import { getFlowsForGeneration } from '../src/generatedCode/Flow/_shared/shared/flowSelection.js';
+import {
+  detectRoleNames,
+  FLOW_OBJECTS_ROLE,
+  PROC_FIND_DATA_ROLE,
+  FLOW_RELATIONSHIP_ROLE
+} from '../src/generatedCode/Flow/_shared/shared/roleNameDetection.js';
 
 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, 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: 'UpdateRelationshipCompleteHdrSqs'
-    },
-    {
-      serviceTag: 'GraphHandler',
-      topicName: 'CreateRelationship_Out',
-      sqsEndpoint: 'CreateRelationshipCompleteHdrSqs'
-    },
-    {
-      serviceTag: 'GraphHandler',
-      topicName: 'DeleteRelationship_Out',
-      sqsEndpoint: 'DeleteRelationshipCompleteHdrSqs'
-    },
-    {
-      serviceTag: 'GraphHandler',
-      topicName: 'UpdateNode_Out',
-      sqsEndpoint: 'UpdateCompleteHdrSqs'
-    },
-    {
-      serviceTag: 'GraphHandler',
-      topicName: 'CreateNode_Out',
-      sqsEndpoint: 'CreateCompleteHdrSqs'
-    },
-    {
-      serviceTag: 'GraphHandler',
-      topicName: 'ChangeRelationshipType_Out',
-      sqsEndpoint: 'ChangeRelationshipCompleteHdrSqs'
-    },
-    {
-      serviceTag: 'GraphHandler',
-      topicName: 'MoveRelationship_Out',
-      sqsEndpoint: 'MoveRelationshipCompleteHdrSqs'
-    }
-  ];
-  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 HARDCODED_SUBSCRIPTIONS = [
+  { serviceTag: 'GraphHandler', topicName: 'UpdateRelationship_Out', sqsEndpoint: 'UpdateRelationshipCompleteHdrSqs' },
+  { serviceTag: 'GraphHandler', topicName: 'CreateRelationship_Out', sqsEndpoint: 'CreateRelationshipCompleteHdrSqs' },
+  { serviceTag: 'GraphHandler', topicName: 'DeleteRelationship_Out', sqsEndpoint: 'DeleteRelationshipCompleteHdrSqs' },
+  { serviceTag: 'GraphHandler', topicName: 'UpdateNode_Out', sqsEndpoint: 'UpdateCompleteHdrSqs' },
+  { serviceTag: 'GraphHandler', topicName: 'CreateNode_Out', sqsEndpoint: 'CreateCompleteHdrSqs' },
+  { serviceTag: 'GraphHandler', topicName: 'ChangeRelationshipType_Out', sqsEndpoint: 'ChangeRelationshipCompleteHdrSqs' },
+  { serviceTag: 'GraphHandler', topicName: 'MoveRelationship_Out', sqsEndpoint: 'MoveRelationshipCompleteHdrSqs' }
+];
+
+function buildLambdaRoles(flows, roleNames) {
   const lambdaRoles = [
     {
       objectType: FLOW_OBJECTS_ROLE,
@@ -170,7 +51,7 @@ export async function generateInitialSetup(allSchemas, options) {
       ]
     },
     {
-      objectType: 'ProcFindDataRole',
+      objectType: PROC_FIND_DATA_ROLE,
       additionalResourcePermission: [
         {
           effect: 'Allow',
@@ -222,18 +103,37 @@ export async function generateInitialSetup(allSchemas, options) {
     });
   }
 
-  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'
-  );
+  if (roleNames && roleNames.has(FLOW_RELATIONSHIP_ROLE)) {
+    lambdaRoles.push({
+      objectType: FLOW_RELATIONSHIP_ROLE,
+      additionalResourcePermission: [
+        {
+          effect: 'Allow',
+          action: { lambda: ['InvokeFunction'] },
+          resource: [
+            'arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, "GetRelationshipHdrInv" ,"GraphHandler")}'
+          ]
+        },
+        {
+          effect: 'Allow',
+          action: { sns: ['Publish'] },
+          resource: [
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "CreateRelationship_In", "GraphHandler")}',
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "UpdateRelationship_In", "GraphHandler")}',
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "DeleteRelationship_In", "GraphHandler")}',
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "ChangeRelationship_In", "GraphHandler")}',
+            'arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, "MoveRelationship_In", "GraphHandler")}'
+          ]
+        }
+      ]
+    });
+  }
 
-  const roleNameConfigContent = `export function generatedIntTestRoleNameConfig() {
+  return lambdaRoles;
+}
+
+function buildRoleNameConfigContent(roleNames) {
+  return `export function generatedIntTestRoleNameConfig() {
   let roleNameConfigIntTest = [
 ${Array.from(roleNames)
   .sort()
@@ -243,7 +143,57 @@ ${Array.from(roleNames)
   return roleNameConfigIntTest;
 }
 `;
-  await fs.writeFile(path.join(sourceDir, 'RoleNameConfig.js'), roleNameConfigContent, 'utf-8');
+}
+
+export async function generateInitialSetup(allSchemas, options) {
+  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 tableNameTpl = await fs.readFile(
+    path.join(__dirname, 'templates', 'InitialSetup_TableName.ejs'),
+    'utf-8'
+  );
+  const tableNameContent = ejs.render(tableNameTpl, { tableNames: [] });
+  await fs.writeFile(
+    path.join(sourceDir, 'generatedTableNameConfig.js'),
+    tableNameContent,
+    'utf-8'
+  );
+
+  const snsTpl = await fs.readFile(
+    path.join(__dirname, 'templates', 'InitialSetup_SnsService.ejs'),
+    'utf-8'
+  );
+  const snsContent = ejs.render(snsTpl, { subscriptions: HARDCODED_SUBSCRIPTIONS });
+  await fs.writeFile(
+    path.join(sourceDir, 'generatedSnsServiceConfig.js'),
+    snsContent,
+    'utf-8'
+  );
+
+  const lambdaTpl = await fs.readFile(
+    path.join(__dirname, 'templates', 'InitialSetup_LambdaRole.ejs'),
+    'utf-8'
+  );
+  const lambdaContent = ejs.render(lambdaTpl, { datas: buildLambdaRoles(flows, roleNames) });
+  await fs.writeFile(
+    path.join(sourceDir, 'generatedLambdaRoleServiceConfig.js'),
+    lambdaContent,
+    'utf-8'
+  );
+
+  await fs.writeFile(
+    path.join(sourceDir, 'RoleNameConfig.js'),
+    buildRoleNameConfigContent(roleNames),
+    '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,33 +8,40 @@ const _izContext = { logger: Logger };
 
 export function generatedLambdaRole() {
   const externalLambdaRole = [
-<% datas.forEach((data) => { %>
+<% datas.forEach((data, dataIdx) => { -%>
     {
-      roleName: "<%- data.objectType %>",
+      roleName: '<%- data.objectType.replace(/Role$/, '') %>',
       statement: [
-<% data.additionalResourcePermission.forEach((resourcePermission, resourceIdx) => { %>
+<% data.additionalResourcePermission.forEach((resourcePermission, resourceIdx) => { -%>
         {
-          "Sid": "<%- data.objectType %>Test<%- resourceIdx %>",
-          "Effect": "<%- resourcePermission.effect %>",
-          "Action": [
-<% Object.keys(resourcePermission.action).forEach((resourcePerAction) => { %>
-<% resourcePermission.action[resourcePerAction].forEach((permission) => { %>
-            "<%- resourcePerAction %>:<%- permission %>",
-<% }) %>
-<% }) %>
-          ],
-          "Resource": [
-<% resourcePermission.resource.forEach((resource) => { %>
-            `<%- resource %>`,
-<% }) %>
+          Sid: '<%- data.objectType %>Test<%- resourceIdx %>',
+          Effect: '<%- resourcePermission.effect %>',
+          Action: [<%
+            const actions = [];
+            Object.keys(resourcePermission.action).forEach((service) => {
+              resourcePermission.action[service].forEach((act) => {
+                actions.push(`'${service}:${act}'`);
+              });
+            });
+          %><%- actions.join(', ') %>],
+          Resource: [
+<%
+            const resources = [];
+            resourcePermission.resource.forEach((res) => {
+              const formattedRes = res.replace(/"/g, "'");
+              resources.push(`            \`${formattedRes}\``);
+            });
+%><%- resources.join(',\n') %>
           ]
-        },
-<% }) %>
+        }<%= (resourceIdx === data.additionalResourcePermission.length - 1) ? '' : ',\n\n' -%>
+<% }) -%>
+
         //(<create<%- data.objectType.replace(/Role$/, '') %>Role>)
         //(</create<%- data.objectType.replace(/Role$/, '') %>Role>)
       ]
-    },
-<% }) %>
+    }<%= (dataIdx === datas.length - 1) ? '' : ',\n\n' -%>
+<% }) -%>
+
     //(<additionalRole>)
     //(</additionalRole>)
   ];

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

@@ -3,13 +3,17 @@ import path from 'path';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
 import { getFlowsForGeneration } from '../src/generatedCode/Flow/_shared/shared/flowSelection.js';
-import { isRbacFlow } from '../src/generatedCode/Flow/_shared/shared/flowClassifier.js';
+import { isCrudFlow, isRbacFlow, isRelationshipFlow } from '../src/generatedCode/Flow/_shared/shared/flowClassifier.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function generateFunctionYaml(allSchemas, options) {
   console.log('  [FunctionYamlGenerator] Generating Function YAMLs...');
+  const serviceName = options.serviceName;
+  if (!serviceName) {
+    throw new Error('[Developer Error] serviceName is missing in FunctionYamlGenerator. Ensure serverless.config.yml has main_config.iz_serviceName.');
+  }
 
   const slsYamlDir = path.join(
     options.outputPath,
@@ -44,15 +48,6 @@ export async function generateFunctionYaml(allSchemas, options) {
   };
   const flows = getFlowsForGeneration(allSchemas);
 
-  const CRUD_FLOW_TAGS = ['Create', 'Update', 'Delete', 'Get'];
-  const REL_FLOW_TAGS = [
-    'createRelationship',
-    'updateRelationship',
-    'deleteRelationship',
-    'getRelationship',
-    'changeRelationship',
-    'moveRelationship'
-  ];
 
   let perActionYaml = '';
   let relActionYaml = '';
@@ -123,12 +118,8 @@ export async function generateFunctionYaml(allSchemas, options) {
     const handlerBaseName = splitFileName[0]; // e.g. ProcessCreate or CreateComplete
     const handlerSuffix = splitFileName[1]; // e.g. HdrSqs, HdrApi, HdrInv
 
-    const isCrud = CRUD_FLOW_TAGS.map(t => t.toLowerCase()).includes(
-      flowTag.toLowerCase()
-    );
-    const isRel = REL_FLOW_TAGS.map(t => t.toLowerCase()).includes(
-      flowTag.toLowerCase()
-    );
+    const isCrud = isCrudFlow(flowTag);
+    const isRel = isRelationshipFlow(flowTag);
     const isRbac =
       isRbacFlow(flowTag) ||
       String(flowTag || '')
@@ -210,7 +201,7 @@ export async function generateFunctionYaml(allSchemas, options) {
       const routesList = isCrud ? crudApiRoutes : isRel ? relApiRoutes : [];
       const actionPath = flowTag.toLowerCase().replace('relationship', '');
       apiRoutes = routesList.map(r => ({
-        path: `/TST/${r.objectName}/${actionPath}`,
+        path: `/${serviceName}/${r.objectName}/${actionPath}`,
         upperName: r.upperName
       }));
     }

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

@@ -2,40 +2,19 @@ import fs from 'fs/promises';
 import path from 'path';
 import ejs from 'ejs';
 import { fileURLToPath } from 'url';
-import { getFlowsForGeneration } from '../src/generatedCode/Flow/_shared/shared/flowSelection.js';
+import { detectRoleNames } from '../src/generatedCode/Flow/_shared/shared/roleNameDetection.js';
 
 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);
-}
+const FALLBACK_TEMPLATE = `# createIamRole
+<% roleNameConfigs.forEach(function(roleNameConfig){ _%>
+- arn:aws:iam::\${self:custom.iz_accountId}:role/\${self:custom.iz_resourcePrefix}<%- roleNameConfig %>
+<% }) _%>
+`;
 
 export async function generateRoleNameConfig(allSchemas, options) {
-  console.log(' [RoleNameConfigGenerator] Generating IAM Role Configurations...');
+  console.log('  [RoleNameConfigGenerator] Generating IAM Role Configurations...');
 
   const resourceYamlDir = path.join(
     options.outputPath,
@@ -46,62 +25,24 @@ export async function generateRoleNameConfig(allSchemas, options) {
   );
   await fs.mkdir(resourceYamlDir, { recursive: true });
 
-  const roleNameConfigs = new Set();
-  const flows = getFlowsForGeneration(allSchemas);
-
-  for (const flow of flows) {
-    if (!flow.flowTag) continue;
-
-    const upperFlowTag = upperCase(flow.flowTag);
-
-    if (CRUD_FLOW_TAGS.has(upperFlowTag)) {
-      roleNameConfigs.add(FLOW_OBJECTS_ROLE);
-      continue;
-    }
-
-    if (RBAC_FLOW_TAGS.has(upperFlowTag) || upperFlowTag.endsWith('RbacFlow')) {
-      roleNameConfigs.add('FlowRbacRole');
-      continue;
-    }
-
-    if (REL_FLOW_TAGS.has(upperFlowTag)) {
-      roleNameConfigs.add('FlowRelationshipRole');
-      continue;
-    }
-
-    if ((flow.event || []).includes('ownTopic')) {
-      roleNameConfigs.add('WebSocketMainRole');
-      // ponytail: removed continue; so custom flows with ownTopic get their own specific role
-    }
-
-    roleNameConfigs.add(`${upperFlowTag}Role`);
-  }
-
-  roleNameConfigs.add('ProcFindDataRole');
-
+  const { roleNames } = detectRoleNames(allSchemas);
+  const roleNameConfigs = Array.from(roleNames);
   const templatePath = path.join(__dirname, 'templates', 'RoleNameConfig_Yaml.ejs');
-  let templateString;
 
+  let templateString;
   try {
     templateString = await fs.readFile(templatePath, 'utf-8');
   } catch {
-    templateString = `# for createIamRole
-<% roleNameConfigs.forEach(function(roleNameConfig){ _%>
-- arn:aws:iam::\${self:custom.iz_accountId}:role/\${self:custom.iz_resourcePrefix}<%- roleNameConfig %>
-<% }) _%>
-`;
+    templateString = FALLBACK_TEMPLATE;
     await fs.mkdir(path.dirname(templatePath), { recursive: true });
     await fs.writeFile(templatePath, templateString, 'utf-8');
   }
 
-  const fileContent = ejs.render(templateString, {
-    roleNameConfigs: Array.from(roleNameConfigs)
-  });
-
+  const fileContent = ejs.render(templateString, { roleNameConfigs });
   const outputPath = path.join(resourceYamlDir, 'role-name-config.yml');
   await fs.writeFile(outputPath, fileContent, 'utf-8');
 
   console.log(
-    ` [RoleNameConfigGenerator] Wrote ${roleNameConfigs.size} role configs to ${outputPath}`
+    `  [RoleNameConfigGenerator] Wrote ${roleNameConfigs.length} role configs to ${outputPath}`
   );
 }

package/src/codeGenerators/app/sls_yaml/_policy/PolicyEmitter.js

@@ -36,8 +36,9 @@ export async function emitManagedPolicies(registry, options) {
   const tpl = await fs.readFile(templatePath, 'utf8');
 
   for (const [roleName, { statements }] of Object.entries(grouped)) {
-    const content = ejs.render(tpl, { roleName, statements });
-    const outFile = path.join(outDir, `${roleName}Policy.yml`);
+    const policyName = roleName.replace(/role$/i, '');
+    const content = ejs.render(tpl, { roleName, policyName, statements });
+    const outFile = path.join(outDir, `${policyName}Policy.yml`);
     await fs.writeFile(outFile, content, 'utf8');
   }
 

package/src/codeGenerators/app/sls_yaml/_policy/__tests__/PolicyEmitter.test.js

@@ -18,7 +18,7 @@ describe('emitManagedPolicies', () => {
     reg.add('RegisterRole', 'dynamodb:GetItem', 'arn:aws:dynamodb:*:*:table/x');
     await emitManagedPolicies(reg, { outputPath: tmpDir });
     const files = await fs.readdir(path.join(tmpDir, 'app', 'sls_yaml', 'generatedCode', 'source', 'iam-managed-policies'));
-    expect(files.sort()).toEqual(['FindDataRolePolicy.yml', 'RegisterRolePolicy.yml']);
+    expect(files.sort()).toEqual(['FindDataPolicy.yml', 'RegisterPolicy.yml']);
   });
 
   it('emits empty dir + no files when registry is empty', async () => {
@@ -34,7 +34,7 @@ describe('emitManagedPolicies', () => {
     reg.add('FindDataRole', 's3:GetObject', 'arn:aws:s3:::a/*');
     await emitManagedPolicies(reg, { outputPath: tmpDir });
     const content = await fs.readFile(
-      path.join(tmpDir, 'app', 'sls_yaml', 'generatedCode', 'source', 'iam-managed-policies', 'FindDataRolePolicy.yml'),
+      path.join(tmpDir, 'app', 'sls_yaml', 'generatedCode', 'source', 'iam-managed-policies', 'FindDataPolicy.yml'),
       'utf8'
     );
     expect(content).toContain('Type: AWS::IAM::ManagedPolicy');
@@ -47,7 +47,7 @@ describe('emitManagedPolicies', () => {
     reg.add('FindDataRole', 's3:GetObject', 'arn:aws:s3:::${self:custom.iz_serviceSchemaBucketName}/*');
     await emitManagedPolicies(reg, { outputPath: tmpDir });
     const content = await fs.readFile(
-      path.join(tmpDir, 'app', 'sls_yaml', 'generatedCode', 'source', 'iam-managed-policies', 'FindDataRolePolicy.yml'),
+      path.join(tmpDir, 'app', 'sls_yaml', 'generatedCode', 'source', 'iam-managed-policies', 'FindDataPolicy.yml'),
       'utf8'
     );
     expect(content).toContain('${self:custom.iz_serviceSchemaBucketName}');

package/src/codeGenerators/app/sls_yaml/_policy/templates/ManagedPolicy_Yaml.ejs

@@ -1,8 +1,8 @@
 Resources:
-  <%- roleName %>Policy:
+  <%- policyName %>Policy:
     Type: AWS::IAM::ManagedPolicy
     Properties:
-      ManagedPolicyName: ${self:custom.iz_resourcePrefix}<%- roleName %>Policy
+      ManagedPolicyName: ${self:custom.iz_resourcePrefix}<%- policyName %>Policy
       Description: "Managed policy for <%- roleName %> (auto-generated by PolicyEmitter)"
       PolicyDocument:
         Version: "2012-10-17"

package/src/codeGenerators/app/sls_yaml/templates/SharedResource_Yaml.ejs

@@ -18,7 +18,7 @@ Resources:
         #<#<%- roleName %>ManagedPolicyArns#>
         #<#/<%- roleName %>ManagedPolicyArns#>
       Policies:
-        - PolicyName: ${self:custom.iz_resourcePrefix}<%- roleName %>Policy
+        - PolicyName: ${self:custom.iz_resourcePrefix}<%- roleName.replace(/role$/i, '') %>Policy
           PolicyDocument:
             Version: "2012-10-17"
             Statement:

package/src/codeGenerators/app/src/generatedCode/Flow/FlowObjects/EndpointsGenerator.js

@@ -80,7 +80,7 @@ export async function generateEndpointsFlow(allSchemas, options) {
     const beforeLogicalConfigs = generateCode.filter(c => c.codeHookTag === 'beforeLogical');
     if (beforeLogicalConfigs.length > 0) {
       const beforeLogicalTemplateStr = await fs.readFile(
-        path.join(templateDir, 'FlowEndpointBeforeLogical_Main.ejs'),
+        path.join(templateDir, 'step', 'FlowEndpointBeforeLogical_Main.ejs'),
         'utf-8'
       );
       const beforeLogicalFileName = `${upperAction}BeforeLogical_Main`;

package/src/codeGenerators/app/src/generatedCode/Flow/FlowObjects/templates/crud/CreateEndpoint_Main.ejs

@@ -41,9 +41,9 @@ const { TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = consts;
 const PREFIX = {
   ONE: 'one',
   MANY: 'many',
-  CREATE_OBJECT_ASYNC: 'createObjectAsyncEndpoint',
-  CREATE_OBJECT_ASYNC_COMPLETE: 'createObjectAsyncEndpointComplete',
-  CREATE_OBJECT_EXTERNAL_TOPIC: 'createObjectExternalTopicEndpoint'
+  CREATE_OBJECT_ASYNC: 'CreateAsyncEndpoint',
+  CREATE_OBJECT_ASYNC_COMPLETE: 'CreateAsyncEndpointComplete',
+  CREATE_OBJECT_EXTERNAL_TOPIC: 'CreateExternalTopicEndpoint'
 };
 
 /**
@@ -256,13 +256,13 @@ export async function <%- flowTag %>MainLogical(
 
     // ── Create awaiting multiple steps ────────────────────────────────────────
     _izContext.logger.debug('not api will create awaitingStep');
-    await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
+    await asyncFlowSharedLib.createAwaitingMultipleSteps(
       _izContext,
-      allAwaitingStepsId,
       asyncFlowSharedLib.createPendingStepId(
         _izContext.uniqueRequestId,
         PREFIX.CREATE_OBJECT_ASYNC_COMPLETE
-      )
+      ),
+      allAwaitingStepsId,
     );
 
     // ── Process graph objects ─────────────────────────────────────────────────