@izara_project/izara-core-generate-service-code 1.0.102 → 1.0.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.102",
+  "version": "1.0.103",
   "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/application/coreFunction/templates/InitialSetupRunner_uploadSchema.ejs

@@ -1,4 +1,11 @@
 import initialSetupLib from '@izara_project/izara-core-library-initial-setup';
+import { basicValidatorSchema } from '@izara_project/izara-shared-service-schemas';
+
+if (basicValidatorSchema?.basicFlowSchema?.properties?.event?.items?.enum) {
+  if (!basicValidatorSchema.basicFlowSchema.properties.event.items.enum.includes('dss')) {
+    basicValidatorSchema.basicFlowSchema.properties.event.items.enum.push('dss');
+  }
+}
 
 const SERVICE_TAG = {
   TRANSLATIONS: 'Translations',

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

@@ -16,6 +16,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import initialSetupSharedLib from '@izara_project/izara-core-library-initial-setup';
+import { basicValidatorSchema } from '@izara_project/izara-shared-service-schemas';
+
+if (basicValidatorSchema?.basicFlowSchema?.properties?.event?.items?.enum) {
+  if (!basicValidatorSchema.basicFlowSchema.properties.event.items.enum.includes('dss')) {
+    basicValidatorSchema.basicFlowSchema.properties.event.items.enum.push('dss');
+  }
+}
 
 const SERVICE_TAG = {
   TRANSLATIONS: 'Translations',

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

@@ -153,6 +153,10 @@ export default async function <%- flowTag %>(
         requestParams.billable = true;
       }
 
+      //(<rbacUsageValue_<%- flowTag %>>)
+      let usageValue = requestParams.value || requestParams.usageValue || 1;
+      //(</rbacUsageValue_<%- flowTag %>>)
+
       const resultPermissionCheck = await checkRbacPermission(
         _izContext,
         {
@@ -168,6 +172,7 @@ export default async function <%- flowTag %>(
             serviceTag: <%- rbacServiceTags.length === 1 ? rbacServiceTags[0] : `{ ${Object.entries(rbacServiceTagMap).map(([k, v]) => `'${k}': ${v}`).join(', ')} }[requestParams.objectType] || process.env.iz_serviceTag` %>
           },
           requestParams: requestParams,
+          value: usageValue,
           sync: true
         }
       );
@@ -187,6 +192,14 @@ export default async function <%- flowTag %>(
         );
       }
 
+      if (resultPermissionCheck?.uniqueIdentify) {
+        requestParams.reservedUsageId = resultPermissionCheck.uniqueIdentify;
+      }
+      if (resultPermissionCheck?.runningTotalReservedId) {
+        requestParams.runningTotalReservedId =
+          resultPermissionCheck.runningTotalReservedId;
+      }
+
       //(<rbacPublish_<%- flowTag %>>)
       //(</rbacPublish_<%- flowTag %>>)
     }
@@ -275,6 +288,7 @@ export default async function <%- flowTag %>(
       //(</afterBeforeLogical_<%= objectType %>>)
 
       <%_ if (hasOwnTopic) { _%>
+      /*
       // ── ownTopic (async — dispatch to before-hook and await callback) ──────────
       <%_ configs.filter(c => c?.generatedCodeConfig?.invocationType === 'ownTopic' || c?.event?.includes('ownTopic')).forEach(config => { _%>
       let hookPayload_<%= config.flowTag %> = {
@@ -341,6 +355,13 @@ export default async function <%- flowTag %>(
         status: 'pending',
         message: 'Dispatched to BeforeHook'
       };
+      */
+      return await <%- flowTag %>LogicalLib(
+        _izContext,
+        requestParams,
+        callingFlowConfig,
+        foundErrors
+      );
       <%_ } else { _%>
       return await <%- flowTag %>LogicalLib(
         _izContext,

package/src/emit/application/rbac/templates/CancelUsage_Main.ejs

@@ -154,7 +154,7 @@ export default async function CancelUsage(_izContext, requestParams) {
     };
 
     const eventSourceTag =
-      _izContext.izEventSource?.eventSourceTag ||
+      _izContext?.izEventSource?.eventSourceTag ||
       requestParams?.izEventSource?.eventSourceTag;
 
     let isSync = false;
@@ -162,16 +162,17 @@ export default async function CancelUsage(_izContext, requestParams) {
       eventSourceTag === 'DirectInvoke' ||
       eventSourceTag === 'ApiGateway' ||
       eventSourceTag === 'ApiGatewayV2' ||
-      requestParams?.hasOwnProperty('__context__')
+      requestParams?.hasOwnProperty('__context__') ||
+      _izContext?.functionName?.endsWith('HdrInv') ||
+      _izContext?.functionName?.endsWith('HdrApi') ||
+      eventSourceTag !== 'Sqs'
     ) {
       isSync = true;
     }
 
     if (!isSync) {
-      await sns.publishMessage(_izContext, {
-        message: {
-          returnResult
-        },
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify({ returnResult }),
         TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
           _izContext,
           'CancelUsage_Out'

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

@@ -178,7 +178,7 @@ export default async function ConfirmUsage(_izContext, requestParams) {
     };
 
     const eventSourceTag =
-      _izContext.izEventSource?.eventSourceTag ||
+      _izContext?.izEventSource?.eventSourceTag ||
       requestParams?.izEventSource?.eventSourceTag;
 
     let isSync = false;
@@ -186,16 +186,17 @@ export default async function ConfirmUsage(_izContext, requestParams) {
       eventSourceTag === 'DirectInvoke' ||
       eventSourceTag === 'ApiGateway' ||
       eventSourceTag === 'ApiGatewayV2' ||
-      requestParams?.hasOwnProperty('__context__')
+      requestParams?.hasOwnProperty('__context__') ||
+      _izContext?.functionName?.endsWith('HdrInv') ||
+      _izContext?.functionName?.endsWith('HdrApi') ||
+      eventSourceTag !== 'Sqs'
     ) {
       isSync = true;
     }
 
     if (!isSync) {
-      await sns.publishMessage(_izContext, {
-        message: {
-          returnResult
-        },
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify({ returnResult }),
         TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
           _izContext,
           'ConfirmUsage_Out'

package/src/emit/application/rbac/templates/CreateTargetRole_Main.ejs

@@ -133,8 +133,8 @@ export default async function CreateTargetRole(_izContext, requestParams) {
       }
     }
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { roleId, roleIdKey } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { roleId, roleIdKey } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'CreateTargetRole_Out'

package/src/emit/application/rbac/templates/DeleteTargetRole_Main.ejs

@@ -82,8 +82,8 @@ export default async function DeleteTargetRole(_izContext, requestParams) {
       }
     }
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { identifiersConcat, roleIdKey, status: 'deleted' } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { identifiersConcat, roleIdKey, status: 'deleted' } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'DeleteTargetRole_Out'

package/src/emit/application/rbac/templates/GetMyPermissions_Main.ejs

@@ -95,8 +95,8 @@ export default async function GetMyPermissions(_izContext, requestParams) {
       permissions: permissionsMap
     };
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: result },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: result }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'GetMyPermissions_Out'

package/src/emit/application/rbac/templates/GetTargetRole_Main.ejs

@@ -47,8 +47,8 @@ export default async function GetTargetRole(_izContext, requestParams) {
       users: usersResult?.Items || []
     };
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: result },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: result }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'GetTargetRole_Out'

package/src/emit/application/rbac/templates/ListRbac_Main.ejs

@@ -41,8 +41,8 @@ export default async function <%- flowTag %>(_izContext, requestParams) {
       dynamodbSharedLib.tableName(_izContext, '<%- tableName %>'),
       queryParams
     );
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { records: resultQuery.Items || [] } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { records: resultQuery.Items || [] } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         '<%- flowTag %>_Out'

package/src/emit/application/rbac/templates/RbacMutation_Main.ejs

@@ -28,8 +28,8 @@ export default async function <%- flowTag %>(_izContext, requestParams) {
       dynamodbSharedLib.tableName(_izContext, '<%- tableName %>'),
       { <%- fieldList %> }
     );
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { <%- fieldList %> } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { <%- fieldList %> } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         '<%- flowTag %>_Out'

package/src/emit/application/rbac/templates/ReservedDynamicUsage_Main.ejs

@@ -197,7 +197,7 @@ export default async function ReservedDynamicUsage(_izContext, requestParams) {
     };
 
     const eventSourceTag =
-      _izContext.izEventSource?.eventSourceTag ||
+      _izContext?.izEventSource?.eventSourceTag ||
       requestParams?.izEventSource?.eventSourceTag;
 
     let isSync = false;
@@ -205,14 +205,17 @@ export default async function ReservedDynamicUsage(_izContext, requestParams) {
       eventSourceTag === 'DirectInvoke' ||
       eventSourceTag === 'ApiGateway' ||
       eventSourceTag === 'ApiGatewayV2' ||
-      requestParams?.hasOwnProperty('__context__')
+      requestParams?.hasOwnProperty('__context__') ||
+      _izContext?.functionName?.endsWith('HdrInv') ||
+      _izContext?.functionName?.endsWith('HdrApi') ||
+      eventSourceTag !== 'Sqs'
     ) {
       isSync = true;
     }
 
     if (!isSync) {
-      await sns.publishMessage(_izContext, {
-        message: { returnResult },
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify({ returnResult }),
         TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
           _izContext,
           'ReservedDynamicUsage_Out'

package/src/emit/application/rbac/templates/UpdateTargetRole_Main.ejs

@@ -93,8 +93,8 @@ export default async function UpdateTargetRole(_izContext, requestParams) {
       }
     }
 
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { roleIdKey, status: 'updated' } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { roleIdKey, status: 'updated' } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         'UpdateTargetRole_Out'

package/src/emit/application/rbac/templates/UserRoleMutation_Main.ejs

@@ -54,8 +54,8 @@ export default async function <%- flowTag %>(_izContext, requestParams) {
         }
       }
     ]);
-    await sns.publishMessage(_izContext, {
-      message: { returnResult: { userId, roleIdKey } },
+    await sns.publishAsync(_izContext, {
+      Message: JSON.stringify({ returnResult: { userId, roleIdKey } }),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         '<%- flowTag %>_Out'

package/src/emit/infrastructure/resources/sqsResourceArtifacts.js

@@ -102,7 +102,8 @@ export async function renderOut(state) {
       renderResourceTemplate('FlowOut_Yaml.ejs', { topicName })
     )
   );
-  const body = renderedTopics.join('\n');
+  const fileHook = '#<#customTopicOut#>\n#<#/customTopicOut#>';
+  const body = [...renderedTopics, fileHook].filter(Boolean).join('\n');
   return `Resources:\n${indentYaml(body, 2)}`;
 }
 

package/src/emit/infrastructure/resources/templates/FlowOut_Yaml.ejs

@@ -4,3 +4,5 @@ Out<%- topicName %>:
   Properties:
     DisplayName: 'SNS Message out'
     TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- topicName %>_Out
+#<#Out<%- topicName %>TopicSetting#>
+#<#/Out<%- topicName %>TopicSetting#>

package/test/unit/infrastructure/resourceArtifacts.test.js

@@ -964,3 +964,23 @@ test('roleStatements emits s3:GetObject for custom S3 flow bucket', async () =>
   assert.match(uploadRole, /arn:aws:s3:::UploadBucket\/\*/);
 });
 
+test('emits per-topic hook tags in generated-sns-out.yml', async () => {
+  const rootPath = await createProject();
+  await generateResourceArtifacts(rootPath);
+  const snsOut = await readFile(
+    join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-out.yml'),
+    'utf8'
+  );
+  assert.match(snsOut, /#<#Out\w+TopicSetting#>\s*#<#\/Out\w+TopicSetting#>/);
+});
+
+test('emits customTopicOut file-level hook in generated-sns-out.yml', async () => {
+  const rootPath = await createProject();
+  await generateResourceArtifacts(rootPath);
+  const snsOut = await readFile(
+    join(rootPath, 'resource/sls_yaml/generatedCode/source/generated-sns-out.yml'),
+    'utf8'
+  );
+  assert.match(snsOut, /#<#customTopicOut#>\s*#<#\/customTopicOut#>/);
+});
+

package/test/unit/output/mergeHooks.test.js

@@ -402,4 +402,53 @@ test('warns when source content contains custom code in hook missing from templa
   }
 });
 
+test('preserves custom settings inside Out<topicName>TopicSetting and customTopicOut in generated-sns-out.yml', async () => {
+  const tmpDir = await mkdtemp(path.join(os.tmpdir(), 'mergeHooks-test-'));
+  try {
+    const filePath = 'resource/sls_yaml/generatedCode/source/generated-sns-out.yml';
+    const diskContent = [
+      'Resources:',
+      '  ##===== [Topic Out]',
+      '  OutCreate:',
+      '    Type: AWS::SNS::Topic',
+      '    Properties:',
+      "      DisplayName: 'SNS Message out'",
+      '      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_Create_Out',
+      '  #<#OutCreateTopicSetting#>',
+      '    FifoTopic: true',
+      '  #<#/OutCreateTopicSetting#>',
+      '',
+      '  #<#customTopicOut#>',
+      '  OutCustomNotification:',
+      '    Type: AWS::SNS::Topic',
+      '  #<#/customTopicOut#>'
+    ].join('\n') + '\n';
+    await writeTestFile(tmpDir, filePath, diskContent);
+
+    const generatedArtifact = {
+      path: filePath,
+      content: [
+        'Resources:',
+        '  ##===== [Topic Out]',
+        '  OutCreate:',
+        '    Type: AWS::SNS::Topic',
+        '    Properties:',
+        "      DisplayName: 'SNS Message out'",
+        '      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_Create_Out',
+        '  #<#OutCreateTopicSetting#>',
+        '  #<#/OutCreateTopicSetting#>',
+        '',
+        '  #<#customTopicOut#>',
+        '  #<#/customTopicOut#>'
+      ].join('\n') + '\n'
+    };
+
+    const [result] = await mergeHooks(tmpDir, [generatedArtifact]);
+    assert.match(result.content, /FifoTopic: true/);
+    assert.match(result.content, /OutCustomNotification:/);
+  } finally {
+    await rm(tmpDir, { recursive: true, force: true });
+  }
+});
+