@izara_project/izara-core-generate-service-code 1.0.97 → 1.0.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.97",
+  "version": "1.0.99",
   "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/compile/flowValidator.js

@@ -9,6 +9,15 @@ export const VALID_EVENT_ENUM = [
   'generateCode'
 ];
 
+export const VALID_S3_STEP_NAMES = [
+  'CreateObject',
+  'ReservedLimit',
+  'CreatePreSignUrl',
+  'ProcessAfterUpload',
+  'ConfirmAfterUpload'
+];
+
+
 export function validateFlowSchema(flowSchema) {
   if (!flowSchema || typeof flowSchema !== 'object') {
     throw new TypeError('flowSchema must be an object');
@@ -188,14 +197,19 @@ export function validateFlowSchema(flowSchema) {
     }
   }
 
+  const flowEvents = flowSchema.event;
+  const isS3Flow = Array.isArray(flowEvents) && flowEvents.includes('s3');
+
   const steps = flowSchema.flowSteps;
   if (!Array.isArray(steps) || steps.length === 0) {
+    if (isS3Flow) {
+      return true;
+    }
     throw new Error(
       'FlowSchema validation error: flowSteps must be a non-empty array'
     );
   }
 
-  const flowEvents = flowSchema.event;
   const syncEvents = ['lambdaSyncInv', 'lambdaSyncApi'];
   let hasSyncEvent = false;
   for (const eventName of flowEvents) {
@@ -220,16 +234,28 @@ export function validateFlowSchema(flowSchema) {
   }
 
   const entryStep = steps[0];
-  if (
-    !entryStep ||
-    typeof entryStep !== 'object' ||
-    entryStep.stepName !== 'Start'
-  ) {
+  if (!entryStep || typeof entryStep !== 'object') {
     throw new Error(
-      "FlowSchema validation error: Entry step flowSteps[0] must have stepName fixed to 'Start'"
+      'FlowSchema validation error: flowSteps[0] must be an object'
     );
   }
 
+  if (isS3Flow) {
+    const validS3EntrySteps = ['Start', 'CreateObject'];
+    if (!validS3EntrySteps.includes(entryStep.stepName)) {
+      throw new Error(
+        `FlowSchema validation error: Entry step flowSteps[0] for s3 flow ` +
+        `must have stepName 'CreateObject' or 'Start', got '${entryStep.stepName}'`
+      );
+    }
+  } else {
+    if (entryStep.stepName !== 'Start') {
+      throw new Error(
+        "FlowSchema validation error: Entry step flowSteps[0] must have stepName fixed to 'Start'"
+      );
+    }
+  }
+
   if (
     entryStep.previousSteps &&
     Array.isArray(entryStep.previousSteps) &&
@@ -240,7 +266,7 @@ export function validateFlowSchema(flowSchema) {
     );
   }
 
-  if (entryStep.event) {
+  if (!isS3Flow && entryStep.event) {
     throw new Error(
       "FlowSchema validation error: Entry step flowSteps[0] must not define step-level 'event'"
     );
@@ -266,6 +292,17 @@ export function validateFlowSchema(flowSchema) {
       );
     }
 
+    if (
+      isS3Flow &&
+      step.stepName !== 'Start' &&
+      !VALID_S3_STEP_NAMES.includes(step.stepName)
+    ) {
+      throw new Error(
+        `FlowSchema validation error: flowSteps[${idx}].stepName '${step.stepName}' ` +
+        `is invalid for s3 flow. Must be one of ${JSON.stringify(VALID_S3_STEP_NAMES)}`
+      );
+    }
+
     if (step.stepName.toLowerCase().includes('checktrigger')) {
       if (
         !Array.isArray(flowSchema.triggerFlowTypes) ||

package/src/compile/loadSchemas.js

@@ -28,6 +28,7 @@ const consoleLogger = {
 
 export { resolveExtendedObjectSchemas, resolveGraphServiceTags };
 
+
 export async function loadLocalSchemaDirectory(
   project,
   directoryName,
@@ -37,7 +38,10 @@ export async function loadLocalSchemaDirectory(
   const logger = options.logger || consoleLogger;
   let entries;
   try {
-    entries = await readdir(directoryPath, { withFileTypes: true });
+    entries = await readdir(directoryPath, {
+      recursive: true,
+      withFileTypes: true
+    });
   } catch (error) {
     if (error.code === 'ENOENT') {
       return [];
@@ -45,14 +49,30 @@ export async function loadLocalSchemaDirectory(
     throw error;
   }
 
-  const validEntries = entries.filter(
-    (entry) => entry.isFile() && entry.name.endsWith('.js')
-  );
-  validEntries.sort((a, b) => a.name.localeCompare(b.name));
+  const validEntries = entries.filter((entry) => {
+    if (!entry.isFile() || !entry.name.endsWith('.js')) {
+      return false;
+    }
+    if (directoryName === 'FlowSchemas') {
+      const parentDir = entry.parentPath || entry.path || '';
+      if (parentDir.includes('generateCode')) {
+        return false;
+      }
+    }
+    return true;
+  });
+  validEntries.sort((a, b) => {
+    const aParent = a.parentPath || a.path || directoryPath;
+    const bParent = b.parentPath || b.path || directoryPath;
+    const aPath = join(aParent, a.name);
+    const bPath = join(bParent, b.name);
+    return aPath.localeCompare(bPath);
+  });
 
   const schemas = [];
   for (const entry of validEntries) {
-    const filePath = join(directoryPath, entry.name);
+    const parentDir = entry.parentPath || entry.path || directoryPath;
+    const filePath = join(parentDir, entry.name);
     const details = await stat(filePath);
     const module = await import(
       `${pathToFileURL(filePath).href}?schemaVersion=${details.mtimeMs}-${details.size}`

package/src/emit/application/coreFunction/emitCoreFunctionArtifacts.js

@@ -206,7 +206,21 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
       if (typeof flow.flowTag === 'string' && flow.flowTag) {
         roleName = flow.flowTag[0].toUpperCase() + flow.flowTag.slice(1);
       }
-      return { roleName };
+      let quotaServiceTag = flow.quotaServiceTag;
+      if (!quotaServiceTag && flow.belongTo) {
+        if (Array.isArray(flow.belongTo)) {
+          quotaServiceTag = flow.belongTo[0]?.serviceTag;
+        } else if (flow.belongTo.serviceTag) {
+          quotaServiceTag = flow.belongTo.serviceTag;
+        }
+      }
+      if (!quotaServiceTag && flow.objType?.serviceTag) {
+        quotaServiceTag = flow.objType.serviceTag;
+      }
+      if (!quotaServiceTag) {
+        quotaServiceTag = project?.serviceTag || 'Rbac';
+      }
+      return { roleName, quotaServiceTag };
     });
 
   const rbac =

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

@@ -277,7 +277,9 @@ function roleConfigs() {
             `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ConfirmUsageHdrInv', 'Rbac')}`,
             `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'CancelUsageHdrInv', 'Rbac')}`<% if (rbac) { %>,
             `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ValidatorRbacHdrInv')}`<% } %><% (rbacValidatorServiceTags || []).forEach(function(tag) { %>,
-            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ValidatorRbacHdrInv', '<%= tag %>')}`<% }); %>
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ValidatorRbacHdrInv', '<%= tag %>')}`,
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'ConfirmUsageHdrInv', '<%= tag %>')}`,
+            `arn:aws:lambda:${process.env.iz_region}:${process.env.iz_accountId}:function:${lambdaSharedLib.lambdaFunctionName(_izContext, 'CancelUsageHdrInv', '<%= tag %>')}`<% }); %>
           ]
         },
 
@@ -290,7 +292,9 @@ function roleConfigs() {
             `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 %>')}`<% }); %>
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ValidatorRbac_In', '<%= tag %>')}`,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ConfirmUsage_In', '<%= tag %>')}`,
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'CancelUsage_In', '<%= tag %>')}`<% }); %>
           ]
         },
 <% } -%>
@@ -390,7 +394,7 @@ function roleConfigs() {
           Effect: 'Allow',
           Action: ['sns:Publish'],
           Resource: [
-            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ReservedDynamicUsage_In', 'AccountLimits')}`
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ReservedDynamicUsage_In', '<%= flow.quotaServiceTag || 'Rbac' %>')}`
           ]
         },
 
@@ -399,7 +403,7 @@ function roleConfigs() {
           Effect: 'Allow',
           Action: ['sns:Publish'],
           Resource: [
-            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ConfirmDynamicAfterUpload_In', 'AccountLimits')}`
+            `arn:aws:sns:${process.env.iz_region}:${process.env.iz_accountId}:${snsSharedLib.snsTopicNameByFlowSchema(_izContext, 'ConfirmDynamicAfterUpload_In', '<%= flow.quotaServiceTag || 'Rbac' %>')}`
           ]
         }
         //(<create<%= flow.roleName %>Role>)

package/src/emit/application/crud/templates/CreateEndpoint_Main.ejs

@@ -142,9 +142,9 @@ export default async function <%- flowTag %>(
       const { checkRbacPermission } =
         await import('@izara_project/izara-authorization');
 
-      //(<rbacParameterGroups_<%- flowTag %>)
+      //(<rbacParameterGroups_<%- flowTag %>>)
       const parameterGroups = {};
-      //(</rbacParameterGroups_<%- flowTag %>)
+      //(</rbacParameterGroups_<%- flowTag %>>)
 
       const isBillable = objectSchema.addOnDataStructure?.some(
         (item) => item.type === 'rbac' && item.billable === true
@@ -187,8 +187,8 @@ export default async function <%- flowTag %>(
         );
       }
 
-      //(<rbacPublish_<%- flowTag %>)
-      //(</rbacPublish_<%- flowTag %>)
+      //(<rbacPublish_<%- flowTag %>>)
+      //(</rbacPublish_<%- flowTag %>>)
     }
     <%_ } _%>
 

package/src/emit/application/crud/templates/CreateLogicalLib.ejs

@@ -499,6 +499,24 @@ const ROOT_RBAC_OBJECT_TYPES = new Set([
 <%_ } _%>
 ]);
 
+<%_
+const objectQuotaServiceTags = {};
+for (const obj of objects || []) {
+  if (obj?.objectType) {
+    let serviceTag = null;
+    if (obj.belongTo) {
+      if (Array.isArray(obj.belongTo)) {
+        serviceTag = obj.belongTo[0]?.serviceTag || null;
+      } else if (obj.belongTo.serviceTag) {
+        serviceTag = obj.belongTo.serviceTag;
+      }
+    }
+    objectQuotaServiceTags[obj.objectType] = serviceTag;
+  }
+}
+_%>
+const OBJECT_QUOTA_SERVICE_TAGS = <%- JSON.stringify(objectQuotaServiceTags) %>;
+
 /**
  * Auto-provisions owner TargetRole for Root RBAC object after Graph and DynamoDB write
  * @param {Object} _izContext - Izara context object
@@ -772,6 +790,30 @@ export function resolveQuotaDeductionKeys(
     passBackProperties?.rbacType ||
     callingFlowConfig?.rbacType;
 
+  const objType =
+    returnValue?.requestParams?.objType ||
+    requestParams?.objType ||
+    passBackProperties?.objType;
+  let objectType = null;
+  if (typeof objType === 'string') {
+    objectType = objType;
+  } else if (objType && objType.objectType) {
+    objectType = objType.objectType;
+  }
+
+  let quotaServiceTag =
+    requestParams?.passBackProperties?.quotaServiceTag ||
+    passBackProperties?.passBackProperties?.quotaServiceTag ||
+    passBackProperties?.quotaServiceTag ||
+    callingFlowConfig?.quotaServiceTag;
+
+  if (!quotaServiceTag && objectType && OBJECT_QUOTA_SERVICE_TAGS[objectType]) {
+    quotaServiceTag = OBJECT_QUOTA_SERVICE_TAGS[objectType];
+  }
+  if (!quotaServiceTag) {
+    quotaServiceTag = process.env.iz_serviceTag;
+  }
+
   return {
     limitTag,
     flowTypeConcat,
@@ -780,7 +822,8 @@ export function resolveQuotaDeductionKeys(
     runningTotalReservedId,
     identifiersConcat,
     targetIdentifiers,
-    rbacType
+    rbacType,
+    quotaServiceTag
   };
 }
 
@@ -808,10 +851,15 @@ export async function forwardToQuotaConfirmation(
       targetFunction = 'ConfirmUsageHdrInv';
     }
 
+    let quotaServiceTag = quotaKeys.quotaServiceTag;
+    if (!quotaServiceTag) {
+      quotaServiceTag = process.env.iz_serviceTag;
+    }
+
     const functionName = await lambdaSharedLib.lambdaFunctionName(
       _izContext,
       targetFunction,
-      'Rbac'
+      quotaServiceTag
     );
 
     const forwardMessage = {
@@ -820,11 +868,15 @@ export async function forwardToQuotaConfirmation(
       callingFlowConfig
     };
 
-    _izContext.logger.debug('[CreateLogicalLib] invoking RBAC quota sync', {
-      targetFunction,
-      functionName,
-      forwardMessage
-    });
+    _izContext.logger.debug(
+      `[CreateLogicalLib] invoking ${quotaServiceTag} quota sync`,
+      {
+        targetFunction,
+        functionName,
+        quotaServiceTag,
+        forwardMessage
+      }
+    );
 
     try {
       quotaResult = await lambda.invokeSync(
@@ -842,7 +894,7 @@ export async function forwardToQuotaConfirmation(
           const cancelFunctionName = await lambdaSharedLib.lambdaFunctionName(
             _izContext,
             'CancelUsageHdrInv',
-            'Rbac'
+            quotaServiceTag
           );
           await lambda.invokeSync(
             _izContext,

package/src/emit/application/crud/templates/DeleteEndpoint_Main.ejs

@@ -144,9 +144,9 @@ export default async function <%- flowTag %>(
       const { checkRbacPermission } =
         await import('@izara_project/izara-authorization');
 
-      //(<rbacParameterGroups_<%- flowTag %>)
+      //(<rbacParameterGroups_<%- flowTag %>>)
       const parameterGroups = {};
-      //(</rbacParameterGroups_<%- flowTag %>)
+      //(</rbacParameterGroups_<%- flowTag %>>)
 
       const resultPermissionCheck = await checkRbacPermission(
         _izContext,
@@ -181,8 +181,8 @@ export default async function <%- flowTag %>(
         );
       }
 
-      //(<rbacPublish_<%- flowTag %>)
-      //(</rbacPublish_<%- flowTag %>)
+      //(<rbacPublish_<%- flowTag %>>)
+      //(</rbacPublish_<%- flowTag %>>)
     }
     <%_ } _%>
 

package/src/emit/application/crud/templates/FlowEndpoint_HdrWbs.ejs

@@ -26,7 +26,7 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 import {
   utils,
-  getObjectSchema
+  getFlowSchema
 } from '@izara_project/izara-core-library-service-schemas';
 const { createFlowTypeConcat } = utils;
 
@@ -70,7 +70,7 @@ export const main = middleware.wrap(async (event, context) => {
           let identifiers = '';
           //(</createIdentifiersFlow>)
 
-          let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+          let flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(
             event._izContext,
             {
               flowTag: '<%- flowTag %>',

package/src/emit/application/crud/templates/FlowMain_Wbs.ejs

@@ -16,7 +16,7 @@ along with this program. If not, see
 <http: //www.gnu.org/licenses />.
 */
 
-import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import { getFlowSchema } from '@izara_project/izara-core-library-service-schemas';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
@@ -53,7 +53,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       callingFlowConfig
     );
 
-    const flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+    const flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(
       _izContext,
       {
         flowTag: '<%- flowTag %>',

package/src/emit/application/crud/templates/UpdateEndpoint_Main.ejs

@@ -156,9 +156,9 @@ export default async function <%- flowTag %>(
       const { checkRbacPermission } =
         await import('@izara_project/izara-authorization');
 
-      //(<rbacParameterGroups_<%- flowTag %>)
+      //(<rbacParameterGroups_<%- flowTag %>>)
       const parameterGroups = {};
-      //(</rbacParameterGroups_<%- flowTag %>)
+      //(</rbacParameterGroups_<%- flowTag %>>)
 
       const resultPermissionCheck = await checkRbacPermission(
         _izContext,
@@ -193,8 +193,8 @@ export default async function <%- flowTag %>(
         );
       }
 
-      //(<rbacPublish_<%- flowTag %>)
-      //(</rbacPublish_<%- flowTag %>)
+      //(<rbacPublish_<%- flowTag %>>)
+      //(</rbacPublish_<%- flowTag %>>)
     }
     <%_ } _%>
 

package/src/emit/application/custom/customFlowS3.js

@@ -73,7 +73,7 @@ export async function emitS3Flow(flow, source, handlerRoot) {
             ...descriptor,
             routeName: tag,
             flowTag: flow.flowTag,
-            flowStepName: ''
+            flowStepName: action
           });
         } else if (type === 'sqs') {
           let filterPatternFunctionName = descriptor.functionName;
@@ -84,7 +84,7 @@ export async function emitS3Flow(flow, source, handlerRoot) {
             ...descriptor,
             queueName: descriptor.functionName,
             flowTag: flow.flowTag,
-            flowStepName: '',
+            flowStepName: action,
             filterPatternFunctionName
           });
         } else if (type === 's3') {
@@ -101,13 +101,13 @@ export async function emitS3Flow(flow, source, handlerRoot) {
             ...descriptor,
             bucketName: flow.bucketName,
             flowTag: flow.flowTag,
-            flowStepName: ''
+            flowStepName: action
           });
         } else {
           functionYaml = renderInvFunctionYaml({
             ...descriptor,
             flowTag: flow.flowTag,
-            flowStepName: ''
+            flowStepName: action
           });
         }
         return {

package/src/emit/application/custom/templates/FlowEndpoint_Main.ejs

@@ -247,8 +247,8 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       resultPermissionCheck
     );
 
-    //(<rbacPublish_<%- flowTag %>)
-    //(</rbacPublish_<%- flowTag %>)
+    //(<rbacPublish_<%- flowTag %>>)
+    //(</rbacPublish_<%- flowTag %>>)
 
     return resultPermissionCheck;
 <% } else { -%>

package/src/emit/application/custom/templates/s3/CreateObject_Main.ejs

@@ -16,7 +16,10 @@ along with this program. If not, see
 <http: //www.gnu.org/licenses />.
 */
 
-import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import {
+  getObjectSchema,
+  getFlowSchema
+} from '@izara_project/izara-core-library-service-schemas';
 import { consts } from '@izara_project/izara-middleware';
 
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
@@ -65,7 +68,7 @@ export default async function createObject(
 
     let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID);
 
-    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+    let flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(
       _izContext,
       {
         flowTag: '<%- flowTag %>',

package/src/emit/application/custom/templates/triggerCache/CheckTriggerCache_Main.ejs

@@ -1,4 +1,4 @@
-import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import { getFlowSchema } from '@izara_project/izara-core-library-service-schemas';
 import { triggeredCacheSharedLibV2 } from '@izara_project/izara-core-library-trigger-cache';
 
 //(<optionalRequire>)
@@ -19,7 +19,7 @@ export default async function <%- functionName %>(
     );
 
     const topicName = topicArn.split(':')[5].split('_');
-    const flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+    const flowSchema = await getFlowSchema.getFlowSchemaS3WithCache(
       _izContext,
       {
         flowTag: topicName[2],

package/src/emit/application/rbac/emitDynamicRbacFlowSchemas.js

@@ -18,7 +18,10 @@ const RBAC_CORE_FLOW_DEFINITIONS = [
 ];
 
 const LIMIT_FLOW_DEFINITIONS = [
-  { flowTag: 'ReservedDynamicUsage', event: ['ownTopic'] },
+  {
+    flowTag: 'ReservedDynamicUsage',
+    event: ['ownTopic', 'lambdaSyncInv', 'lambdaSyncApi']
+  },
   {
     flowTag: 'ConfirmUsage',
     event: ['ownTopic', 'lambdaSyncInv', 'lambdaSyncApi']