@izara_project/izara-market-library-service-schemas 1.0.41 → 1.0.42

package/src/reStructure/TemplateData/flowSchema/externalTopic/Complete/handler/data.js

@@ -0,0 +1,93 @@
+/*
+Copyright (C) 2020 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/>.
+*/
+
+'use strict';
+const path = require('path');
+
+const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
+const {
+  SOURCE_PATH,
+  defaultIamRolePerAction,
+  createIamRole,
+  RESOURCE_CLASSES,
+  SNS_RESOURCE,
+  resourceNames,
+  DYNAMO_RESOURCE,
+  SAVE_FILE_NAME,
+  FUNCTION_NAME,
+  shortNameHandler,
+  externalResourceYaml,
+  SOURCE_GENERATE_IAM_ROLE,
+  SQS_RESOURCE,
+  LAMBDA_RESOURCE
+} = require('../../../../../../MainLibs/src/Consts');
+const { NoRetryError } = require('@izara_project/izara-core-library-core');
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema;
+
+const templatePath = path.join(__dirname, "template.ejs");
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+function data(_izContext, flowSchema, srcPath) {
+  if (!flowSchema.outputTopic) {
+    return []
+  } else {
+    return [createSourceParams(_izContext, flowSchema, srcPath)]
+  }
+}
+
+function createSourceParams(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(flowSchema.flowTag) + "Complete"
+  let handlerType = upperCase(HANDLER.hdrSqs)
+  let additionalResourcePermission = defaultIamRolePerAction();
+  let queueName = functionName + handlerType;
+
+  additionalResourcePermission.push(
+    createIamRole(
+      {
+        [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.sqs, queueName),
+        resourceNames(RESOURCE_CLASSES.sqs, queueName + "DLQ")
+      ]
+    )
+  )
+
+  return {
+    templatePath: templatePath,
+    templateData: {
+      functionName,
+      handlerType,
+      queueName
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
+      saveFileName: `${functionName}_${handlerType}`,
+      fileExtension: ".js",
+      isAppend: false
+    }
+  }
+}
+
+module.exports = data;

package/src/reStructure/TemplateData/flowSchema/externalTopic/Complete/mainFunction/data.js

@@ -0,0 +1,61 @@
+/*
+Copyright (C) 2020 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/>.
+*/
+
+'use strict';
+const path = require('path');
+
+const { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../../../MainLibs/src/Consts');
+
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
+const templatePath = path.join(__dirname, "template.ejs");
+
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+
+function data(_izContext, flowSchema, srcPath) {
+  if (!flowSchema.outputTopic) {
+    return []
+  } else {
+    return [createParamsForCreateSource(_izContext, flowSchema, srcPath)]
+  }
+}
+
+function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(flowSchema.flowTag) + "Complete";
+  let flowSchemaComplete = functionName + "Complete"
+  return {
+    templatePath: templatePath,
+    templateData: {
+      flowTag: flowSchema.flowTag,
+      functionName,
+      flowSchemaComplete
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
+      saveFileName: `${functionName}_Main`,
+      fileExtension: ".js",
+      isAppend: false
+    }
+  }
+}
+module.exports = data

package/src/reStructure/TemplateData/flowSchema/externalTopic/Complete/mainFunction/template.ejs

@@ -0,0 +1,96 @@
+/*
+Copyright (C) 2020 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 />.
+*/
+
+'use strict';
+
+const hash = require('@izara_project/izara-shared-core').objectHash;
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
+
+const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
+const snsSharedLib = require('@izara_project/izara-core-library-sns');
+const sqsSharedLib = require('@izara_project/izara-core-library-sqs');
+const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
+const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
+const storedCacheSharedLib = require('@izara_project/izara-core-library-stored-cache')
+
+const externalRequest = require('@izara_project/izara-core-library-external-request');
+const sns = externalRequest.sns
+const sqs = externalRequest.sqs
+const lambda = externalRequest.lambda
+const { postToConnection } = require("../../../libs/source/GenerateCodeLibs");
+const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils')
+const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError
+const { v4: uuidv4 } = require('uuid')
+const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
+const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
+const { createFieldNamesFromRequestParamsByObjectSchema } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs.js')
+//(<optionalRequire>)
+//(</optionalRequire>)
+/**
+ *
+ *
+ * description of function.
+ * @param {Object} _izContext
+ * @param {CorrelationIds} _izContext.correlationIds - property of _izContext
+ * @param {Logger} _izContext.logger - property of _izContext
+ * @param {Object} requestParams - request params
+ * @param {Object} requestParams.identifiers - identifiers for get data
+ * @param {Object} requestParams.additionalRequest - additionalRequest
+ *
+ *
+ * @returns {object} description of return value
+ */
+
+module.exports.<%- functionName %> = async (
+  _izContext,
+  requestParams,
+  callingFlowConfig = {},
+  //(<additionalParams>)
+  //(</additionalParams>)
+) => {
+
+  try {
+    _izContext.logger.debug("<%- functionName %> _izContext", _izContext)
+    _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
+    _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
+
+    let correlationId = _izContext.correlationIds.get(consts.X_CORRELATION_ID)
+    let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID);
+
+    //(<endpointHookMainFunction>)
+    //(</endpointHookMainFunction>)
+
+    const flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+      flowTag: "<%- flowTag %>",
+      serviceTag: process.env.iz_serviceTag
+    })
+
+    //(<endpointHook>)
+    //(</endpointHook>)
+
+    return {
+      //(<endpointReturn>)
+      //(</endpointReturn>)
+    }
+  } catch (err) {
+    _izContext.logger.error('error WebSocketInvoke: ', err)
+    throw (err)
+  }
+}

package/src/reStructure/TemplateData/flowSchema/externalTopic/{functionYaml → Process/functionYaml}/data.js

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const path = require('path');
 
 const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { firstLetterUpperCase: upperCase } = require('../../../../../MainLibs/src/Utils')
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
 const {
   SOURCE_PATH,
   defaultIamRolePerAction,
@@ -35,7 +35,7 @@ const {
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
   LAMBDA_RESOURCE
-} = require('../../../../../MainLibs/src/Consts');
+} = require('../../../../../../MainLibs/src/Consts');
 const { NoRetryError } = require('@izara_project/izara-core-library-core');
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema;
 
@@ -57,7 +57,8 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   let handlerType = upperCase(HANDLER.hdrSqs)
   let additionalResourcePermission = defaultIamRolePerAction();
   let route = upperCase(flowSchema.flowTag);
-  let queueName = "Process" + upperCase(flowSchema.flowTag) + handlerType;
+  let queueName = upperCase(flowSchema.flowTag) + handlerType;
+  let topicIn = route + "_In";
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -78,6 +79,21 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
     ),
   )
 
+  if (Object.keys(flowSchema.flowSteps).includes("In")) {
+    additionalResourcePermission.push(
+      createIamRole(
+        {
+          [RESOURCE_CLASSES.sns]: [
+            SNS_RESOURCE.publish
+          ]
+        },
+        [
+          resourceNames(RESOURCE_CLASSES.sns, topicIn)
+        ]
+      )
+    )
+  }
+
   if (flowSchema.statusType === "storedCache") {
     let tableStroedCaches = [];
     let objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], path.join(srcPath, "./schemas")).then(res => res.records[0])
@@ -124,4 +140,4 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   }
 }
 
-module.exports = data;
+module.exports = data;

package/src/reStructure/TemplateData/flowSchema/{flowSchemaOwnTopic/flowStep → externalTopic/Process}/functionYaml/template.ejs

@@ -8,6 +8,7 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
+          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/flowSchema/externalTopic/{handler → Process/handler}/data.js

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const path = require('path');
 
 const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { firstLetterUpperCase: upperCase } = require('../../../../../MainLibs/src/Utils')
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
 const {
   SOURCE_PATH,
   defaultIamRolePerAction,
@@ -35,7 +35,7 @@ const {
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
   LAMBDA_RESOURCE
-} = require('../../../../../MainLibs/src/Consts');
+} = require('../../../../../../MainLibs/src/Consts');
 const { NoRetryError } = require('@izara_project/izara-core-library-core');
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema;
 
@@ -56,7 +56,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = "Process" + upperCase(flowSchema.flowTag)
   let handlerType = upperCase(HANDLER.hdrSqs)
   let additionalResourcePermission = defaultIamRolePerAction();
-  let queueName = "Process" + upperCase(flowSchema.flowTag) + handlerType;
+  let queueName = upperCase(flowSchema.flowTag) + handlerType;
   additionalResourcePermission.push(
     createIamRole(
       {

package/src/reStructure/TemplateData/flowSchema/externalTopic/Process/handler/template.ejs

@@ -0,0 +1,87 @@
+/*
+Copyright (C) 2020 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/>.
+*/
+
+'use strict';
+
+// const AWS = require('aws-sdk');
+// const sqs = new AWS.SQS({ apiVersion: '2012-11-05' });
+
+const izara = require("@izara_project/izara-middleware");
+const middleware = izara.middlewareHandler;
+const recordHandlerSharedLib = require("@izara_project/izara-core-library-record-handler")
+const Logger = require('@izara_project/izara-core-library-logger');
+
+const <%- functionName %> = require('./<%- functionName %>_Main')
+
+// validate event properties in body.Message of sqs event
+let perRecordsValidatorSchema = {}
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+
+module.exports.main = middleware.wrap(async (event, context, callback) => {
+
+  try {
+
+    let recordPromises = [];
+
+    // loop each record and send to mainFunction
+    await Promise.all(event.Records.map(async record => { // promise.all for map() function
+
+      let passOnProperties = []
+      record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+      //validate message (and MessageAttributes)
+      await recordHandlerSharedLib.validateRecord(
+        record, // one record will send to mainFunction
+        "<%- queueName %>", // queue name that need to retry or send to dlq
+        perRecordsValidatorSchema, // schema for record.Message
+        // messageAttributeValidatorSchema   // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
+      );
+
+      // add argument (to invoke lambda) to passOnProperties[]
+      passOnProperties.push(record.body.Message)
+      //(<additionalParams>)
+      //(</additionalParams>)
+      record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
+
+      // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
+      let recordPromise = recordHandlerSharedLib.recordHandler(
+        record, // one record will send to mainFunction
+        <%- functionName %>.<%- functionName %>, // mainFunction that need to invoke.
+        "<%- queueName %>", // queue name that need to retry or send to dlq
+        passOnProperties, // all parameters that mainFunction needed.
+      );
+      record._izContext.logger.debug('after recordPromise in handler');
+      recordPromises.push(recordPromise); // push promise to recordPromises
+    }))
+
+    Logger.debug('before Promise.all(recordPromises) in handler');
+    try {
+      // --- main await all promises
+      await Promise.all(recordPromises); // await all promises
+
+      return event.Records // return all for local testing
+
+    } catch {
+      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
+    }
+    Logger.debug('after Promise.all(recordPromises) in handler');
+
+  } catch (err) {
+    Logger.error('Unhandled Error, LambdaFunctionHdrSqs: ', err);
+    throw (err);
+  }
+});

package/src/reStructure/TemplateData/flowSchema/externalTopic/{mainFunction → Process/mainFunction}/data.js

@@ -18,9 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const path = require('path');
 
-const { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts');
+const { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../../../MainLibs/src/Consts');
 
-const { firstLetterUpperCase: upperCase } = require('../../../../../MainLibs/src/Utils')
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
 const templatePath = path.join(__dirname, "template.ejs");
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 const { STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts');

package/src/reStructure/TemplateData/flowSchema/externalTopic/{mainFunction → Process/mainFunction}/template.ejs

@@ -61,9 +61,9 @@ const { createFieldNamesFromRequestParamsByObjectSchema } = require('@izara_proj
 module.exports.<%- functionName %> = async (
   _izContext,
   requestParams,
-  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
+  callingFlowConfig = {},
 ) => {
 
   try {
@@ -78,7 +78,7 @@ module.exports.<%- functionName %> = async (
     //(</endpointHookMainFunction>)
 
     const flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
-      flowTag: requestParams.action,
+      flowTag: "<%- flowTag %>",
       serviceTag: process.env.iz_serviceTag
     })
 

package/src/reStructure/TemplateData/flowSchema/externalTopic/sns-in-sqs/data.js

@@ -31,8 +31,9 @@ const STORAGE_TYPES = {
   graph: "graph"
 }
 
-const snsTemplatePath = path.join(__dirname, '/template.ejs');
+const snsTemplatePath = path.join(__dirname, '../../../resourceYaml/sns-in-sqs/snsTemplate.ejs');
 const subscriptionSqsTemplatePath = path.join(__dirname, './sqsTemplate.ejs');
+const template = path.join(__dirname, "./template.ejs") // !! <----- Add here
 
 const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts.js');
 
@@ -57,18 +58,27 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
     isAppend: true
   }
 
-  let topicIn = `${upperCase(flowSchema.flowTag)}`;
 
   const generatedSnsTopicInForFlowSchema = [];
+
   if (flowSteps.includes("In")) {
     generatedSnsTopicInForFlowSchema.push(
       {
-        queueName: upperCase(topicIn) + "Complete" + upperCase(HANDLER.hdrSqs)
-
+        queueName: upperCase(flowSchema.flowTag),
       }
     )
   }
 
+  resultsForCreateDefaultSnsInSqs.push({ 
+    templatePath: template,
+    templateData: {
+      queueName: upperCase(flowSchema.flowTag) + "CompleteHdrSqs",
+    },
+    setting: setting
+  })
+
+
+
   for (let defaultSnsInSqsData of generatedSnsTopicInForFlowSchema) {
     resultsForCreateDefaultSnsInSqs.push({
       templatePath: snsTemplatePath,

package/src/reStructure/TemplateData/flowSchema/externalTopic/sns-in-sqs/sqsTemplate.ejs

@@ -0,0 +1,52 @@
+##===== [subsription to topic In]
+  Subscription<%- queueName-%>:
+  Type: AWS::SNS::Subscription
+  Properties:
+    TopicArn: !Ref <%- subScription %>
+    Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>"
+    Protocol: "sqs"
+##===== [Queue]
+  <%- queueName %>:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>
+      RedrivePolicy:
+        deadLetterTargetArn:
+        # !GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>DLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+##==== [QueueDLQ]
+  <%- queueName %>DLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>DLQ
+##==== [QueuePolicy]
+  <%- queueName %>Policy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource:
+            # !GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>
+  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+
+  <%_ function firstLetterUpperCase(text){
+    return text.charAt(0).toUpperCase() + text.slice(1)
+  } _%>
+  <%_ function firstLetterLowerCase(str) {
+    return str.charAt(0).toLowerCase() + str.slice(1)
+  } _%>

package/src/reStructure/TemplateData/flowSchema/externalTopic/sns-out/data.js

@@ -62,7 +62,7 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
   if (flowSteps.includes("Out")) {
     generatedSnsTopicInForFlowSchema.push(
       {
-        queueName: upperCase(topicOut) + "Complete"
+        queueName: upperCase(topicOut)
 
       }
     )

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComplete/functionYaml/data.js

@@ -47,8 +47,7 @@ const templatePath = path.join(__dirname, "template.ejs");
  */
 
 function data(_izContext, flowSchema, srcPath) {
-  let flowSteps = Object.keys(flowSchema.flowSteps)
-  if (flowSteps.includes("Out") && flowSchema.outputTopic === false) {
+  if (flowSchema.outputTopic === false) {
     return []
   } else {
     return [createSourceParams(_izContext, flowSchema, srcPath)]
@@ -59,7 +58,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(flowSchema.flowTag) + "Complete"
   let handlerType = upperCase(HANDLER.hdrSqs)
   let additionalResourcePermission = defaultIamRolePerAction();
-  let topicOut = flowSchema.flowTag + "Complete_Out"
+  let topicOut = flowSchema.flowTag + "_Out"
   let queueName = functionName + handlerType
   additionalResourcePermission.push(
     createIamRole(
@@ -75,7 +74,8 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
         [RESOURCE_CLASSES.sqs]: [SQS_RESOURCE.sendMessage, SQS_RESOURCE.receiveMessage, SQS_RESOURCE.deleteMessage, SQS_RESOURCE.getQueueAttributes]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sqs, queueName)
+        resourceNames(RESOURCE_CLASSES.sqs, queueName),
+        resourceNames(RESOURCE_CLASSES.sqs, queueName + "DLQ")
       ]
     )
   )

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComplete/functionYaml/template.ejs

@@ -8,6 +8,7 @@
         batchSize: 10
         filterPatterns: #**** need to update serverless framwork upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
+          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComplete/handler/data.js

@@ -32,8 +32,7 @@ const templatePath = path.join(__dirname, "template.ejs")
 
 
 function data(_izContext, flowSchema, srcPath) {
-  let flowSteps = Object.keys(flowSchema.flowSteps)
-  if (flowSteps.includes("Out") && flowSchema.outputTopic === false) {
+  if (flowSchema.outputTopic === false) {
     return []
   } else {
     return [createSourceParams(_izContext, flowSchema, srcPath)]

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComplete/handler/template.ejs

@@ -25,7 +25,7 @@ const middleware = izara.middlewareHandler;
 const recordHandlerSharedLib = require("@izara_project/izara-core-library-record-handler")
 const Logger = require('@izara_project/izara-core-library-logger');
 
-const FlowSchemaOwnTopicEndpoint = require('./FlowSchemaOwnTopicEndpoint_Main')
+const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event properties in body.Message of sqs event
 let perRecordsValidatorSchema = {}

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComplete/mainFunction/data.js

@@ -34,22 +34,22 @@ const getObjectSchema = require('@izara_project/izara-core-library-service-schem
 
 
 function data(_izContext, flowSchema, srcPath) {
-  let flowSteps = Object.keys(flowSchema.flowSteps)
-  if (flowSteps.includes("Out") && flowSchema.outputTopic === false) {
+  if (flowSchema.outputTopic === false) {
     return []
   } else {
-    return [createParamsForCreateSource(_izContext, flowSchema, srcPath)]
+    return [createSourceParams(_izContext, flowSchema, srcPath)]
   }
 }
 
-function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(flowSchema.flowTag) + "Complete" + upperCase(HANDLER.hdrSqs)
+function createSourceParams(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(flowSchema.flowTag) + "Complete"
   let topicOut = flowSchema.flowTag + "Complete_Out"
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
       topicOut,
+      flowTag: flowSchema.flowTag
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),