@izara_project/izara-core-generate-service-code 1.0.98 → 1.0.100

package/test/unit/application/createTargetRoleHandler.test.js

@@ -14,10 +14,7 @@ const OWN_TOPIC_FLOWS = [
   'DeleteRolePermissions',
   'DeleteTargetRole',
   'CreateUserRole',
-  'DeleteUserFromRole',
-  'ReservedDynamicUsage',
-  'ConfirmUsage',
-  'CancelUsage'
+  'DeleteUserFromRole'
 ];
 
 const LIMIT_FLOWS = [
@@ -167,6 +164,15 @@ test('generates RBAC own-topic WebSocket entries alongside their SQS handlers',
     )
   );
 
+  await assert.rejects(
+    readFile(
+      join(
+        rootPath,
+        'app/src/generatedCode/FlowLimit/ReservedDynamicUsage/source/ReservedDynamicUsage_HdrSqs.js'
+      )
+    )
+  );
+
   assert.match(
     await readFile(
       join(
@@ -196,21 +202,48 @@ test('generates RBAC own-topic WebSocket entries alongside their SQS handlers',
     'utf8'
   );
   for (const flowTag of OWN_TOPIC_FLOWS) {
-    const isLimit = LIMIT_FLOWS.includes(flowTag);
-    const folder = isLimit ? 'FlowLimit' : 'FlowRbac';
-    const yaml = isLimit ? limitYaml : rbacYaml;
     assert.match(
       await readFile(
         join(
           rootPath,
-          `app/src/generatedCode/${folder}/${flowTag}/source/${flowTag}_HdrWbs.js`
+          `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
         ),
         'utf8'
       ),
       new RegExp(`import ${flowTag}`)
     );
-    assert.match(yaml, new RegExp(`${flowTag}HdrWbs:\\n[\\s\\S]*websocket:`));
+    assert.match(rbacYaml, new RegExp(`${flowTag}HdrWbs:\\n[\\s\\S]*websocket:`));
+  }
+
+  for (const flowTag of LIMIT_FLOWS) {
+    await assert.rejects(
+      readFile(
+        join(
+          rootPath,
+          `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrWbs.js`
+        )
+      )
+    );
+    await assert.rejects(
+      readFile(
+        join(
+          rootPath,
+          `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_WbsMain.js`
+        )
+      )
+    );
+    assert.doesNotMatch(limitYaml, new RegExp(`${flowTag}HdrWbs:`));
   }
+
+  const ttlExpiredFile = await readFile(
+    join(
+      rootPath,
+      'app/src/generatedCode/FlowLimit/ReservedUsageTtlExpired/source/ReservedUsageTtlExpired_HdrDss.js'
+    ),
+    'utf8'
+  );
+  assert.match(ttlExpiredFile, /Auto-refunded expired reservation/);
+  assert.match(ttlExpiredFile, /RunningTotalUsage/);
 });
 
 test('removes CreateTargetRole handler when RBAC is removed', async () => {
@@ -244,6 +277,65 @@ test('removes CreateTargetRole handler when RBAC is removed', async () => {
   );
 });
 
+test('generates synchronous HdrInv and HdrApi handlers for FlowLimit flows', async () => {
+  const rootPath = await createProject(true);
+  await generateCreateTargetRoleHandler(rootPath);
+
+  const limitYaml = await readFile(
+    join(rootPath, 'app/sls_yaml/generatedCode/source/flow-limits.yml'),
+    'utf8'
+  );
+
+  for (const flowTag of ['ReservedDynamicUsage', 'ConfirmUsage', 'CancelUsage']) {
+    assert.match(
+      limitYaml,
+      new RegExp(
+        `${flowTag}HdrInv:\\n\\s+handler: src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrInv\\.main`
+      )
+    );
+    assert.match(
+      limitYaml,
+      new RegExp(
+        `${flowTag}HdrApi:\\n\\s+handler: src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrApi\\.main`
+      )
+    );
+
+    const invFile = await readFile(
+      join(
+        rootPath,
+        `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrInv.js`
+      ),
+      'utf8'
+    );
+    assert.match(invFile, /export const main = middleware\.wrap/);
+    assert.match(
+      invFile,
+      new RegExp(`import ${flowTag} from '\\./${flowTag}_Main\\.js'`)
+    );
+
+    const apiFile = await readFile(
+      join(
+        rootPath,
+        `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrApi.js`
+      ),
+      'utf8'
+    );
+    assert.match(apiFile, /export const main = middleware\.wrap/);
+    assert.match(
+      apiFile,
+      new RegExp(`import ${flowTag} from '\\./${flowTag}_Main\\.js'`)
+    );
+  }
+
+  assert.match(
+    limitYaml,
+    /ReservedUsageTtlExpiredHdrDss:\n\s+handler: src\/generatedCode\/FlowLimit\/ReservedUsageTtlExpired\/source\/ReservedUsageTtlExpired_HdrDss\.main/
+  );
+  assert.match(limitYaml, /type: dynamodb/);
+  assert.match(limitYaml, /RunningTotalReservedUsageTable/);
+  assert.match(limitYaml, /eventName: \["REMOVE"\]/);
+});
+
 async function createProject(hasRbac) {
   const rootPath = await mkdtemp(
     join(tmpdir(), 'generate-service-code-v2-rbac-handler-')

package/test/unit/application/crudApplicationArtifacts.test.js

@@ -1119,6 +1119,10 @@ test('emits synchronous ConfirmUsage and CancelUsage invocation in CreateLogical
   assert.match(createLogicalLib, /CancelUsageHdrInv/);
   assert.match(createLogicalLib, /lambda\.invokeSync\(/);
   assert.match(createLogicalLib, /publishCompletionMessage\(/);
+  assert.match(createLogicalLib, /OBJECT_QUOTA_SERVICE_TAGS/);
+  assert.match(createLogicalLib, /"order":"UserAccount"/);
+  assert.match(createLogicalLib, /targetFunction,\s*quotaServiceTag/);
+  assert.doesNotMatch(createLogicalLib, /targetFunction,\s*['"]Rbac['"]/);
 });
 
 test('emits synchronous AfterHook invocation in Update and Delete handlers', async () => {

package/test/unit/application/customFlowApplicationArtifacts.test.js

@@ -924,7 +924,7 @@ test('renders nextSteps IAM permissions in InitialSetupConfig', async () => {
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -997,7 +997,7 @@ test('registers SQS queue, SNS subscription, and SNS out topic for custom flowSc
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -1030,7 +1030,7 @@ test('uses synchronous RBAC without obsolete callback SQS subscriptions in Initi
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -1096,7 +1096,7 @@ test('deduplicates duplicate nextSteps topics across flowSteps in InitialSetupCo
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -1275,7 +1275,7 @@ test('renders previousSteps extTopic subscriptions in InitialSetupConfig', async
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );
@@ -1537,7 +1537,7 @@ test('does not emit RbacCallback artifacts or duplicate artifact paths for custo
   const initialSetupConfigContent = await readFile(
     join(
       rootPath,
-      'app/src/generatedCode/CoreFunctions/InitialSetupConfig.js'
+      'app/initial_setup/generatedCode/source/InitialSetupConfig.js'
     ),
     'utf8'
   );