@izara_project/izara-core-generate-service-code 1.0.84 → 1.0.86

package/src/emit/resource/templates/GeneratedLambdaRoleServiceConfig.ejs

@@ -56,7 +56,10 @@ export function generatedLambdaRole() {
           Effect: 'Allow',
           Action: ['sns:Publish'],
           Resource: [
-            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', 'Rbac')}`<% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', 'Rbac')}`,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ConfirmUsage_In', 'Rbac')}`,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'CancelUsage_In', 'Rbac')}`<% if (rbac) { %>,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In')}`<% } %><% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
             `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', '<%= tag %>')}`<% }); %>
           ]
         }<% } %>
@@ -75,7 +78,8 @@ export function generatedLambdaRole() {
           Effect: 'Allow',
           Action: ['sns:Publish'],
           Resource: [
-            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', 'Rbac')}`<% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', 'Rbac')}`,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In')}`<% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
             `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', '<%= tag %>')}`<% }); %>
           ]
         }

package/src/emit/resource/templates/SystemDynamoDB_Yaml.ejs

@@ -271,6 +271,8 @@ Resources:
       TimeToLiveSpecification:
         AttributeName: ttlTimestamp
         Enabled: true
+      StreamSpecification:
+        StreamViewType: NEW_AND_OLD_IMAGES
   <% } %>
   <% if (hasS3) { %>
   ReservedDataMainTable:

package/src/emit/shared/templates/FlowHandler_HdrSqs.ejs

@@ -88,7 +88,7 @@ export const main = middleware.wrap(async (event, context) => {
 
         // add argument (to invoke lambda) to passOnProperties[]
         passOnProperties.push(record.body.Message);
-        <% if (typeof usePassBack === 'undefined' ? functionName.endsWith('Complete') : usePassBack) { %>
+        <% if (typeof usePassBack === 'undefined' ? (functionName.endsWith('Complete') || functionName.endsWith('CompleteMain') || functionName.includes('Callback')) : usePassBack) { %>
         passOnProperties.push(
           callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(
             record.body.Message

package/src/emit/system/templates/WebSocketConnect_Yaml.ejs

@@ -9,7 +9,6 @@ WebSocketConnect:
         authorizer:
           arn: arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:UserAccount${self:custom.iz_stage}UserIdentityAuthorizer
           identitySource:
-            - 'route.request.header.Authorization'
             - 'route.request.querystring.access_token'
         #<#/WebSocketConnectAuthorizer#>
     - websocket:

package/src/emit/systemText/emitSystemTextSchemas.js

@@ -17,14 +17,17 @@ const RELATIONSHIP_ACTIONS = [
 ];
 const RBAC_SHARED_FLOW_TAGS = [
   'CreateTargetRole',
-  'ListTargetRole',
+  'UpdateTargetRole',
   'DeleteTargetRole',
+  'GetTargetRole',
+  'ListTargetRole',
   'CreateRolePermissions',
   'ListRolePermissions',
   'DeleteRolePermissions',
   'CreateUserRole',
   'ListUserInRoles',
-  'DeleteUserFromRole'
+  'DeleteUserFromRole',
+  'GetMyPermissions'
 ];
 
 export function systemTextSchemaManagedPaths() {

package/src/generate.js

@@ -64,12 +64,10 @@ import {
 
 export async function generate(rootPath, options = {}) {
   const startedAt = Date.now();
-  const logger = options.logger;
-  logger?.info?.(`[INFO] [Generate] STATUS=STARTED | rootPath=${rootPath}`);
+  console.log(`[INFO] [Generate] STATUS=STARTED | rootPath=${rootPath}`);
   try {
     const project = compileProject({ ...options, rootPath });
     const schemaLoadOptions = {
-      logger,
       skipValidation: options.skipValidation
     };
     const [rawObjects, relationships, flows, notifications] = await Promise.all([
@@ -92,8 +90,10 @@ export async function generate(rootPath, options = {}) {
       relationships,
       schemaBucketName
     );
-    logger?.debug?.(
-      `[DEBUG] [Generate] STATUS=SCHEMAS_LOADED | objects=${objects.length} relationships=${relationships.length} flows=${flows.length}`
+    console.log(
+      `[DEBUG] [Generate] STATUS=SCHEMAS_LOADED | ` +
+      `objects=${objects.length} ` +
+      `relationships=${relationships.length} flows=${flows.length}`
     );
     const groups = await _emitGroups({
       project,
@@ -103,10 +103,14 @@ export async function generate(rootPath, options = {}) {
       notifications,
       objectGraphServiceTags,
       relationshipGraphServiceTags,
-      logger
+      logger: options.logger
+    });
+    const scopeCounts = groups.map((group) => {
+      return `${group.scope}=${group.artifacts.length}`;
     });
-    logger?.debug?.(
-      `[DEBUG] [Generate] STATUS=ARTIFACTS_EMITTED | ${groups.map((group) => `${group.scope}=${group.artifacts.length}`).join(' ')}`
+    const emittedScopeSummary = scopeCounts.join(' ');
+    console.log(
+      `[DEBUG] [Generate] STATUS=ARTIFACTS_EMITTED | ${emittedScopeSummary}`
     );
     let files = [];
     if (groups.length > 0) {
@@ -123,14 +127,16 @@ export async function generate(rootPath, options = {}) {
       );
     }
     const durationMs = Date.now() - startedAt;
-    logger?.info?.(
-      `[INFO] [Generate] STATUS=FINISHED | files=${files.length} durationMs=${durationMs}`
+    console.log(
+      `[INFO] [Generate] STATUS=FINISHED | ` +
+      `files=${files.length} durationMs=${durationMs}`
     );
 
     return { project, durationMs, files };
   } catch (error) {
-    logger?.error?.(
-      `[ERROR] [Generate] STATUS=FAILED | durationMs=${Date.now() - startedAt}`,
+    console.log(
+      `[ERROR] [Generate] STATUS=FAILED | ` +
+      `durationMs=${Date.now() - startedAt}`,
       error
     );
     throw error;

package/src/generateResources/IntTest/generateResources/generateResources.js

@@ -103,7 +103,7 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
 
     return allCreateSource;
   } catch (error) {
-    _izContext.logger.error(
+    console.log(
       'Error generating code with template propertyNode schema:',
       error
     );

package/src/generateResources/IntTest/generateTests/generateTemplate.js

@@ -71,7 +71,7 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
 
     return allCreateSource;
   } catch (error) {
-    _izContext.logger.error(
+    console.log(
       'Error generating code with template propertyNode schema:',
       error
     );

package/src/generateResources/IntTest/upload/uploadIntTest.js

@@ -17,10 +17,16 @@ import fs from 'fs';
 import path from 'path';
 
 import { s3 } from '@izara_project/izara-core-library-s3';
-import Logger from '@izara_project/izara-core-library-logger';
+
+const consoleLogger = {
+  debug: console.log,
+  info: console.log,
+  warn: console.log,
+  error: console.error
+};
 
 const DEFAULT_BUCKET = 'integrationtest-config-us-east-2';
-const _izContext = { Logger };
+const _izContext = { logger: consoleLogger, Logger: consoleLogger };
 
 function _getAllFiles(dirPath, filePaths = []) {
   if (!fs.existsSync(dirPath)) {

package/test/createTargetRoleHandler.test.js

@@ -9,6 +9,7 @@ import { generateCreateTargetRoleHandler } from '../src/emit/rbac/generateCreate
 const roots = new Set();
 const OWN_TOPIC_FLOWS = [
   'CreateTargetRole',
+  'UpdateTargetRole',
   'CreateRolePermissions',
   'DeleteRolePermissions',
   'DeleteTargetRole',
@@ -39,7 +40,7 @@ test('generates RBAC own-topic WebSocket entries alongside their SQS handlers',
   const rootPath = await createProject(true);
   const result = await generateCreateTargetRoleHandler(rootPath);
 
-  assert.equal(result.files.length, 60);
+  assert.equal(result.files.length, 70);
   assert.match(
     await readFile(join(rootPath, result.files[0].path), 'utf8'),
     /CreateTargetRole/
@@ -48,6 +49,46 @@ test('generates RBAC own-topic WebSocket entries alongside their SQS handlers',
     await readFile(join(rootPath, result.files[0].path), 'utf8'),
     /roleName = 'owner'/
   );
+  assert.match(
+    await readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowRbac/UpdateTargetRole/source/UpdateTargetRole_Main.js'
+      ),
+      'utf8'
+    ),
+    /Cannot modify system owner role/
+  );
+  assert.match(
+    await readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowRbac/DeleteTargetRole/source/DeleteTargetRole_Main.js'
+      ),
+      'utf8'
+    ),
+    /Cannot delete system owner role/
+  );
+  assert.match(
+    await readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowRbac/GetTargetRole/source/GetTargetRole_Main.js'
+      ),
+      'utf8'
+    ),
+    /GetTargetRole/
+  );
+  assert.match(
+    await readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowRbac/GetMyPermissions/source/GetMyPermissions_Main.js'
+      ),
+      'utf8'
+    ),
+    /GetMyPermissions/
+  );
   assert.match(
     await readFile(join(rootPath, result.files[1].path), 'utf8'),
     /CreateTargetRoleHdrSqs/

package/test/crudApplicationArtifacts.test.js

@@ -357,6 +357,59 @@ test('logs warning when ObjectSchema has invalid or non-CRUD generatedBy in crud
   );
 });
 
+test('emits targetIdentifiers consistency check and fallback in Update_Main.js and Delete_Main.js', async () => {
+  const rootPath = await createProject(true);
+  await generateCrudApplicationArtifacts(rootPath, {
+    serviceTag: 'orders'
+  });
+
+  const updateMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowObjects/Update/source/Update_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(updateMain, /targetIdentifiers\.\$\{key\} must match objInstanceFull\.identifiers\.\$\{key\}/);
+  assert.match(updateMain, /if \(!objectSchema\.hasOwnProperty\('belongTo'\)\)/);
+  assert.doesNotMatch(updateMain, /requestParams\.targetIdentifiers\s*=/);
+
+  const deleteMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowObjects/Delete/source/Delete_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(deleteMain, /targetIdentifiers\.\$\{key\} must match identifiers\.\$\{key\}/);
+  assert.match(deleteMain, /if \(!objectSchema\.hasOwnProperty\('belongTo'\)\)/);
+  assert.doesNotMatch(deleteMain, /requestParams\.targetIdentifiers\s*=/);
+});
+
+test('emits targetIdentifiers passed directly to checkRbacPermission options in RBAC project', async () => {
+  const rootPath = await createRbacProject();
+  await generateCrudApplicationArtifacts(rootPath, {
+    serviceTag: 'orders'
+  });
+
+  const updateMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowObjects/Update/source/Update_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(updateMain, /checkRbacPermission\([\s\S]*targetIdentifiers,[\s\S]*rbacObjType/);
+
+  const deleteMain = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowObjects/Delete/source/Delete_Main.js'
+    ),
+    'utf8'
+  );
+  assert.match(deleteMain, /checkRbacPermission\([\s\S]*targetIdentifiers,[\s\S]*rbacObjType/);
+});
 
 async function createProject(withCrudObject) {
   const rootPath = await mkdtemp(

package/test/dynamicCrudFlowSchemas.test.js

@@ -161,6 +161,7 @@ test('generates RbacCallback and Complete for Create when RBAC and Graph are pre
   assert.deepEqual(create.flowSteps.map((step) => step.stepName), [
     'Start',
     'RbacCallback',
+    'CreateNodeCallback',
     'Complete'
   ]);
 });
@@ -186,6 +187,7 @@ test('uses the renamed RBAC callback step when Graph storage is present', async
   assert.deepEqual(create.flowSteps.map((step) => step.stepName), [
     'Start',
     'RbacCallback',
+    'CreateNodeCallback',
     'Complete'
   ]);
   assert.deepEqual(create.flowSteps[2].properties, [
@@ -221,10 +223,22 @@ test('chains RbacCallback and Complete for Update with RBAC and Graph', async ()
     'Complete'
   ]);
   assert.deepEqual(update.flowSteps[0].nextSteps, [
-    { targetType: 'ownTopic', stepName: 'RbacCallback' }
+    { targetType: 'ownTopic', stepName: 'RbacCallback' },
+    {
+      targetType: 'extTopic',
+      serviceTag: 'Rbac',
+      topicName: 'ValidatorRbac_In',
+      toStepNames: ['RbacCallback']
+    }
   ]);
   assert.deepEqual(update.flowSteps[1].nextSteps, [
-    { targetType: 'ownTopic', stepName: 'Complete' }
+    { targetType: 'ownTopic', stepName: 'Complete' },
+    {
+      targetType: 'extTopic',
+      serviceTag: 'GraphHandler',
+      topicName: 'UpdateNode_In',
+      toStepNames: ['Complete']
+    }
   ]);
   assert.deepEqual(update.flowSteps[2].properties, [
     'returnValue',

package/test/dynamicRbacFlowSchemas.test.js

@@ -10,14 +10,17 @@ import { generateDynamicRbacFlowSchemas } from '../src/emit/rbac/generateDynamic
 const projectRoots = new Set();
 const STATIC_RBAC_ACTIONS = [
   'CreateTargetRole',
-  'ListTargetRole',
+  'UpdateTargetRole',
   'DeleteTargetRole',
+  'GetTargetRole',
+  'ListTargetRole',
   'CreateRolePermissions',
   'ListRolePermissions',
   'DeleteRolePermissions',
   'CreateUserRole',
   'ListUserInRoles',
-  'DeleteUserFromRole'
+  'DeleteUserFromRole',
+  'GetMyPermissions'
 ];
 
 const STATIC_LIMIT_ACTIONS = [

package/test/publicApi.test.js

@@ -57,24 +57,28 @@ test('generate commits schemas, application artifacts, and resources in one publ
   );
 });
 
-test('generate logs its lifecycle through the supplied logger', async () => {
+test('generate logs its lifecycle through console.log', async () => {
   const rootPath = await createCrudProject();
   const messages = [];
-  const logger = Object.fromEntries(
-    ['info', 'debug', 'error'].map((level) => [
-      level,
-      (message) => messages.push(message)
-    ])
-  );
+  const originalLog = console.log;
+  console.log = (...args) => {
+    messages.push(args.join(' '));
+  };
 
-  await generate(rootPath, { logger });
+  try {
+    await generate(rootPath);
 
-  assert.match(messages[0], /STATUS=STARTED/);
-  assert.ok(messages.some((message) => /STATUS=SCHEMAS_LOADED/.test(message)));
-  assert.ok(
-    messages.some((message) => /STATUS=ARTIFACTS_EMITTED/.test(message))
-  );
-  assert.match(messages.at(-1), /STATUS=FINISHED/);
+    assert.match(messages[0], /STATUS=STARTED/);
+    assert.ok(messages.some((message) => {
+      return /STATUS=SCHEMAS_LOADED/.test(message);
+    }));
+    assert.ok(messages.some((message) => {
+      return /STATUS=ARTIFACTS_EMITTED/.test(message);
+    }));
+    assert.match(messages.at(-1), /STATUS=FINISHED/);
+  } finally {
+    console.log = originalLog;
+  }
 });
 
 test('generate commits RBAC WebSocket entries for own-topic mutation flows', async () => {

package/test/resourceArtifacts.test.js

@@ -346,6 +346,30 @@ test('emits IAM role for generated DSQ flows in generate-shared-resource.yml', a
   assert.match(role, /GeneratedDsqHdrDsq/);
 });
 
+test('emits CreateNodeCallbackHdrSqs in FlowObjectsRole when object has graph and rbac', async () => {
+  const rootPath = await createProject();
+  const schemas = join(rootPath, 'app/src/schemas');
+  await writeFile(
+    join(schemas, 'ObjectSchemas/Node.js'),
+    "export default { objectType: 'node', generatedBy: 'user', addOnDataStructure: [{ type: 'rbac' }], identifiers: [{ type: 'partitionKey', fieldName: 'nodeId' }], storageResources: { main: { storageType: 'graph', tableName: 'Nodes' } } };\n"
+  );
+  await generateResourceArtifacts(rootPath);
+
+  const iam = await readFile(
+    join(
+      rootPath,
+      'app/sls_yaml/generatedCode/source/generate-shared-resource.yml'
+    ),
+    'utf8'
+  );
+  const role = roleBlock(iam, 'FlowObjectsRole');
+  assert.match(role, /CreateNodeCallbackHdrSqs/);
+  assert.match(role, /CreateNodeCallbackHdrSqsDLQ/);
+  assert.match(role, /RolePermissions/);
+  assert.match(role, /ValidatorRbac_In/);
+  assert.match(role, /Rbac_\$\{self:custom\.iz_stage\}_ValidatorRbac_In/);
+});
+
 function roleBlock(iam, roleName) {
   const match = iam.match(
     new RegExp(