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

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

@@ -26,6 +26,12 @@ 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';
 import { sns } from '@izara_project/izara-core-library-external-request';
+import { consts } from '@izara_project/izara-middleware';
+<% if (isSimplifiedS3) { -%>
+import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import { utils } from '@izara_project/izara-core-library-service-schemas';
+const { createFlowTypeConcat } = utils;
+<% } -%>
 
 //(<optionalRequired>)
 //(</optionalRequired>)
@@ -33,7 +39,8 @@ import { sns } from '@izara_project/izara-core-library-external-request';
 /**
  * Step 2: ProcessAfterUpload (Deferred-Node S3 Pipeline - ADR-016)
  * Triggered by S3 ObjectCreated event. Inspects file, prepares entity payload,
- * and publishes to Create_In SNS topic with callingFlow targeting ConfirmAfterUpload.
+ * and publishes to Create_In SNS topic with callingFlow
+ * targeting ConfirmAfterUpload.
  *
  * @param {Object} _izContext
  * @param {Object} bucket - S3 bucket record
@@ -50,7 +57,15 @@ export default async function <%- functionName %>(
   passBackProperties = {}
 ) {
   try {
-    _izContext.logger.debug('----- <%- functionName %> started -----', {
+    _izContext.logger.info(
+      '----- <%- functionName %> started -----',
+      {
+        bucketName: bucket.name,
+        key: field.key,
+        size: field.size
+      }
+    );
+    _izContext.logger.debug('<%- functionName %> incoming parameters:', {
       bucket,
       field,
       passBackProperties
@@ -58,8 +73,24 @@ export default async function <%- functionName %>(
 
     const s3Key = field.key;
     const actualByteSize = field.size;
+
+    if (!s3Key || s3Key.endsWith('/') || actualByteSize === 0) {
+      _izContext.logger.warn('Skipping directory marker or 0-byte object:', {
+        bucketName: bucket.name,
+        key: s3Key,
+        size: actualByteSize
+      });
+      return { status: 'skipped_empty_or_dir', s3Key };
+    }
+
     const actualSizeMb = actualByteSize / (1024 * 1024);
 
+    _izContext.logger.debug('S3 file details:', {
+      s3Key,
+      actualByteSize,
+      actualSizeMb
+    });
+
     let s3Metadata = {};
     try {
       const headResult = await s3.send(
@@ -68,13 +99,19 @@ export default async function <%- functionName %>(
           Key: s3Key
         })
       );
+
+      _izContext.logger.debug('HeadObjectCommand raw result:', headResult);
       s3Metadata = headResult.Metadata || {};
+      _izContext.logger.info('Parsed S3 Metadata:', { s3Metadata });
     } catch (headErr) {
-      _izContext.logger.warn('Could not retrieve S3 object metadata via HeadObjectCommand:', {
-        bucket: bucket.name,
-        key: s3Key,
-        error: headErr.message
-      });
+      _izContext.logger.warn(
+        'Could not retrieve S3 object metadata via HeadObjectCommand:',
+        {
+          bucket: bucket.name,
+          key: s3Key,
+          error: headErr.message
+        }
+      );
     }
 
     //(<extractIdentifiersFromKeyOrMetadata>)
@@ -98,23 +135,164 @@ export default async function <%- functionName %>(
 <% } -%>
     //(</extractIdentifiersFromKeyOrMetadata>)
 
+<% if (isSimplifiedS3) { -%>
+    const flowTypeTag = createFlowTypeConcat(_izContext, {
+      flowTag: '<%- flowTag %>',
+      serviceTag: process.env.iz_serviceTag
+    });
+    const taskKey = `${flowTypeTag}${rawId}`;
+    const taskTableName = await dynamodbSharedLib.tableName(
+      _izContext,
+      'WebSocketTask'
+    );
+
+    let resolvedConnectionId =
+      s3Metadata.connectionid || s3Metadata.connectionId || '';
+    if (!resolvedConnectionId) {
+      const queryTasks = await dynamodbSharedLib.query(
+        _izContext,
+        taskTableName,
+        { taskKey }
+      );
+      if (queryTasks && queryTasks.Items && queryTasks.Items.length > 0) {
+        resolvedConnectionId = queryTasks.Items[0].connectionId;
+      } else {
+        _izContext.logger.warn(
+          `[Idempotency] No task record found for <%- objectType %>Id: ${rawId}.` +
+            ' Aborting dispatch to Create_In.'
+        );
+        return {
+          status: 'unauthorized_or_unknown_upload',
+          s3Key,
+          <%- objectType %>Id: rawId
+        };
+      }
+    }
+
+    try {
+      await dynamodbSharedLib.updateItem(
+        _izContext,
+        taskTableName,
+        {
+          taskKey,
+          connectionId: resolvedConnectionId
+        },
+        {
+          UpdateExpression: 'SET uploadClaimed = :claimed, claimedAt = :now',
+          ConditionExpression:
+            'attribute_exists(taskKey) AND attribute_not_exists(uploadClaimed)',
+          ExpressionAttributeValues: {
+            ':claimed': true,
+            ':now': Date.now()
+          }
+        }
+      );
+      _izContext.logger.info(
+        `[Idempotency] Successfully claimed upload for <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: ${rawId}`
+      );
+    } catch (claimErr) {
+      if (claimErr.name === 'ConditionalCheckFailedException') {
+        _izContext.logger.warn(
+          `[Idempotency] Duplicate or unauthorized S3 upload detected for` +
+            ` <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: ${rawId}. Aborting dispatch to Create_In.`
+        );
+        return {
+          status: 'duplicate_upload_ignored',
+          s3Key,
+          <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId
+        };
+      }
+      _izContext.logger.error(
+        '[Idempotency] Failed to execute atomic claim on WebSocketTask:',
+        claimErr
+      );
+      throw claimErr;
+    }
+<% } -%>
+
     //(<endpointHook>)
     //(</endpointHook>)
 
 <% if (typeof nextStepFunctionName === 'string' && nextStepFunctionName) { -%>
-    const metaUserId =
-      s3Metadata.submittedbyuserid ||
-      s3Metadata.submittedByUserId ||
-      s3Metadata.userid ||
-      s3Metadata.userId ||
-      _izContext.userId ||
-      '';
+    const metaUserId = s3Metadata.submittedbyuserid || '';
+<% if (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) { -%>
+<%   for (const rel of flowRelationships) { -%>
+<%     const targetIdKey = rel.targetIdentifierKey || `${rel.targetObjType.objectType}Id`; -%>
+<%     const metaKey = targetIdKey.toLowerCase(); -%>
+    const meta<%- targetIdKey.charAt(0).toUpperCase() + targetIdKey.slice(1) %> = s3Metadata.<%- metaKey %> || '';
+<%   } -%>
+<% } -%>
+
+    _izContext.logger.info('Extracted identifiers and metadata:', {
+      <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId,
+      parentId,
+      submittedByUserId: metaUserId,
+<% if (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) { -%>
+<%   for (const rel of flowRelationships) { -%>
+<%     const targetIdKey = rel.targetIdentifierKey || `${rel.targetObjType.objectType}Id`; -%>
+      <%- targetIdKey %>: meta<%- targetIdKey.charAt(0).toUpperCase() + targetIdKey.slice(1) %>,
+<%   } -%>
+<% } -%>
+      fileName: fileNameWithExt
+    });
+
+    if (metaUserId) {
+      _izContext.correlationIds?.set(consts.SUBMITTED_BY_USER_ID, metaUserId);
+    }
+
+    //(<relationshipsHook>)
+    let relationships = [];
+<% if (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) { -%>
+<%   for (const rel of flowRelationships) { -%>
+<%     const targetIdKey = rel.targetIdentifierKey || `${rel.targetObjType.objectType}Id`; -%>
+<%     const targetObj = rel.targetObjType || {}; -%>
+<%     const relTypeObj = rel.relType || {}; -%>
+<%     const relDir = rel.relationshipDirection || 'to'; -%>
+<%     const varName = `meta${targetIdKey.charAt(0).toUpperCase() + targetIdKey.slice(1)}`; -%>
+    if (<%- varName %>) {
+      relationships.push({
+        targetObjType: {
+          objectType: '<%- targetObj.objectType %>',
+          serviceTag: '<%- targetObj.serviceTag %>'
+        },
+        targetIdentifiers: {
+          <%- targetIdKey %>: <%- varName %>
+        },
+        relType: {
+          relationshipTag: '<%- relTypeObj.relationshipTag %>',
+          serviceTag: '<%- relTypeObj.serviceTag %>'
+        },
+        relationshipProperties: <%- JSON.stringify(rel.relationshipProperties || {}) %>,
+        relationshipDirection: '<%- relDir %>'
+      });
+      _izContext.logger.info('Built relationship for <%- targetObj.objectType %>:', {
+        relationships
+      });
+    } else {
+      _izContext.logger.warn(
+        '<%- varName %> is empty! ' +
+          'No <%- relTypeObj.relationshipTag %> relationship attached.'
+      );
+    }
+<%   } -%>
+<% } -%>
+    //(</relationshipsHook>)
+
     let messageObject = {
       objectType: '<%- objectType %>',
       submittedByUserId: metaUserId,
+<% if (typeof identifierKeys !== 'undefined' && identifierKeys && identifierKeys.length > 1) { -%>
       identifiers: {
-        <%- objectType %>Id: rawId
+        <%- identifierKeys[0] %>: rawId,
+<%   for (let i = 1; i < identifierKeys.length; i++) { -%>
+        <%- identifierKeys[i] %>: <%- identifierKeys[i] %><%- i < identifierKeys.length - 1 ? ',' : '' %>
+<%   } -%>
       },
+<% } else { -%>
+      identifiers: {
+        <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId
+      },
+<% } -%>
 <% if (typeof parentIdKeys !== 'undefined' && parentIdKeys && parentIdKeys.length > 1) { -%>
       targetIdentifiers: {
         <%- parentIdKeys[0] %>: parentId,
@@ -127,37 +305,69 @@ export default async function <%- functionName %>(
         <%- parentIdKey %>: parentId
       },
 <% } -%>
+      relationships,
       fieldNames: {
+<% if (typeof identifierKeys !== 'undefined' && identifierKeys && identifierKeys.length > 1) { -%>
+        <%- identifierKeys[0] %>: rawId,
+<%   for (let i = 1; i < identifierKeys.length; i++) { -%>
+        <%- identifierKeys[i] %>: <%- identifierKeys[i] %>,
+<%   } -%>
+<% } else { -%>
+        <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId,
+<% } -%>
         //(<fieldNamesHook>)
         //(</fieldNamesHook>)
       }
     };
 
+    const confirmCallbackFunction =
+      await lambdaSharedLib.lambdaFunctionName(
+        _izContext,
+        '<%- nextStepFunctionName %>'
+      );
+    _izContext.logger.debug('Resolved confirm callback function:', {
+      confirmCallbackFunction
+    });
+
     messageObject =
       callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
         messageObject,
         callingFlowSharedLib.addParentCallingFlowConfig(
           passBackProperties,
           callingFlowSharedLib.createCallingFlowConfig(
-            await lambdaSharedLib.lambdaFunctionName(
-              _izContext,
-              '<%- nextStepFunctionName %>'
-            ),
-            {}
+            confirmCallbackFunction,
+            { rawId: rawId, <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId }
           )
         )
       );
 
+    const topicArn =
+      snsSharedLib.snsTopicArnByFlowSchema(_izContext, 'Create_In');
+
     let sendMessageToCreateEndpoint = {
       Message: JSON.stringify(messageObject),
-      TopicArn: snsSharedLib.snsTopicArnByFlowSchema(_izContext, 'Create_In')
+      TopicArn: topicArn
     };
 
+    _izContext.logger.info('Publishing to Create_In SNS topic:', {
+      topicArn,
+      <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId,
+      parentId<%- (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) ? flowRelationships.map(r => { const k = r.targetIdentifierKey || `${r.targetObjType.objectType}Id`; return `,\n      ${k}: meta${k.charAt(0).toUpperCase() + k.slice(1)}`; }).join('') : '' %>
+    });
     _izContext.logger.debug(
-      'sendMessageToCreateEndpoint',
+      'Full Create_In message payload:',
+      sendMessageToCreateEndpoint
+    );
+
+    const publishResult = await sns.publishAsync(
+      _izContext,
       sendMessageToCreateEndpoint
     );
-    await sns.publishAsync(_izContext, sendMessageToCreateEndpoint);
+    _izContext.logger.info('Successfully published to Create_In SNS:', {
+      publishResult,
+      s3Key,
+      <%- (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id` %>: rawId
+    });
 
     return {
       status: 'dispatched',
@@ -175,3 +385,4 @@ export default async function <%- functionName %>(
     throw err;
   }
 }
+

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

@@ -0,0 +1,65 @@
+/*
+Copyright (C) 2026 Sven Mason <http://izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import {
+  middlewareHandler as middleware,
+  response
+} from '@izara_project/izara-middleware';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import { webSocket } from '@izara_project/izara-core-library-external-request';
+const { postToConnection } = webSocket;
+
+import <%= functionName %> from './<%= functionName %>_Main.js';
+
+export const main = middleware.wrap(async (event, context) => {
+  event._izContext.logger.debug('Event:', event);
+
+  try {
+    if (event.requestContext) {
+      const route = event.requestContext.routeKey;
+
+      switch (route) {
+        case '<%- route %>':
+          console.log('event in route webSocket', event);
+          let eventParams = JSON.parse(event.body);
+
+          let callingFlow = eventParams?.callingFlow
+            ? eventParams.callingFlow
+            : {};
+          await <%= functionName %>(
+            event._izContext,
+            eventParams,
+            callingFlowSharedLib.addCallingFlowToPassOnProperties(callingFlow)
+            //(<additionalParams>)
+            //(</additionalParams>)
+          );
+
+          break;
+      }
+    } else {
+      const connId = event.connId;
+      await postToConnection(event._izContext, { message: event.message }, connId);
+    }
+
+    return response.webSocketSuccess();
+  } catch (err) {
+    const connId = event.requestContext.connectionId;
+    event._izContext.logger.error('Error, WebSocket: ', err);
+    await postToConnection(event._izContext, { message: err.message }, connId);
+    return response.failure(err);
+  }
+});

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

@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { v7 as uuidv7 } from 'uuid';
+import { identifierUuid } from '@izara_project/izara-shared-core';
 import { createPresignedPost } from '@aws-sdk/s3-presigned-post';
 import { S3Client } from '@aws-sdk/client-s3';
 import { consts } from '@izara_project/izara-middleware';
@@ -99,7 +99,8 @@ export default async function <%- functionName %>(
     }
 <% } -%>
 
-    const <%- objectType %>Id = uuidv7();
+<% const targetIdName = (typeof identifierKey !== 'undefined' && identifierKey) ? identifierKey : `${objectType}Id`; -%>
+    const <%- targetIdName %> = identifierUuid();
 
 <% if (typeof parentIdKeys !== 'undefined' && parentIdKeys && parentIdKeys.length > 0) { -%>
     const targetParentId = requestParams.targetIdentifiers?.<%- parentIdKeys[0] %>;
@@ -123,6 +124,13 @@ export default async function <%- functionName %>(
     //(<createKeyForUploadFile>)
     let importType = '<%- defaultImportType %>';
     let uploadPath = '';
+<% if (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) { -%>
+<%   for (const rel of flowRelationships) { -%>
+<%     const relIdKey = rel.targetIdentifierKey || `${rel.targetObjType.objectType}Id`; -%>
+    const <%- relIdKey %> =
+      requestParams.fieldNames?.<%- relIdKey %> || requestParams.file?.<%- relIdKey %>;
+<%   } -%>
+<% } -%>
     //(</createKeyForUploadFile>)
     const Key = `<%- s3KeyPrefix %>${uploadPath}`;
     const maximumSize = maxFileSizeMb * 1048576;
@@ -132,25 +140,39 @@ export default async function <%- functionName %>(
       Key: Key,
       Conditions: [
         ['content-length-range', 0, maximumSize],
-        ['eq', '$x-amz-meta-<%- objectType %>Id', <%- objectType %>Id],
+        ['eq', '$x-amz-meta-<%- targetIdName %>', <%- targetIdName %>],
 <% if (typeof parentIdKeys !== 'undefined' && parentIdKeys && parentIdKeys.length > 0) { -%>
 <%   for (const key of parentIdKeys) { -%>
         ['eq', '$x-amz-meta-<%- key %>', target<%- key.charAt(0).toUpperCase() + key.slice(1) %>],
 <%   } -%>
 <% } -%>
         ['starts-with', '$x-amz-meta-submittedByUserId', ''],
-        ['starts-with', '$Content-Type', '<%- contentTypePrefix %>']
+        ['starts-with', '$Content-Type', '<%- contentTypePrefix %>'],
+        ['starts-with', '$x-amz-meta-connectionId', ''],
+<% if (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) { -%>
+<%   for (const rel of flowRelationships) { -%>
+<%     const relIdKey = rel.targetIdentifierKey || `${rel.targetObjType.objectType}Id`; -%>
+        ['starts-with', '$x-amz-meta-<%- relIdKey %>', ''],
+<%   } -%>
+<% } -%>
         //(<conditionCreateUrlLink>)
         //(</conditionCreateUrlLink>)
       ],
       Fields: {
-        'x-amz-meta-<%- objectType %>Id': <%- objectType %>Id,
+        'x-amz-meta-<%- targetIdName %>': <%- targetIdName %>,
 <% if (typeof parentIdKeys !== 'undefined' && parentIdKeys && parentIdKeys.length > 0) { -%>
 <%   for (const key of parentIdKeys) { -%>
         'x-amz-meta-<%- key %>': target<%- key.charAt(0).toUpperCase() + key.slice(1) %>,
 <%   } -%>
 <% } -%>
         'x-amz-meta-submittedByUserId': submittedByUserId,
+        'x-amz-meta-connectionId': connectionId || 'NONE',
+<% if (typeof flowRelationships !== 'undefined' && Array.isArray(flowRelationships) && flowRelationships.length > 0) { -%>
+<%   for (const rel of flowRelationships) { -%>
+<%     const relIdKey = rel.targetIdentifierKey || `${rel.targetObjType.objectType}Id`; -%>
+        'x-amz-meta-<%- relIdKey %>': <%- relIdKey %> || '',
+<%   } -%>
+<% } -%>
         //(<fieldCreateUrlLink>)
         //(</fieldCreateUrlLink>)
       },
@@ -162,24 +184,25 @@ export default async function <%- functionName %>(
 
     const uploadUrl = await createPresignedPost(client, createPreSignUrlParam);
 
-    if (connectionId) {
-      await dynamodbSharedLib.putItem(
-        _izContext,
-        await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'),
-        {
-          taskKey: `${createFlowTypeConcat(_izContext, { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag })}${<%- objectType %>Id}`,
-          connectionId: connectionId,
-          expirationTime: Math.floor(Date.now() / 1000) + 7200
-        }
-      );
+    const resolvedConnectionId = connectionId || 'NONE';
+    await dynamodbSharedLib.putItem(
+      _izContext,
+      await dynamodbSharedLib.tableName(_izContext, 'WebSocketTask'),
+      {
+        taskKey: `${createFlowTypeConcat(_izContext, { flowTag: '<%- flowTag %>', serviceTag: process.env.iz_serviceTag })}${<%- targetIdName %>}`,
+        connectionId: resolvedConnectionId,
+        expirationTime: Math.floor(Date.now() / 1000) + 7200
+      }
+    );
 
+    if (connectionId) {
       await postToConnection(
         _izContext,
         {
           status: 'success',
           data: {
             uploadUrl: uploadUrl,
-            <%- objectType %>Id: <%- objectType %>Id
+            <%- targetIdName %>: <%- targetIdName %>
           }
         },
         connectionId
@@ -188,7 +211,7 @@ export default async function <%- functionName %>(
 
     return {
       uploadUrl: uploadUrl,
-      <%- objectType %>Id: <%- objectType %>Id
+      <%- targetIdName %>: <%- targetIdName %>
     };
   } catch (err) {
     _izContext.logger.error('Error in <%- functionName %>:', err);

package/src/emit/application/custom/templates/s3/{ConfirmAfterUpload_HdrSqs.ejs → legacy/ConfirmAfterUpload_HdrSqs.ejs}

@@ -95,6 +95,7 @@ export const main = middleware.wrap(async (event, context) => {
         let returnPromise = await recordHandlerSharedLib.recordHandler(
           record,
           <%= functionName %>,
+          '<%= functionName %><%= handlerType %>',
           passOnProperties
         );
 

package/src/emit/application/custom/templates/s3/{ConfirmAfterUpload_Main.ejs → legacy/ConfirmAfterUpload_Main.ejs}

@@ -64,7 +64,7 @@ export default async function <%- functionName %>(
       { taskKey: taskKey }
     );
 
-    if (taskRecord && taskRecord.connectionId) {
+    if (taskRecord && taskRecord.connectionId && taskRecord.connectionId !== 'NONE') {
       await postToConnection(
         _izContext,
         {

package/src/emit/infrastructure/functions/templates/DssFunction_Yaml.ejs

@@ -7,7 +7,7 @@
     - stream:
         type: dynamodb
         arn:
-          Fn::GetAtt: [<%= tableName %>Table, StreamArn]
+          Fn::ImportValue: ${self:custom.iz_resourcePrefix}<%= tableName %>StreamArn
         batchSize: <%= batchSize %>
         startingPosition: <%= startingPosition %>
 <% if (Array.isArray(filterPatterns) && filterPatterns.length > 0) { -%>

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

@@ -11,8 +11,12 @@ export async function renderDynamo(state) {
     )
   ]);
   const indentedTables = tables.map((t) => indentYaml(t, 2)).join('\n');
+  let content = system;
   if (indentedTables) {
-    return `${system}\n${indentedTables}`;
+    content = `${content}\n${indentedTables}`;
   }
-  return `${system}`;
+  if (state.selfRbac) {
+    content = `${content}\n\nOutputs:\n  RunningTotalReservedUsageStreamArn:\n    Value:\n      Fn::GetAtt: [RunningTotalReservedUsageTable, StreamArn]\n    Export:\n      Name: \${self:custom.iz_resourcePrefix}RunningTotalReservedUsageStreamArn\n`;
+  }
+  return content;
 }

package/src/plan/domainRegistry.js

@@ -145,7 +145,8 @@ export async function resolveEmissionGroups(context) {
   ]);
 
   const custom = await emitCustomFlowApplicationArtifacts(flows, {
-    objects
+    objects,
+    relationships
   });
 
   let systemFunctions = [];

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

@@ -332,7 +332,7 @@ test('generates synchronous HdrInv and HdrApi handlers for FlowLimit flows', asy
     /ReservedUsageTtlExpiredHdrDss:\n\s+handler: src\/generatedCode\/FlowLimit\/ReservedUsageTtlExpired\/source\/ReservedUsageTtlExpired_HdrDss\.main/
   );
   assert.match(limitYaml, /type: dynamodb/);
-  assert.match(limitYaml, /RunningTotalReservedUsageTable/);
+  assert.match(limitYaml, /RunningTotalReservedUsageStreamArn/);
   assert.match(limitYaml, /eventName: \["REMOVE"\]/);
 });