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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.84",
+  "version": "1.0.85",
   "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/emit/coreFunction/emitCoreFunctionArtifacts.js

@@ -2,6 +2,7 @@ import ejsLib from 'ejs';
 import { readFile } from 'node:fs/promises';
 
 import { customFlowNextSteps, flowHasRbac, upperFirst } from '../custom/customFlows.js';
+import { createCrudActionPlans } from '../crud/crudActionPlan.js';
 
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 const APP_ROOT = 'app/sls_yaml/generatedCode/source';
@@ -239,6 +240,9 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     };
   });
 
+  const crudPlans = createCrudActionPlans(objects);
+  const hasQuotaReservation = crudPlans?.Create?.hasQuotaReservation ?? false;
+
   const state = { 
     project, 
     objects, 
@@ -252,6 +256,7 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     crud,
     hasRelationships,
     rbac,
+    hasQuotaReservation,
     rbacValidatorServiceTags,
     s3Flows,
     hasGenerateGraph: objects.length > 0 || relationships.length > 0

package/src/emit/coreFunction/templates/InitialSetupConfig.ejs

@@ -131,7 +131,10 @@ const tableConfigs = {
   const nodeSubs = [];
   (objectGraphServiceTags || []).forEach(function(tag) {
     nodeSubs.push({ serviceTag: tag, topicName: 'UpdateNode_Out', sqsEndpoint: 'UpdateCompleteHdrSqs' });
-    nodeSubs.push({ serviceTag: tag, topicName: 'CreateNode_Out', sqsEndpoint: 'CreateCompleteHdrSqs' });
+    const createNodeEndpoint = (typeof hasQuotaReservation !== 'undefined' && hasQuotaReservation)
+      ? 'CreateNodeCallbackHdrSqs'
+      : 'CreateCompleteHdrSqs';
+    nodeSubs.push({ serviceTag: tag, topicName: 'CreateNode_Out', sqsEndpoint: createNodeEndpoint });
   });
 
   const customSubs = [];
@@ -177,8 +180,8 @@ const tableConfigs = {
   });
 
   const rbacSubs = [];
-  if (crud && typeof rbacValidatorServiceTags !== 'undefined' && rbacValidatorServiceTags && rbacValidatorServiceTags.length > 0) {
-    const allRbacTags = Array.from(new Set(['Rbac', ...rbacValidatorServiceTags]));
+  if (crud && rbac) {
+    const allRbacTags = Array.from(new Set(['Rbac', ...(typeof rbacValidatorServiceTags !== 'undefined' && rbacValidatorServiceTags ? rbacValidatorServiceTags : [])]));
     const hasGraph = typeof objectGraphServiceTags !== 'undefined' && objectGraphServiceTags && objectGraphServiceTags.length > 0;
     const createEndpoint = hasGraph ? 'CreateRbacCallbackHdrSqs' : 'CreateCompleteHdrSqs';
     const updateEndpoint = hasGraph ? 'UpdateRbacCallbackHdrSqs' : 'UpdateCompleteHdrSqs';
@@ -188,6 +191,10 @@ const tableConfigs = {
       rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: updateEndpoint });
       rbacSubs.push({ serviceTag: tag, topicName: 'ValidatorRbac_Out', sqsEndpoint: deleteEndpoint });
     });
+    if (typeof hasQuotaReservation !== 'undefined' && hasQuotaReservation) {
+      rbacSubs.push({ serviceTag: 'Rbac', topicName: 'ConfirmUsage_Out', sqsEndpoint: 'CreateCompleteHdrSqs' });
+      rbacSubs.push({ serviceTag: 'Rbac', topicName: 'CancelUsage_Out', sqsEndpoint: 'CreateCompleteHdrSqs' });
+    }
   }
 
   if (typeof customRbacFlowTags !== 'undefined' && customRbacFlowTags && customRbacFlowTags.length > 0) {
@@ -307,7 +314,9 @@ function roleConfigs() {
           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')}`<% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
             `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', '<%= tag %>')}`<% }); %>
           ]
         },

package/src/emit/crud/crudActionPlan.js

@@ -32,7 +32,9 @@ export function createCrudActionPlan(
     hasRbac: actionHasRbac,
     hasQuotaReservation,
     hasComplete: outputTopic && (actionHasRbac || hasGraph),
-    hasRbacCallback: outputTopic && actionHasRbac && hasGraph
+    hasRbacCallback: outputTopic && actionHasRbac && hasGraph,
+    hasCreateNodeCallback:
+      outputTopic && action === 'Create' && actionHasRbac && hasGraph && hasQuotaReservation
   };
 }
 

package/src/emit/crud/emitCrudApplicationArtifacts.js

@@ -80,6 +80,8 @@ export function crudApplicationManagedPaths() {
           `${source}/${action}_HdrWbs.js`,
           `${source}/${action}RbacCallback_Main.js`,
           `${source}/${action}RbacCallback_HdrSqs.js`,
+          `${source}/${action}NodeCallback_Main.js`,
+          `${source}/${action}NodeCallback_HdrSqs.js`,
           `${source}/${action}Complete_Main.js`,
           `${source}/${action}Complete_HdrSqs.js`
         );
@@ -290,12 +292,43 @@ async function emitAction(action, objects, serviceTag) {
     });
   }
 
+  if (plan.hasCreateNodeCallback) {
+    const nodeCallbackMain = `${action}NodeCallback_Main`;
+    artifacts.push(
+      {
+        path: `${source}/${nodeCallbackMain}.js`,
+        content: await render(`${action}NodeCallback_Main.ejs`, shared)
+      },
+      {
+        path: `${source}/${nodeCallbackMain.replace('_Main', '_HdrSqs')}.js`,
+        content: await renderShared('FlowHandler_HdrSqs.ejs', {
+          ...shared,
+          mainFileName: nodeCallbackMain,
+          functionName: `${action}NodeCallbackMain`,
+          queueName: `${action}NodeCallbackHdrSqs`
+        })
+      }
+    );
+    functions.push({
+      type: 'sqs',
+      functionName: `${action}NodeCallbackHdrSqs`,
+      handlerPath: `${handlerRoot}/${action}NodeCallback_HdrSqs.main`,
+      roleName: 'FlowObjectsRole',
+      queueName: `${action}NodeCallbackHdrSqs`,
+      flowTag: action,
+      flowStepName: 'CreateNodeCallback'
+    });
+  }
+
   if (plan.hasComplete) {
     const completeMain = `${action}Complete_Main`;
-    const templateName =
-      plan.hasRbac && !plan.hasGraph
-        ? 'FlowEndpointRbacCallback_Main.ejs'
-        : `${action}Complete_Main.ejs`;
+    let templateName = `${action}Complete_Main.ejs`;
+    if (plan.hasRbac && !plan.hasGraph) {
+      templateName = 'FlowEndpointRbacCallback_Main.ejs';
+    } else if (plan.hasCreateNodeCallback) {
+      templateName = 'CreateConfirmComplete_Main.ejs';
+    }
+
     const templateContext =
       plan.hasRbac && !plan.hasGraph
         ? shared

package/src/emit/crud/emitDynamicCrudFlowSchemas.js

@@ -52,19 +52,39 @@ export function emitDynamicCrudFlowSchemas({
 }
 
 function _createDynamicFlow(action, plan, serviceTag = '', initiateBy = 'user') {
+  const startNextSteps = [];
+  if (plan.hasRbacCallback) {
+    startNextSteps.push(
+      {
+        targetType: 'ownTopic',
+        stepName: 'RbacCallback'
+      },
+      {
+        targetType: 'extTopic',
+        serviceTag: 'Rbac',
+        topicName: 'ValidatorRbac_In',
+        toStepNames: ['RbacCallback']
+      }
+    );
+  } else if (plan.hasComplete) {
+    startNextSteps.push({
+      targetType: 'ownTopic',
+      stepName: 'Complete'
+    });
+    if (plan.hasGraph) {
+      startNextSteps.push({
+        targetType: 'extTopic',
+        serviceTag: 'GraphHandler',
+        topicName: `${action}Node_In`,
+        toStepNames: ['Complete']
+      });
+    }
+  }
+
   const flowSteps = [
     {
       stepName: 'Start',
-      ...(plan.hasRbacCallback || plan.hasComplete
-        ? {
-            nextSteps: [
-              {
-                targetType: 'ownTopic',
-                stepName: plan.hasRbacCallback ? 'RbacCallback' : 'Complete'
-              }
-            ]
-          }
-        : {}),
+      ...(startNextSteps.length > 0 ? { nextSteps: startNextSteps } : {}),
       properties: [],
       messageAttributes: MESSAGE_ATTRIBUTES,
       ...(plan.outputTopic
@@ -79,6 +99,22 @@ function _createDynamicFlow(action, plan, serviceTag = '', initiateBy = 'user')
   ];
 
   if (plan.hasRbacCallback) {
+    const nextStepName = plan.hasCreateNodeCallback ? 'CreateNodeCallback' : 'Complete';
+    const rbacNextSteps = [
+      {
+        targetType: 'ownTopic',
+        stepName: nextStepName
+      }
+    ];
+    if (plan.hasGraph) {
+      rbacNextSteps.push({
+        targetType: 'extTopic',
+        serviceTag: 'GraphHandler',
+        topicName: `${action}Node_In`,
+        toStepNames: [nextStepName]
+      });
+    }
+
     flowSteps.push({
       stepName: 'RbacCallback',
       event: ['extTopic'],
@@ -86,38 +122,107 @@ function _createDynamicFlow(action, plan, serviceTag = '', initiateBy = 'user')
         {
           sourceType: 'ownTopic',
           stepName: 'Start'
+        },
+        {
+          sourceType: 'extTopic',
+          serviceTag: 'Rbac',
+          topicName: 'ValidatorRbac_Out',
+          fromStepNames: ['Start']
+        }
+      ],
+      nextSteps: rbacNextSteps,
+      properties: [],
+      messageAttributes: MESSAGE_ATTRIBUTES
+    });
+  }
+
+  if (plan.hasCreateNodeCallback) {
+    flowSteps.push({
+      stepName: 'CreateNodeCallback',
+      event: ['extTopic'],
+      previousSteps: [
+        {
+          sourceType: 'ownTopic',
+          stepName: 'RbacCallback'
+        },
+        {
+          sourceType: 'extTopic',
+          serviceTag: 'GraphHandler',
+          topicName: 'CreateNode_Out',
+          fromStepNames: ['RbacCallback']
         }
       ],
       nextSteps: [
         {
           targetType: 'ownTopic',
           stepName: 'Complete'
+        },
+        {
+          targetType: 'extTopic',
+          serviceTag: 'Rbac',
+          topicName: 'ConfirmUsage_In',
+          toStepNames: ['Complete']
         }
       ],
-      properties: [],
+      properties: [
+        'returnValue',
+        'parentFlowId',
+        'status',
+        'errorsFound',
+        'graphServiceTag'
+      ],
       messageAttributes: MESSAGE_ATTRIBUTES
     });
   }
 
   if (plan.hasComplete) {
+    const prevStepName = plan.hasCreateNodeCallback
+      ? 'CreateNodeCallback'
+      : (plan.hasRbacCallback ? 'RbacCallback' : 'Start');
+
+    const completePrevSteps = [
+      {
+        sourceType: 'ownTopic',
+        stepName: prevStepName
+      }
+    ];
+
+    if (plan.hasCreateNodeCallback) {
+      completePrevSteps.push({
+        sourceType: 'extTopic',
+        serviceTag: 'Rbac',
+        topicName: 'ConfirmUsage_Out',
+        fromStepNames: ['CreateNodeCallback']
+      });
+    } else if (plan.hasGraph) {
+      completePrevSteps.push({
+        sourceType: 'extTopic',
+        serviceTag: 'GraphHandler',
+        topicName: `${action}Node_Out`,
+        fromStepNames: [prevStepName]
+      });
+    }
+
     flowSteps.push({
       stepName: 'Complete',
       event: ['extTopic'],
-      previousSteps: [
-        {
-          sourceType: 'ownTopic',
-          stepName: plan.hasRbacCallback ? 'RbacCallback' : 'Start'
-        }
-      ],
-      properties: plan.hasGraph
+      previousSteps: completePrevSteps,
+      properties: plan.hasCreateNodeCallback
         ? [
             'returnValue',
             'parentFlowId',
             'status',
-            'errorsFound',
-            'graphServiceTag'
+            'errorsFound'
           ]
-        : [],
+        : (plan.hasGraph
+            ? [
+                'returnValue',
+                'parentFlowId',
+                'status',
+                'errorsFound',
+                'graphServiceTag'
+              ]
+            : []),
       messageAttributes: MESSAGE_ATTRIBUTES
     });
   }

package/src/emit/crud/templates/CreateConfirmComplete_Main.ejs

@@ -0,0 +1,54 @@
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import snsSharedLib from '@izara_project/izara-core-library-sns';
+import { sns } from '@izara_project/izara-core-library-external-request';
+import { consts } from '@izara_project/izara-core-library-service-schemas';
+
+import {
+  buildCompletionPayload,
+  publishCompletionMessage
+} from './CreateLogicalLib.js';
+
+const { TOPIC_NAME_GENERATE_CODE } = consts;
+
+/**
+ * Handles Create flow completion by publishing final response to Calling Flow
+ * @param {Object} _izContext - Izara context object
+ * @param {Object} requestParams - Final response parameters
+ * @param {Object} passBackProperties - Pass-back properties
+ * @returns {Promise<Object>} Parent pass-back result
+ */
+export default async function CreateComplete(
+  _izContext,
+  requestParams,
+  passBackProperties
+) {
+  try {
+    _izContext.logger.debug(`[${process.env.iz_serviceTag}:CreateComplete] started`, {
+      requestParams
+    });
+
+    const callingFlowConfig =
+      requestParams?.callingFlowProperties ||
+      passBackProperties ||
+      {};
+
+    const parentPassBack =
+      requestParams?.parentPassBackProperties ||
+      requestParams?.returnValue ||
+      requestParams;
+
+    // 1. Build completion response payload and attributes
+    const { message, messageAttributes } = buildCompletionPayload(
+      callingFlowConfig,
+      parentPassBack
+    );
+
+    // 2. Publish completion notification to SNS
+    await publishCompletionMessage(_izContext, message, messageAttributes);
+
+    return parentPassBack;
+  } catch (error) {
+    _izContext.logger.error('[CreateComplete] error:', error);
+    throw error;
+  }
+}