@izara_project/izara-market-library-service-schemas 1.0.57 → 1.0.59

package/src/reStructure/TemplateData/resourceYaml/filterGenerateResource/data.js

@@ -36,6 +36,8 @@ const { NoRetryError } = require("@izara_project/izara-core-library-core");
 
 async function filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath) {
   let tableNamesToFilter = new Set();
+  let ownServiceTag = getLocalConfig(path.join(objSchemaPath, "../../"), "iz_serviceTag")
+
   const allLocalFlowSchema = await getObjectSchema.getAllLocalFlowSchemas(_izContext, objSchemaPath);
   await Promise.all(allLocalFlowSchema.records.map(async (flowSchema) => {
     if (flowSchema.statusType === "storedCache") {
@@ -48,9 +50,16 @@ async function filterCreateResourceYaml(_izContext, createSourceParams, objSchem
   const allLocalObjSchema = await getObjectSchema.getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
   await Promise.all(allLocalObjSchema.records.map(async (objSchema) => {
     if (objSchema.hasOwnProperty("extendObjType")) {
-      tableNamesToFilter.add(...await getParentTableFromObjSchema(_izContext, objSchema, objSchemaPath))
+      for (const storageResource of Object.values(objSchema.storageResources)) {
+        if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+          if (storageResource?.serviceTag !== ownServiceTag) {
+            tableNamesToFilter.add(storageResource.tableName)
+          }
+        }
+      }
     }
   }))
+
   let filteredCreateSourceParams = createSourceParams.filter(
     (result) => !tableNamesToFilter.has(result.templateData.tableName)
   )
@@ -75,17 +84,3 @@ async function getStoredCacheTableFromFlowSchema(_izContext, flowSchema, objSche
   }
   return tableNameStoredCache;
 }
-
-async function getParentTableFromObjSchema(_izContext, objSchema, objSchemaPath) {
-  let parentTableNames = new Set();
-  let ownServiceTag = getLocalConfig(path.join(objSchemaPath, "../../"), "iz_serviceTag")
-  for (const storageResource of Object.values(objSchema.storageResources)) {
-    if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-      if (storageResource.serviceTag && storageResource.serviceTag !== ownServiceTag) {
-        parentTableNames.add(storageResource.tableName)
-      }
-    }
-  }
-
-  return parentTableNames
-}

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/functionYml/HdrDsq/data.js

@@ -1,87 +0,0 @@
-/*
-Copyright (C) 2021 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 { firstLetterUpperCase: upperCase } = require('../../../../../../../MainLibs/src/Utils');
-const { SOURCE_PATH, SAVE_FILE_NAME, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, S3_RESOURCE, resourceNames, DYNAMO_RESOURCE, SQS_RESOURCE, SNS_RESOURCE, shortNameHandler, HANDLER, FUNCTION_NAME } = require("../../../../../libs/Consts");
-const templatePath = path.join(__dirname, "./template.ejs")
-
-function data(_izContext, srcPath) {
-  return [createSourceParam(_izContext, srcPath)]
-}
-
-function createSourceParam(_izContext, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.processAfterUploadS3);
-  let handlerType = HANDLER.hdrDsq;
-  let additionalResourcePermission = defaultIamRolePerAction();
-  additionalResourcePermission.push(
-
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.dynamoDbTable]: [
-          DYNAMO_RESOURCE.updateItem,
-          DYNAMO_RESOURCE.getItem
-        ]
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "ImportBatchMain")
-      ]
-    ),
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.sqs]: [
-          SQS_RESOURCE.sendMessage,
-          SQS_RESOURCE.receiveMessage,
-          SQS_RESOURCE.deleteMessage,
-          SQS_RESOURCE.getQueueAttributes
-        ]
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType),
-        resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType + "DLQ")
-      ]
-    ),
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.sns, "In" + functionName)
-      ]
-    )
-  )
-  return {
-    templatePath: templatePath,
-    templateData: {
-      functionName,
-      handlerType,
-      additionalResourcePermission,
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
-      saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),
-      isAppend: true,
-      fileExtension: ".yml"
-    }
-  }
-}
-
-module.exports = data

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/functionYml/HdrDsq/template.ejs

@@ -1,30 +0,0 @@
-<%_ const join = require('path').join; _%>
-<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>:
-  handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
-  name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
-  events:
-    - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %>
-        batchSize: 10
-  iamRoleStatements:
-    <%_ additionalResourcePermission.forEach(resourcePermission => { _%>
-    - Effect: <%- resourcePermission.effect %>
-      Action:
-        <%_ Object.keys(resourcePermission.action).forEach(resourcePerAction => { _%>
-        <%_ resourcePermission.action[resourcePerAction].forEach(permission => { _%>
-        - <%- resourcePerAction %>:<%- permission %>
-        <%_}) _%>
-        <%_ }) _%>
-      Resource:
-        <%_ resourcePermission.resource.forEach(resource => { _%>
-        - <%- resource %>
-        <%_ }) _%>
-    <%_}) _%>
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
-<%_ 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/components/upload/processFile/handler/handlerDsq/data.js

@@ -1,45 +0,0 @@
-/*
-Copyright (C) 2021 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 { firstLetterUpperCase: upperCase } = require('../../../../../../../MainLibs/src/Utils');
-const { SOURCE_PATH, SAVE_FILE_NAME, defaultIamRolePerAction, createIamRole, RESOURCE_CLASSES, S3_RESOURCE, resourceNames, DYNAMO_RESOURCE, SQS_RESOURCE, SNS_RESOURCE, shortNameHandler, HANDLER, FUNCTION_NAME } = require("../../../../../libs/Consts");
-const templatePath = path.join(__dirname, "./template.ejs")
-
-function data(_izContext, srcPath) {
-  return [createSourceData(_izContext, srcPath)]
-}
-
-function createSourceData(_izContext, srcPath) {
-  let functionName = FUNCTION_NAME.processAfterUploadS3;
-  let handlerType = HANDLER.hdrDsq;
-
-  return {
-    templatePath: templatePath,
-    templateData: {},
-    setting: {
-      saveFileName: `${upperCase(functionName)}_${upperCase(handlerType)}`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
-      fileExtension: ".js",
-      isAppend: false
-    }
-  }
-}
-module.exports = data;

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/handler/handlerDsq/template.ejs

@@ -1,151 +0,0 @@
-/*
-Copyright (C) 2021 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-shared").recordHandlerSharedLib;
-const Logger = require('@izara_project/izara-core-library-logger');
-const izaraShared = require('@izara_project/izara-shared');
-const callingFlowSharedLib = izaraShared.callingFlowSharedLib;
-
-const processAfterUpload = require('./ProcessAfterUploadS3_Main')
-
-// validate event properties in body.Message of sqs event
-middleware.setValidatorSchema(
-  recordHandlerSharedLib.baseValidatorSchema({
-    type: 'object',
-    required: ['body', 'messageAttributes'],
-    properties: {
-      body: {
-        type: 'object',
-      },
-      messageAttributes: {
-        type: 'object',
-      },
-    },
-  })
-);
-
-// set schema for record.body.Message
-let perRecordsValidatorSchema = {
-  type: "object",
-  required: [
-    'bucket',
-    'field',
-    'importBy'
-  ],
-  properties: {
-    bucket: {
-      type: "string"
-    },
-    field: {
-      type: "object"
-    },
-    importBy: {
-      type: "string"
-    },
-    imageImportId: {
-      type: "string"
-    },
-    realImageSize: {
-      type: "number",
-      default: 0
-    }
-  }
-};
-
-// set schema for record.body.MessageAttributes
-// const messageAttributeValidatorSchema = {
-//   type: "object",
-//   required: ['msgAtrrParam1', 'msgAtrrParam2'],
-//   properties: {
-//     msgAtrrParam1: {
-//       type: "string"
-//     },
-//     msgAtrrParam2: {
-//       type: "object"
-//     }
-//   }
-// };
-
-perRecordsValidatorSchema = callingFlowSharedLib.addOptionalPassBackPropertiesToValidatorSchema(perRecordsValidatorSchema)
-
-module.exports.main = middleware.wrap(async (event, context, callback) => {
-
-  try {
-
-    let recordPromises = []; // final return
-
-    // loop each record and send to mainFunction
-    await Promise.all(event.Records.map(async record => { // promise.all for map() function
-
-      // --- reforming record.body for Dsq request
-      record = recordHandlerSharedLib.reformatDsqMessage(record._izContext, record);
-      record._izContext.logger.debug('record GetSignedUrlS3HdrDsq after reform', record);
-
-      let passOnProperties = []
-
-      // validate message (and MessageAttributes)
-      await recordHandlerSharedLib.validateRecord(
-        record,                             // one record will send to mainFunction
-        "ProcessAfterUploadHdrDsq",             // 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.bucket),
-      passOnProperties.push(record.body.Message.field),
-      passOnProperties.push(record.body.Message.importBy),
-      passOnProperties.push(record.body.Message.imageImportId),
-      passOnProperties.push(record.body.Message.realImageSize),
-      passOnProperties.push(record.body.Message.passBackProperties),
-      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
-        processAfterUpload.processAfterUpload,  // mainFunction that need to invoke.
-        "ProcessAfterUploadHdrDsq",                  // 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 test
-
-    } 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, processImageAfterUpload: ', err);
-    throw (err);
-  }
-});

package/src/reStructure/TemplateData/resourceYaml/dynamodb/request.json

@@ -1,7 +0,0 @@
-{
-  "tableName": "xxx",
-  "attributes": {
-    "partitionKey": "xxx",
-    "sortKey": "optional"
-  }
-}