@izara_project/izara-core-generate-service-code 1.0.46 → 1.0.47

package/fix_array.js

@@ -0,0 +1,11 @@
+import fs from 'fs';
+import glob from 'glob';
+
+const files = glob.sync('src/generators/**/*.js');
+for (const file of files) {
+  let content = fs.readFileSync(file, 'utf8');
+  let changed = false;
+
+  // Let's just find any place where templateData is assigned an object and inject the upper variables if they are missing but they are present in the base variables.
+  // Actually, wait, it's easier to just find the EJS files that have upperQueueName etc. and see if they are missing in the JS.
+}

package/fix_imports.js

@@ -0,0 +1,41 @@
+import fs from 'fs';
+import path from 'path';
+
+function walkDir(dir, callback) {
+    fs.readdirSync(dir).forEach(f => {
+        const dirPath = path.join(dir, f);
+        const isDirectory = fs.statSync(dirPath).isDirectory();
+        isDirectory ? walkDir(dirPath, callback) : callback(dirPath);
+    });
+}
+
+walkDir('src/generators', (filePath) => {
+    if (!filePath.endsWith('.js')) return;
+    let content = fs.readFileSync(filePath, 'utf8');
+
+    if (content.includes('upperCase(')) {
+        let changed = false;
+        if (!content.includes('firstLetterUpperCase: upperCase') && !content.includes('upperCase =')) {
+            // Need to import upperCase
+            if (!content.includes('#libs/Utils.js')) {
+                // Find where to insert
+                content = content.replace(/(import consts from '#libs\/Consts\.js';)/, "$1\nimport utils from '#libs/Utils.js';\nconst { firstLetterUpperCase: upperCase } = utils;");
+            } else {
+                content = content.replace(/(import utils from '#libs\/Utils\.js';\n)/, "$1const { firstLetterUpperCase: upperCase } = utils;\n");
+            }
+            changed = true;
+        }
+        
+        if (changed) {
+            // just to be super safe against multiple definitions or if my regex failed:
+            if (!content.includes('firstLetterUpperCase: upperCase')) {
+                // If regex failed, just prepend it after imports
+                const importsEnd = content.lastIndexOf('import ');
+                const eol = content.indexOf('\n', importsEnd);
+                content = content.slice(0, eol+1) + "\nimport utils from '#libs/Utils.js';\nconst { firstLetterUpperCase: upperCase } = utils;\n" + content.slice(eol+1);
+            }
+            fs.writeFileSync(filePath, content, 'utf8');
+            console.log('Fixed imports in', filePath);
+        }
+    }
+});

package/fix_upper.js

@@ -0,0 +1,38 @@
+import fs from 'fs';
+import path from 'path';
+
+function walkDir(dir, callback) {
+    fs.readdirSync(dir).forEach(f => {
+        const dirPath = path.join(dir, f);
+        const isDirectory = fs.statSync(dirPath).isDirectory();
+        isDirectory ? walkDir(dirPath, callback) : callback(dirPath);
+    });
+}
+
+walkDir('src/generators', (filePath) => {
+    if (!filePath.endsWith('.ejs')) return;
+    let content = fs.readFileSync(filePath, 'utf8');
+    let changed = false;
+
+    if (content.includes('upperQueueName')) {
+        content = content.replace(/upperQueueName/g, 'queueName');
+        changed = true;
+    }
+    if (content.includes('upperTableName')) {
+        content = content.replace(/upperTableName/g, 'tableName');
+        changed = true;
+    }
+    if (content.includes('upperRoleNameConfig')) {
+        content = content.replace(/upperRoleNameConfig/g, 'roleNameConfig');
+        changed = true;
+    }
+    if (content.includes('upperFunctionNameConfig')) {
+        content = content.replace(/upperFunctionNameConfig/g, 'functionNameConfig');
+        changed = true;
+    }
+
+    if (changed) {
+        fs.writeFileSync(filePath, content, 'utf8');
+        console.log('Fixed', filePath);
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "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/generators/fromExternalService/externalServiceComponent/functionNameConfig/template.ejs

@@ -1,12 +1,12 @@
 # for createIamRole
 
 <% functionNameConfigs.forEach(functionNameConfig => { _%>
-- ${self:custom.iz_prefixIamRole}<%- firstLetterUpperCase(functionNameConfig) %>${self:custom.iz_suffixIamRole}
+- ${self:custom.iz_prefixIamRole}<%- functionNameConfig %>${self:custom.iz_suffixIamRole}
 <% }) _%>
 
 # for createIntTest
 <% functionNameConfigs.forEach(functionNameConfig => { _%>
-  "<%- firstLetterUpperCase(functionNameConfig) %>",
+  "<%- functionNameConfig %>",
 <% }) _%>
 
 <%_function firstLetterUpperCase(text) {

package/src/generators/fromExternalService/externalServiceComponent/functionNameConfig/templateIntTesting.ejs

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 export function generatedIntTestRoleNameConfig  () {
 let roleNameConfigIntTest = [
     <% roleNameConfigs.forEach(roleNameConfig => { _%>
-    "<%- firstLetterUpperCase(roleNameConfig) %>",
+    "<%- roleNameConfig %>",
     <% }) _%>
     ]
     return roleNameConfigIntTest

package/src/generators/fromExternalService/externalServiceComponent/functionNameConfig/templateYaml.ejs

@@ -1,7 +1,7 @@
 # for createIamRole
 
 <% roleNameConfigs.forEach(roleNameConfig => { _%>
-- arn:aws:iam::${self:custom.iz_accountId}:role/${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(roleNameConfig) %>
+- arn:aws:iam::${self:custom.iz_accountId}:role/${self:custom.iz_resourcePrefix}<%- roleNameConfig %>
 <% }) _%>
 
 

package/src/generators/fromFlowSchema/events/eventBridge/functionYaml/yaml.js

@@ -145,12 +145,16 @@ function createSourceParams(_izContext, flowSchema, appPath) {
         flowSchema.flowTag,
         'source/'
       ),
+
       functionName,
       functionNameConfig: functionNameConfig,
       additionalResourcePermission,
       roleName: SOURCE_GENERATE_IAM_ROLE.EventBridge,
       handlerType,
-      schedules
+      schedules,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType),
+      upperFunctionNameConfig: upperCase(functionNameConfig)
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromFlowSchema/events/eventBridge/handler/inv/inv.js

@@ -47,11 +47,15 @@ function data(_izContext, flowSchema, appPath) {
     templateData: {
       functionName: functionName,
       flowTag: upperCase(flowTag),
+
       // flowTag: ,
       // action: action,
-      handler
       // roleName: SOURCE_GENERATE_IAM_ROLE.EventBridge,
       // firstLetterUpperCase: upperCase,
+      handler,
+
+      upperFunctionName: upperCase(functionName),
+      upperHandler: upperCase(handler)
     },
     setting: {
       savePath: path.join(

package/src/generators/fromFlowSchema/events/eventBridge/mainFunction/main.js

@@ -38,17 +38,27 @@ const templatePath = path.join(__dirname, 'template.ejs');
 function data(_izContext, flowSchema, appPath) {
   // const handler = HANDLER.hdrInv;
   const flowTag = flowSchema.flowTag;
+  const functionName = 'EventBridge';
+  const roleName = SOURCE_GENERATE_IAM_ROLE.EventBridge;
+  const upperFunctionName = upperCase(functionName);
+  const upperRoleName = upperCase(roleName);
+  const upperFlowTag = upperCase(flowTag);
   // const functionName = "EventBridge" + upperCase(handler);
   // const action = SOURCE_GENERATE_IAM_ROLE.EventBridge;
   // const fileName = `${upperCase(flowTag)}${upperCase(action)}_Main`;
   return {
     templatePath: templatePath,
     templateData: {
-      functionName: 'EventBridge',
+      functionName,
       flowTag: flowTag,
-      roleName: SOURCE_GENERATE_IAM_ROLE.EventBridge,
+      roleName,
+
       // action: action,
-      firstLetterUpperCase: upperCase
+      firstLetterUpperCase: upperCase,
+
+      upperFunctionName,
+      upperRoleName,
+      upperFlowTag
     },
     setting: {
       savePath: path.join(

package/src/generators/fromFlowSchema/events/eventBridge/mainFunction/template.ejs

@@ -53,7 +53,7 @@ export default async function <%- functionName %>Main(
     //(</eventBridgeHook>)
 
   } catch (err) {
-  _izContext.logger.error('error <%- firstLetterUpperCase(functionName) %>Main: ', err)
+  _izContext.logger.error('error <%- upperFunctionName %>Main: ', err)
     throw (err)
   }
 }

package/src/generators/fromFlowSchema/events/extTopic/process/functionYaml/yaml.js

@@ -137,10 +137,15 @@ async function createSourceParams(_izContext, flowSchema, appPath) {
       handlerType,
       additionalResourcePermission,
       route,
+
       functionNameConfig:
         upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+
       roleName: upperCase(flowSchema.flowTag),
-      queueName
+      queueName,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType),
+      upperQueueName: upperCase(queueName)
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromFlowSchema/events/extTopic/process/handler/handler.js

@@ -45,7 +45,10 @@ function createSourceParams(_izContext, flowSchema, appPath) {
     templateData: {
       functionName,
       handlerType,
-      queueName
+      queueName,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType),
+      upperQueueName: upperCase(queueName)
     },
     setting: {
       savePath: path.join(

package/src/generators/fromFlowSchema/events/extTopic/sns-in-sqs/template.ejs

@@ -34,14 +34,11 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
 
-  <%_ function firstLetterUpperCase(text){
-    return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
-  <%_ function firstLetterLowerCase(str) {
+    <%_ function firstLetterLowerCase(str) {
     return str.charAt(0).toLowerCase() + str.slice(1)
   } _%>
 

package/src/generators/fromFlowSchema/events/lambdaSyncApi/functionYaml/yaml.js

@@ -62,14 +62,19 @@ function createSourceParamsApi(_izContext, flowSchema, appPath) {
         //   'source/'
         // ),
         savePath.flowSchemaFlowTag(flowSchema.flowTag),
+
       functionName,
       handlerType,
       additionalResourcePermission,
+
       functionNameConfig:
         upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+
       roleName: upperCase(flowSchema.flowTag),
       event: 'post',
-      serviceTag: serviceTag
+      serviceTag: serviceTag,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType)
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromFlowSchema/events/lambdaSyncApi/handler/handler.js

@@ -43,9 +43,13 @@ function createSourceParamsApi(_izContext, flowSchema, appPath) {
     templatePath: templatePath,
     templateData: {
       functionName,
-      handlerType
+
       // propertyNames,
       // properties
+      handlerType,
+
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType)
     },
     setting: {
       savePath: path.join(

package/src/generators/fromFlowSchema/events/lambdaSyncInv/functionYaml/yaml.js

@@ -54,11 +54,15 @@ function createSourceParamsInvoke(_izContext, flowSchema, appPath) {
         //   'source/'
         // ),
         savePath.flowSchemaFlowTag(flowSchema.flowTag),
+
       handlerType,
       additionalResourcePermission,
+
       functionNameConfig:
         upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      roleName: upperCase(flowSchema.flowTag)
+
+      roleName: upperCase(flowSchema.flowTag),
+      upperHandlerType: upperCase(handlerType)
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromFlowSchema/events/lambdaSyncInv/handler/handler.js

@@ -43,7 +43,9 @@ function createSourceParamsInvoke(_izContext, flowSchema, appPath) {
     templatePath: templatePath,
     templateData: {
       functionName,
-      handlerType
+      handlerType,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType)
     },
     setting: {
       savePath: path.join(

package/src/generators/fromFlowSchema/events/ownTopic/endpoint/functionYaml/yaml.js

@@ -160,9 +160,13 @@ async function createSourceParams(_izContext, flowSchema, appPath) {
     templateData: {
       ...baseTemplateData,
       handlerType,
+
       functionNameConfig:
         upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      queueName
+
+      queueName,
+      upperHandlerType: upperCase(handlerType),
+      upperQueueName: upperCase(queueName)
     },
     setting: setting
   });

package/src/generators/fromFlowSchema/events/ownTopic/endpoint/handler/handler.js

@@ -48,7 +48,9 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
     templateData: {
       functionName,
       handlerType: handlerTypeSqs,
-      queueName
+      queueName,
+      upperFunctionName: upperCase(functionName),
+      upperQueueName: upperCase(queueName)
     },
     setting: {
       savePath: path.join(
@@ -70,7 +72,8 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
       templateData: {
         functionName,
         handlerType: handlerTypeDsq,
-        queueName: `${upperCase(flowSchema.flowTag)}${handlerTypeDsq}`
+        queueName: `${upperCase(flowSchema.flowTag)}${handlerTypeDsq}`,
+        upperFunctionName: upperCase(functionName)
       },
       setting: {
         savePath: path.join(

package/src/generators/fromFlowSchema/events/ownTopic/flowSchema/handler/handler.js

@@ -45,7 +45,9 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
     templateData: {
       functionName,
       handlerType,
-      route
+      route,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType)
     },
     setting: {
       savePath: path.join(

package/src/generators/fromFlowSchema/events/ownTopic/flowSchema/handler/template.ejs

@@ -66,6 +66,7 @@ export const main = middleware.wrap(async (event, context) => {
               {
                 taskKey: `${createFlowTypeConcat(event._izContext, { flowTag: "<%- route %>", serviceTag: process.env.iz_serviceTag })}${identifiers}`,
                 connectionId: connectionId,
+                ttl: 600
               }
             )
 
@@ -80,7 +81,6 @@ export const main = middleware.wrap(async (event, context) => {
             )
           }
 
-
           let callingFlow = eventParams?.callingFlow ? eventParams.callingFlow : {};
           await <%- functionName %>(
             event._izContext,

package/src/generators/fromFlowSchema/events/ownTopic/flowSchema/mainFunction/main.js

@@ -45,7 +45,8 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
     templateData: {
       topicArn,
       flowTag: flowSchema.flowTag,
-      functionName
+      functionName,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(

package/src/generators/fromFlowSchema/events/s3/flowSchemaMainFunction/main.js

@@ -99,7 +99,9 @@ async function createParamsForCreateSource(_izContext, flowSchema, appPath) {
       tableName,
       flowSchemaComplete,
       triggerType,
-      queueName: `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig('iz_serviceTag'), flowTag: upperCase(flowSchema.flowTag) })}_Main`
+      queueName: `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig('iz_serviceTag'), flowTag: upperCase(flowSchema.flowTag) })}_Main`,
+      upperFunctionName: upperCase(functionName),
+      upperTableName: upperCase(tableName)
     },
     setting: {
       savePath:

package/src/generators/fromFlowSchema/events/s3/upload/confirmReserved/functionYaml/template.ejs

@@ -1,17 +1,13 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPath %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>FunctionSetting#>
   #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
         batchSize: 10
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
-        - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>"]}}} # functionName of callingFlow
+        - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- upperFunctionName %><%- upperHandlerType %>"]}}} # functionName of callingFlow
         - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>

package/src/generators/fromFlowSchema/events/s3/upload/confirmReserved/functionYaml/yaml.js

@@ -101,21 +101,32 @@ function createSourceParams(_izContext, flowSchema, appPath) {
     )
   );
 
+  const resourceLocation = path.join(
+    SOURCE_PATH.resourceLocationWebSocket,
+    flowSchema.flowTag,
+    'source/'
+  );
+  const functionNameConfig = functionName + upperCase(handlerType);
+  const upperFunctionNameConfig = upperCase(functionNameConfig);
+  const upperFunctionName = upperCase(functionName);
+  const upperHandlerType = upperCase(handlerType);
+  const handlerPath = path.join(resourceLocation, `${functionName}_${upperHandlerType}.main`);
+  const upperRoleName = upperCase(SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role);
+
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
       handlerType,
-      functionNameConfig: functionName + upperCase(handlerType),
-      resourceLocation: path.join(
-        SOURCE_PATH.resourceLocationWebSocket,
-        flowSchema.flowTag,
-        'source/'
-      ),
+      resourceLocation,
       additionalResourcePermission,
-      functionNameConfig:
-        upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
+      functionNameConfig,
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role,
+      upperFunctionNameConfig,
+      handlerPath,
+      upperHandlerType,
+      upperFunctionName,
+      upperRoleName
     },
     setting: {
       saveFileName: SAVE_FILE_NAME.flowSchemaYaml,

package/src/generators/fromFlowSchema/events/s3/upload/confirmReserved/handler/handler.js

@@ -44,7 +44,9 @@ function createSourceParams(_izContext, flowSchema, appPath) {
     templatePath: templatePath,
     templateData: {
       functionName,
-      handlerType
+      handlerType,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType)
     },
     setting: {
       saveFileName: `${functionName}_${handlerType}`,

package/src/generators/fromFlowSchema/events/s3/upload/confirmReserved/queue/template.ejs

@@ -34,12 +34,9 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>HdrSqs
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- 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/generators/fromFlowSchema/events/s3/upload/createObject/functionYaml/template.ejs

@@ -1,7 +1,6 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPathUpperFunctionName %>
+  name: ${self:custom.iz_resourcePrefix}<%- upperFunctionName %><%- upperHandlerType %>
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>FunctionSetting#>
   #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
@@ -12,9 +11,6 @@
       route: <%- route %>
       # authorizer: ${self:custom.iz_authorizerAppLevel}
     # identifierResource: 'route.request.header.Auth'
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromFlowSchema/events/s3/upload/createObject/functionYaml/yaml.js

@@ -89,21 +89,37 @@ function createSourceParams(_izContext, flowSchema, appPath) {
     )
   );
 
+  const resourceLocation = path.join(
+    SOURCE_PATH.resourceLocationWebSocket,
+    flowSchema.flowTag,
+    'source/'
+  );
+
+  const functionNameConfig = upperCase(functionName) + upperCase(shortNameHandler(handlerType));
+  const roleName = SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role;
+  const upperFunctionName = upperCase(functionName);
+  const upperHandlerType = upperCase(handlerType);
+  const upperFunctionNameConfig = upperCase(functionNameConfig);
+  const upperRoleName = upperCase(roleName);
+  const handlerPath = path.join(resourceLocation, `${functionName}_${upperHandlerType}.main`);
+  const handlerPathUpperFunctionName = path.join(resourceLocation, `${upperFunctionName}_${upperHandlerType}.main`);
+
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(
-        SOURCE_PATH.resourceLocationWebSocket,
-        flowSchema.flowTag,
-        'source/'
-      ),
+      resourceLocation,
       functionName,
       handlerType,
       additionalResourcePermission,
       route,
-      functionNameConfig:
-        upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
+      functionNameConfig,
+      roleName,
+      upperFunctionName,
+      upperHandlerType,
+      upperFunctionNameConfig,
+      upperRoleName,
+      handlerPath,
+      handlerPathUpperFunctionName
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromFlowSchema/events/s3/upload/createObject/handler/handler.js

@@ -46,7 +46,9 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
     templateData: {
       functionName,
       handlerType,
-      route
+      route,
+      upperFunctionName: upperCase(functionName),
+      upperHandlerType: upperCase(handlerType)
     },
     setting: {
       savePath: path.join(

package/src/generators/fromFlowSchema/events/s3/upload/createObject/mainFunction/main.js

@@ -45,7 +45,8 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
     templatePath: templatePath,
     templateData: {
       flowTag: flowSchema.flowTag,
-      objectType
+      objectType,
+      upperObjectType: upperCase(objectType)
     },
     setting: {
       savePath: path.join(

package/src/generators/fromFlowSchema/events/s3/upload/createObjectComplete/functionYaml/template.ejs

@@ -1,17 +1,13 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionNameConfig) %>:
-  handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+<%- functionNameConfig %>:
+  handler: <%- handlerPath %>
+  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
   role: <%- roleName %>Role
   #<#<%- functionName %><%- handlerType %>FunctionSetting#>
   #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
         batchSize: 10
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
         - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
         - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>