@izara_project/izara-core-generate-service-code 1.0.38 → 1.0.40

package/src/generateCode/generateFlowStepWithPlugIn/byConfig/sns-sqs/queueNoTopic.ejs

@@ -0,0 +1,43 @@
+#------- queue ---------
+  <%- queueName %>HdrSqs:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
+      RedrivePolicy:
+        deadLetterTargetArn: #!GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>HdrSqsDLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+
+  <%- queueName %>HdrSqsDLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
+
+  <%- queueName %>HdrSqsPolicy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource: #!GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>HdrSqs
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>HdrSqs
+  #<#<%- 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/generateCode/generateFlowStepWithPlugIn/byConfig/sns-sqs/snsTemplate.ejs

@@ -0,0 +1,58 @@
+##===== [Create topic in]
+  In<%- queueName %>:
+    Type: AWS::SNS::Topic
+    Properties:
+      DisplayName: "SNS Message in"
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
+##===== SNS Subscription [Topic In] =====##
+  SubscriptionIn<%- queueName %>:
+    Type: AWS::SNS::Subscription
+    Properties:
+      TopicArn: !Ref In<%- queueName %>
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
+      Protocol: "sqs"
+##===== [Queue]
+  <%- queueName %>HdrSqs:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
+      RedrivePolicy:
+        deadLetterTargetArn:
+        # !GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>HdrSqsDLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+##==== [QueueDLQ]
+  <%- queueName %>HdrSqsDLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
+##==== [QueuePolicy]
+  <%- queueName %>HdrSqsPolicy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource:
+            # !GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>HdrSqs
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>HdrSqs
+  #<#<%- 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/generateCode/generateFlowStepWithPlugIn/byConfig/sns-sqs/sqsTemplate.ejs

@@ -0,0 +1,43 @@
+#------- queue ---------
+  <%- queueName %>HdrDsq:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrDsq
+      RedrivePolicy:
+        deadLetterTargetArn: #!GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>DLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+
+  <%- queueName %>HdrDsqDLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrDsqDLQ
+
+  <%- queueName %>HdrDsqPolicy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource: #!GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>HdrDsq
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>HdrDsq
+  #<#<%- 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/generateCode/generateFlowStepWithPlugIn/byConfig/yaml/data.js

@@ -0,0 +1,47 @@
+/*
+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/>.
+*/
+
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+import consts from '#libs/Consts.js';
+import utils from '#libs/Utils.js';
+
+const { firstLetterUpperCase: upperCase } = utils;
+const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
+const templatePath = path.join(__dirname, 'template.ejs');
+
+function data(_izContext, data, appPath) {
+  if (data.handleLogic === 'awaitingMultipleSteps') {
+    data.callingFlow = 'haveCallingFlow'
+  }
+  return {
+    templatePath: templatePath,
+    templateData: { ...data },
+    setting: {
+      savePath: path.join(appPath, SOURCE_PATH.appYaml),
+      saveFileName: SAVE_FILE_NAME.flowSchemaYaml,
+      fileExtension: '.yml',
+      isAppend: true
+    }
+  }
+}
+
+
+export default data;

package/src/generateCode/generateFlowStepWithPlugIn/byConfig/yaml/template.ejs

@@ -0,0 +1,43 @@
+<%- functionNameConfig %>:
+  handler: <%- handlerPath %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %>
+  role: <%- roleName %>Role
+  #<#<%- hookTagSetting %>#>
+  #<#/<%- hookTagSetting %>#>
+<%_ if (handlerType === 'hdrDsq' || handlerType === 'hdrSqs') { _%>
+  events:
+    - sqs:
+        arn: <%- event %>
+        batchSize: 10
+        <% if (callingFlow) { %>
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
+          - body: {
+                'MessageAttributes':
+                  {
+                    'callingFlow':
+                      { 'Value': ['${self:custom.iz_resourcePrefix}<%- flowTag %><%- flowStepName %><%- handleLogic %>'] }
+                  }
+              } # functionName of callingFlow
+          - body:
+              {
+                'MessageAttributes':
+                  { 'callingFlow': { 'Value': [{ 'exists': false }] } }
+              }
+        <% } %>
+<%_ } else if (handlerType === 'hdrApi' && resourceApis.length > 0) { _%>
+  events:
+<%_ resourceApis.forEach(api => { _%>
+    - httpApi:
+        path: <%- api.path %>
+        method: <%- api.method %>
+        #<#<%- api.hookTagApp %>#>
+        # authorizer: authorizerServiceSchema
+        #<#/<%- api.hookTagApp %>#>
+    - httpApi:
+        path: <%- api.pathWithUser %>
+        method: <%- api.method %>
+        #<#<%- api.hookTagUser %>#>
+        # authorizer: authorizerIdentifiers
+        #<#/<%- api.hookTagUser %>#>
+<%_ }) _%>
+<%_ } _%>

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/handler/data.js

@@ -42,7 +42,13 @@ async function data(_izContext, data, appPath) {
       ...data,
     },
     setting: {
-      savePath: path.join(appPath, SOURCE_PATH.flowSchema, `${upperCase(data.flowTag)}`, `${data.flowStepName}`, 'source/'),
+      savePath: path.join(
+        appPath,
+        SOURCE_PATH.flowSchema,
+        `${upperCase(data.flowTag)}`,
+        `${upperCase(data.flowStepName)}`,
+        'source/'
+      ),
       saveFileName: `${upperCase(data.functionName)}_${upperCase(data.handlerType)}`,
       fileExtension: '.js',
       isAppend: true

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/data.js

@@ -19,22 +19,60 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-
+import { NoRetryError } from '@izara_project/izara-core-library-core';
 import consts from '#libs/Consts.js';
 import utils from '#libs/Utils.js';
-
-const { firstLetterUpperCase: upperCase } = utils;
+import libs from '#libs/Libs.js'
+const { getLocalOrS3FlowSchema, } = libs
+const { firstLetterUpperCase: upperCase, getLocalConfig } = utils;
 const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
 const templatePath = path.join(__dirname, 'template.ejs');
-
+const templateSendPlugin = path.join(__dirname, './templateByConfig/templateSendPlugin.ejs');
+const templateAwaitingStep = path.join(__dirname, './templateByConfig/awaitingSteps.ejs');
 
 async function data(_izContext, data, appPath) {
-  console.log("data", data)
+
+  const [mainFlow] = await getLocalOrS3FlowSchema(
+    _izContext,
+    {
+      serviceTag: getLocalConfig('iz_serviceTag'),
+      flowTag: data.flowTag,
+    },
+    path.join(
+      appPath, './src/schemas')
+  );
+
+  const [childFlow] = await getLocalOrS3FlowSchema(
+    _izContext,
+    data.childFlow,
+    path.join(
+      appPath, './src/schemas')
+  );
+
+  if (mainFlow.hasOwnProperty('objType')) {
+    data['mainObjType'] = mainFlow.objType;
+  };
+
+  if (!childFlow) {
+    throw new NoRetryError(`can't get ${childFlow.flowTag} from s3 or local`);
+  };
+
+  if (childFlow && childFlow.hasOwnProperty('objType')) {
+    data['childObjType'] = childFlow.objType;
+  };
+
+
   return {
     templatePath: templatePath,
-    templateData: { ...data },
+    templateData: { ...data, templateSendPlugin, templateAwaitingStep },
     setting: {
-      savePath: path.join(appPath, SOURCE_PATH.flowSchema, `${upperCase(data.flowTag)}`, `${data.flowStepName}`, 'source/'),
+      savePath: path.join(
+        appPath,
+        SOURCE_PATH.flowSchema,
+        `${upperCase(data.flowTag)}`,
+        `${upperCase(data.flowStepName)}`,
+        'source/'
+      ),
       saveFileName: `${upperCase(data.functionName)}_Main`,
       fileExtension: '.js',
       isAppend: false

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/template.ejs

@@ -55,24 +55,13 @@ export default async function <%- functionName %>(
     _izContext.logger.debug('<%- functionName %> callingFlowConfig: ', callingFlowConfig);
 
     //(<hookCode>)
-    <% if (havePlugIn) { -%>
-      <% if (invokeType === 'async') { -%>
-      let messageObject = {
-        action: "recievePlugInRequestAsync"
-      };
-      <% } -%>
-    <% } -%>
-
-
-    //(</hookCode>)
-
+    //(<hookCode>)
 
+    <% if (handleLogic === 'awaitingMultipleSteps') { %>
+    <%- include(templateAwaitingStep, { childFlow, mainObjType, childObjType }) %>
+    <% } %>
     <% if (havePlugIn) { -%>
-      <% if (invokeType === 'sync') { -%>
-    await api.invokeLambdaApi(_izContext, "<%- targetUrl %>", messageObject)
-      <% } else if (invokeType === 'async') { -%>
-    await webSocket.invokeWebSocket(_izContext, "<%- targetUrl %>", messageObject)
-      <% } -%>
+    <%- include(templateSendPlugin, {havePlugIn: havePlugIn, invokeType: invokeType, targetUrl: targetUrl}) %>
     <% } -%>
 
   } catch (err) {

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/templateByConfig/awaitingSteps.ejs

@@ -0,0 +1,63 @@
+const allAwaitingStepsId = [];
+
+allAwaitingStepsId.push(
+  {
+    awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
+      hash({
+        //(<createAwaitingStepIds>)
+        //(</createAwaitingStepIds>)
+      }),
+      "<%- firstLetterUpperCase(flowTag) %><%- firstLetterUpperCase(flowStepName)%>"
+    )
+  }
+)
+
+await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
+  _izContext,
+  allAwaitingStepsId,
+  asyncFlowSharedLib.createPendingStepId(
+    hash({
+      <% if (mainObjType) { -%>
+          objType: {
+            serviceTag: "<%- mainObjType.serviceTag %>",
+            objectType: "<%- mainObjType.objectType %>"
+          },
+          //(<createPendingStepIds>)
+          //(</createPendingStepIds>)
+      <% } else { -%>
+        xCorrelationId: _izContext.correlationIds.xCorrelationId,
+        //(<createPendingStepIds>)
+        //(</createPendingStepIds>)
+      <% } %>
+     }),
+    "<%- firstLetterUpperCase(flowTag) %><%- firstLetterUpperCase(flowStepName)%><%- firstLetterUpperCase(handleLogic) %>"
+  )
+);
+
+//(<afterCreateAwatingSteps>)
+
+  let messageObject = {
+
+  };
+
+  messageObject =  messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+    messageObject,
+    callingFlowSharedLib.addParentCallingFlowConfig(
+      callingFlowConfig,
+      callingFlowSharedLib.createCallingFlowConfig(
+        //(<callingFlowProperties>)
+        await lambdaSharedLib.lambdaFunctionName(_izContext, "<%- firstLetterUpperCase(flowTag) %><%- firstLetterUpperCase(flowStepName) %><%- firstLetterUpperCase(handleLogic) %>"), {}
+        //(</callingFlowProperties>)
+      )
+    )
+  );
+
+  await sns.publishAsync(_izContext, {
+    Message: JSON.stringify(messageObject),
+    TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "<%- childFlow.flowTag %>_In", "<%- childFlow.serviceTag %>")
+  });
+//(</afterCreateAwatingSteps>)
+
+<%_ function firstLetterUpperCase(text) {
+  return text.charAt(0).toUpperCase() + text.slice(1);
+} -%>

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/templateByConfig/templateSendPlugin.ejs

@@ -0,0 +1,18 @@
+    //(<createParams>)
+    <% if (havePlugIn) { -%>
+      <% if (invokeType === 'async') { -%>
+      let messageObject = {
+        action: "recievePlugInRequestAsync"
+      };
+      <% } -%>
+    <% } -%>
+    //(</createParams>)
+
+
+    <% if (havePlugIn) { -%>
+      <% if (invokeType === 'sync') { -%>
+    await api.invokeLambdaApi(_izContext, "<%- targetUrl %>", messageObject)
+      <% } else if (invokeType === 'async') { -%>
+    await webSocket.invokeWebSocket(_izContext, "<%- targetUrl %>", messageObject)
+      <% } -%>
+    <% } -%>

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/queueNtopic/sqsTemplate.ejs

@@ -1,8 +1,8 @@
 #------- queue ---------
-  <%- queueName %>:
+  <%- queueName %>HdrDsq:
     Type: "AWS::SQS::Queue"
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrDsq
       RedrivePolicy:
         deadLetterTargetArn: #!GetAtt
           Fn::GetAtt:
@@ -11,12 +11,12 @@
         maxReceiveCount: 3
       VisibilityTimeout: 120
 
-  <%- queueName %>DLQ:
+  <%- queueName %>HdrDsqDLQ:
     Type: AWS::SQS::Queue
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>DLQ
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrDsqDLQ
 
-  <%- queueName %>Policy:
+  <%- queueName %>HdrDsqPolicy:
     Type: AWS::SQS::QueuePolicy
     Properties:
       PolicyDocument:
@@ -27,11 +27,11 @@
             Principal: "*"
             Resource: #!GetAtt
               Fn::GetAtt:
-                - <%- queueName %>
+                - <%- queueName %>HdrDsq
                 - Arn
             Action: "SQS:SendMessage"
       Queues:
-        - Ref: <%- queueName %>
+        - Ref: <%- queueName %>HdrDsq
   #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
   #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
 

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/topicOut/data.js

@@ -28,7 +28,7 @@ const { SOURCE_PATH, SAVE_FILE_NAME, HANDLER } = consts;
 const templatePath = path.join(__dirname, '../../../resourceYamlComponent/sns-out/template.ejs')
 
 async function data(_izContext, data, appPath) {
-  const queueName = `${upperCase(data.flowTag)}_${upperCase(data.flowStepName)}`;
+  const queueName = `${upperCase(data.flowTag)}${upperCase(data.flowStepName)}`;
 
   return {
     templatePath: templatePath,