@izara_project/izara-core-generate-service-code 1.0.87 → 1.0.89

package/src/emit/rbac/templates/ConfirmUsage_Main.ejs

@@ -170,20 +170,40 @@ export default async function ConfirmUsage(_izContext, requestParams) {
       ).catch(() => null);
     }
 
-    await sns.publishMessage(_izContext, {
-      message: {
-        returnResult: {
-          status: true,
-          uniqueIdentify: usedTimestampId,
-          usedTimestampId,
-          runningTotalReservedId
-        }
-      },
-      TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
-        _izContext,
-        'ConfirmUsage_Out'
-      )
-    });
+    const returnResult = {
+      status: true,
+      uniqueIdentify: usedTimestampId,
+      usedTimestampId,
+      runningTotalReservedId
+    };
+
+    const eventSourceTag =
+      _izContext.izEventSource?.eventSourceTag ||
+      requestParams?.izEventSource?.eventSourceTag;
+
+    let isSync = false;
+    if (
+      eventSourceTag === 'DirectInvoke' ||
+      eventSourceTag === 'ApiGateway' ||
+      eventSourceTag === 'ApiGatewayV2' ||
+      requestParams?.hasOwnProperty('__context__')
+    ) {
+      isSync = true;
+    }
+
+    if (!isSync) {
+      await sns.publishMessage(_izContext, {
+        message: {
+          returnResult
+        },
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          'ConfirmUsage_Out'
+        )
+      });
+    }
+
+    return returnResult;
   } catch (error) {
     _izContext.logger.error(`[${process.env.iz_serviceTag}:ConfirmUsage] error:`, error);
     throw error;

package/src/emit/resource/emitResourceArtifacts.js

@@ -12,10 +12,7 @@ import {
 } from '../custom/customFlows.js';
 import { hasSystemWebSocket } from '../system/emitSystemWebSocketArtifacts.js';
 import { rbacFlowTag } from '../rbac/rbacFlowTag.js';
-import {
-  CRUD_ACTIONS,
-  createCrudActionPlans
-} from '../crud/crudActionPlan.js';
+import { CRUD_ACTIONS, createCrudActionPlans } from '../crud/crudActionPlan.js';
 
 const TEMPLATE_URL = new URL('./templates/', import.meta.url);
 const RESOURCE_ROOT = 'resource/sls_yaml/generatedCode/source';
@@ -208,7 +205,7 @@ function createResourceState({ objects, relationships, flows }) {
   const crud = objects.some(isCrudObject);
   const selfRbac = objects.some(hasSelfRbacAddOn);
   const rbac = objects.some(hasSelfRbacAddOn);
-  const crudActionPlans = createCrudActionPlans(objects);
+  const crudActionPlans = createCrudActionPlans(objects, flows);
 
   const crudOwnTopics = crud ? [...CRUD_ACTIONS] : [];
   const crudSqsQueues = [];
@@ -218,21 +215,26 @@ function createResourceState({ objects, relationships, flows }) {
       if (plan.hasCreateNodeCallback) {
         crudSqsQueues.push(`${action}NodeCallbackHdrSqs`);
       }
+      if (plan.hasBeforeHookCallback) {
+        crudSqsQueues.push(`${action}BeforeHookCallbackHdrSqs`);
+      }
+      if (plan.hasAfterHookCallback) {
+        crudSqsQueues.push(`${action}AfterHookCallbackHdrSqs`);
+      }
       if (plan.hasComplete) {
         crudSqsQueues.push(`${action}CompleteHdrSqs`);
       }
     }
   }
 
-  const relationshipOwnTopics = relationships.length > 0
-    ? [...RELATIONSHIP_ACTIONS]
-    : [];
-  const relationshipSqsQueues = relationships.length > 0
-    ? RELATIONSHIP_ACTIONS.map((action) => `${action}CompleteHdrSqs`)
-    : [];
-  const relationshipDsqQueues = relationships.length > 0
-    ? ['GetRelationshipHdrDsq']
-    : [];
+  const relationshipOwnTopics =
+    relationships.length > 0 ? [...RELATIONSHIP_ACTIONS] : [];
+  const relationshipSqsQueues =
+    relationships.length > 0
+      ? RELATIONSHIP_ACTIONS.map((action) => `${action}CompleteHdrSqs`)
+      : [];
+  const relationshipDsqQueues =
+    relationships.length > 0 ? ['GetRelationshipHdrDsq'] : [];
 
   const rbacOwnTopics = [];
   const rbacSqsQueues = [];
@@ -308,9 +310,7 @@ function createResourceState({ objects, relationships, flows }) {
   const systemOwnTopics = ['ProcessLogical', 'FindData'];
   const systemSqsQueues = [
     'PaginateProcessLogicalHdrSqs',
-    ...(websocket
-      ? ['WebSocketCompleteHdrSqs', 'RegisterCompleteHdrSqs']
-      : [])
+    ...(websocket ? ['WebSocketCompleteHdrSqs', 'RegisterCompleteHdrSqs'] : [])
   ];
   const systemDsqQueues = ['PaginateProcessLogicalHdrDsq'];
 
@@ -348,9 +348,7 @@ function createResourceState({ objects, relationships, flows }) {
       ...flowExtTopicSteps(flows).map(({ flow }) =>
         customFlowRoleName(flow.flowTag)
       ),
-      ...flowDsqSteps(flows).map(({ flow }) =>
-        customFlowRoleName(flow.flowTag)
-      )
+      ...flowDsqSteps(flows).map(({ flow }) => customFlowRoleName(flow.flowTag))
     ])
   ];
   const webSocketRoles = new Set();
@@ -400,9 +398,9 @@ function createResourceState({ objects, relationships, flows }) {
       const outputTopicStr =
         typeof flow.outputTopic === 'string' ? flow.outputTopic : null;
       const topicName = outputTopicStr
-        ? (outputTopicStr.startsWith('Out')
+        ? outputTopicStr.startsWith('Out')
           ? outputTopicStr
-          : `Out${upperFirst(outputTopicStr)}`)
+          : `Out${upperFirst(outputTopicStr)}`
         : flow.s3Subscription?.topicName || 'OutCreate';
       const queueName =
         flow.s3Subscription?.queueName || `${tag}ReservedLimitHdrSqs`;
@@ -555,9 +553,7 @@ async function renderResourceGroup({
   if (!hasResources) return '';
 
   const chunks = await Promise.all([
-    ...ownTopics.map((queueName) =>
-      render('ResourceYaml.ejs', { queueName })
-    ),
+    ...ownTopics.map((queueName) => render('ResourceYaml.ejs', { queueName })),
     ...sqsQueues.map((queueName) =>
       render('ResourceSqsYaml.ejs', { queueName })
     ),
@@ -571,13 +567,12 @@ async function renderResourceGroup({
     )
   );
   const s3Subs = await Promise.all(
-    s3Subscriptions.map(
-      ({ subscriptionName, topicName, queueName }) =>
-        render('S3Subscription_Yaml.ejs', {
-          subscriptionName,
-          topicName,
-          queueName
-        })
+    s3Subscriptions.map(({ subscriptionName, topicName, queueName }) =>
+      render('S3Subscription_Yaml.ejs', {
+        subscriptionName,
+        topicName,
+        queueName
+      })
     )
   );
   const parts = [chunks.join('\n')];
@@ -631,7 +626,9 @@ async function renderSystemInSqs(state) {
 async function renderOut(state) {
   const body = (
     await Promise.all(
-      state.outTopics.map((topicName) => render('FlowOut_Yaml.ejs', { topicName }))
+      state.outTopics.map((topicName) =>
+        render('FlowOut_Yaml.ejs', { topicName })
+      )
     )
   ).join('\n');
   return `Resources:\n${indentYaml(body, 2)}`;
@@ -700,15 +697,11 @@ function roleStatements(state, roleName) {
   if (roleNeedsSchemaRead(state, roleName)) {
     statements.push({
       action: ['s3:GetObject'],
-      resource: [
-        'arn:aws:s3:::${self:custom.iz_serviceSchemaBucketName}/*'
-      ]
+      resource: ['arn:aws:s3:::${self:custom.iz_serviceSchemaBucketName}/*']
     });
     statements.push({
       action: ['s3:ListBucket'],
-      resource: [
-        'arn:aws:s3:::${self:custom.iz_serviceSchemaBucketName}'
-      ]
+      resource: ['arn:aws:s3:::${self:custom.iz_serviceSchemaBucketName}']
     });
   }
   addStatement(statements, dynamoActionsForRole(roleName), [
@@ -736,7 +729,10 @@ function roleStatements(state, roleName) {
   addStatement(
     statements,
     ['lambda:InvokeFunction'],
-    roleExternalLambdaArns(state, roleName)
+    [
+      ...roleExternalLambdaArns(state, roleName),
+      ...roleHookLambdaArns(state, roleName)
+    ]
   );
   if (state.webSocketRoles.has(roleName)) {
     statements.push({
@@ -807,7 +803,8 @@ function roleTableNames(state, roleName) {
   const tables = [];
   if (includesEvent(flow, 'ownTopic') || includesEvent(flow, 's3'))
     tables.push('WebSocketTask');
-  if (includesEvent(flow, 's3')) tables.push('UserUploadRecords', 'ReservedDataMain');
+  if (includesEvent(flow, 's3'))
+    tables.push('UserUploadRecords', 'ReservedDataMain');
   if (flow.statusType === 'storedCache') {
     const object = state.objectTablesByType.get(flow.objType?.objectType);
     if (object) tables.push(object);
@@ -817,7 +814,12 @@ function roleTableNames(state, roleName) {
 
 function dynamoActionsForRole(roleName) {
   if (roleName === 'ProcFindDataRole')
-    return ['dynamodb:GetItem', 'dynamodb:Query', 'dynamodb:UpdateItem'];
+    return [
+      'dynamodb:GetItem',
+      'dynamodb:PutItem',
+      'dynamodb:Query',
+      'dynamodb:UpdateItem'
+    ];
   if (roleName === 'WebSocketMainRole')
     return ['dynamodb:DeleteItem', 'dynamodb:PutItem', 'dynamodb:Query'];
   if (roleName === 'FlowRbacRole' || roleName === 'FlowObjectsRole')
@@ -847,12 +849,10 @@ function roleQueueNames(state, roleName) {
       if (!plan.outputTopic) return [];
       return [
         `${action}HdrSqs`,
-        ...(plan.hasCreateNodeCallback
-          ? [`${action}NodeCallbackHdrSqs`]
-          : []),
-        ...(plan.hasRbacCallback
-          ? [`${action}RbacCallbackHdrSqs`]
-          : []),
+        ...(plan.hasCreateNodeCallback ? [`${action}NodeCallbackHdrSqs`] : []),
+        ...(plan.hasBeforeHookCallback ? [`${action}BeforeHookCallbackHdrSqs`] : []),
+        ...(plan.hasAfterHookCallback ? [`${action}AfterHookCallbackHdrSqs`] : []),
+        ...(plan.hasRbacCallback ? [`${action}RbacCallbackHdrSqs`] : []),
         ...(plan.hasComplete ? [`${action}CompleteHdrSqs`] : [])
       ];
     });
@@ -923,9 +923,13 @@ function roleDlqQueueNames(state, roleName) {
 
 function roleTopicNames(state, roleName) {
   if (roleName === 'ProcFindDataRole')
-    return state.outTopics.filter((topic) => topic === 'FindData').map((t) => `${t}_Out`);
+    return state.outTopics
+      .filter((topic) => topic === 'FindData')
+      .map((t) => `${t}_Out`);
   if (roleName === 'FlowObjectsRole') {
-    const actions = state.outTopics.filter((topic) => CRUD_ACTIONS.includes(topic));
+    const actions = state.outTopics.filter((topic) =>
+      CRUD_ACTIONS.includes(topic)
+    );
     const topics = [];
     for (const action of actions) {
       if (action === 'Get') {
@@ -937,10 +941,29 @@ function roleTopicNames(state, roleName) {
     if (state.rbac) {
       topics.push('ValidatorRbac_In');
     }
-    return topics;
+    for (const action of ['Create', 'Update', 'Delete']) {
+      const plan = state.crudActionPlans?.[action];
+      if (plan?.hasBeforeHookAsync) {
+        for (const hook of plan.beforeHooks) {
+          if (hook?.generatedCodeConfig?.invocationType === 'ownTopic') {
+            topics.push(`${upperFirst(hook.flowTag)}_In`);
+          }
+        }
+      }
+      if (plan?.hasAfterHookAsync) {
+        for (const hook of plan.afterHooks) {
+          if (hook?.generatedCodeConfig?.invocationType === 'ownTopic') {
+            topics.push(`${upperFirst(hook.flowTag)}_In`);
+          }
+        }
+      }
+    }
+    return [...new Set(topics)];
   }
   if (roleName === 'FlowRelationshipRole') {
-    const actions = state.outTopics.filter((topic) => RELATIONSHIP_ACTIONS.includes(topic));
+    const actions = state.outTopics.filter((topic) =>
+      RELATIONSHIP_ACTIONS.includes(topic)
+    );
     const topics = [];
     for (const action of actions) {
       if (action === 'GetRelationship') {
@@ -955,7 +978,9 @@ function roleTopicNames(state, roleName) {
     return topics;
   }
   if (roleName === 'FlowRbacRole') {
-    const actions = state.outTopics.filter((topic) => RBAC_ACTIONS.includes(topic));
+    const actions = state.outTopics.filter((topic) =>
+      RBAC_ACTIONS.includes(topic)
+    );
     const topics = [];
     for (const action of actions) {
       if (action.startsWith('List')) {
@@ -1077,8 +1102,15 @@ function roleExternalLambdaArns(state, roleName) {
     (tag) =>
       `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:${tag}\${self:custom.iz_stage}ValidatorRbacHdrInv`
   );
+  if (roleName === 'FlowObjectsRole') {
+    return [
+      `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:Rbac\${self:custom.iz_stage}ValidatorRbacHdrInv`,
+      `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:Rbac\${self:custom.iz_stage}ConfirmUsageHdrInv`,
+      `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:Rbac\${self:custom.iz_stage}CancelUsageHdrInv`,
+      ...extraLambdas
+    ];
+  }
   if (
-    roleName === 'FlowObjectsRole' ||
     roleName === 'FlowRbacRole' ||
     roleName === 'FlowRelationshipRole'
   ) {
@@ -1090,6 +1122,37 @@ function roleExternalLambdaArns(state, roleName) {
   return [];
 }
 
+function roleHookLambdaArns(state, roleName) {
+  if (roleName !== 'FlowObjectsRole') {
+    return [];
+  }
+  const hookLambdas = [];
+  for (const action of ['Create', 'Update', 'Delete']) {
+    const plan = state.crudActionPlans?.[action];
+    if (plan?.hasBeforeHookSync) {
+      for (const hook of plan.beforeHooks) {
+        if (hook?.generatedCodeConfig?.invocationType === 'lambdaSyncInv') {
+          const hookTag = upperFirst(hook.flowTag);
+          hookLambdas.push(
+            `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:\${self:custom.iz_resourcePrefix}${hookTag}*`
+          );
+        }
+      }
+    }
+    if (plan?.hasAfterHookSync) {
+      for (const hook of plan.afterHooks) {
+        if (hook?.generatedCodeConfig?.invocationType === 'lambdaSyncInv') {
+          const hookTag = upperFirst(hook.flowTag);
+          hookLambdas.push(
+            `arn:aws:lambda:\${self:custom.iz_region}:\${self:custom.iz_accountId}:function:\${self:custom.iz_resourcePrefix}${hookTag}*`
+          );
+        }
+      }
+    }
+  }
+  return [...new Set(hookLambdas)];
+}
+
 function queueArns(queueNames) {
   return [...new Set(queueNames)]
     .sort()
@@ -1121,8 +1184,7 @@ function collectTables(schemas) {
       : [];
     const pkIdentifier = identifiers.find(
       (identifier) =>
-        identifier.type === 'partitionKey' ||
-        identifier.type === 'identifier'
+        identifier.type === 'partitionKey' || identifier.type === 'identifier'
     );
     const skIdentifier = identifiers.find(
       (identifier) => identifier.type === 'sortKey'
@@ -1237,9 +1299,7 @@ function hasRbacAddOn(object) {
  */
 function rbacFlowQueueNames(state) {
   const flowTags = [
-    ...new Set(
-      (state.objects ?? []).filter(hasRbacAddOn).map(rbacFlowTag)
-    )
+    ...new Set((state.objects ?? []).filter(hasRbacAddOn).map(rbacFlowTag))
   ];
   return flowTags.map((flowTag) => `${flowTag}HdrSqs`);
 }