@izara_project/izara-core-library-service-schemas 1.0.104 → 1.0.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.104",
+  "version": "1.0.105",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {
@@ -24,12 +24,12 @@
     "@aws-sdk/client-api-gateway": "^3.943.0",
     "@aws-sdk/client-apigatewayv2": "^3.943.0",
     "@aws-sdk/client-lambda": "^3.943.0",
-    "@aws-sdk/client-s3": "^3.943.0",
     "@aws-sdk/crc64-nvme-crt": "^3.943.0",
     "@izara_project/izara-core-library-core": "^1.0.29",
     "@izara_project/izara-core-library-external-request": "^1.0.22",
     "@izara_project/izara-core-library-lambda": "^1.0.6",
     "@izara_project/izara-core-library-logger": "^1.0.8",
+    "@izara_project/izara-core-library-s3": "^1.0.4",
     "@izara_project/izara-shared-core": "^1.0.8",
     "@izara_project/izara-shared-service-schemas": "^1.0.34",
     "glob": "^13.0.0",

package/src/UploadObjSchema.js

@@ -129,6 +129,7 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
 
   const allObjectRelationships = await getObjectSchema.getAllLocalRelationshipSchema(_izContext)
   const allReferenceObjectRelationships = await getObjectSchema.getAllLocalRefObjectRelationshipSchema(_izContext)
+
   let refRelationshipPerObjectType = uploadUseCase.groupRefObjectRelPerObjectType(_izContext, allReferenceObjectRelationships);
   _izContext.logger.debug("refRelationshipPerObjectType: ", refRelationshipPerObjectType);
 

package/src/Utils.js

@@ -26,12 +26,6 @@ import { basicValidatorSchema, validateObjType, reformatObjectSchema } from '@iz
 
 import consts from './Consts.js';
 
-import {
-  APIGatewayClient,
-  GetRestApisCommand,
-  GetResourcesCommand,
-} from "@aws-sdk/client-api-gateway";
-
 import {
   ApiGatewayV2Client,
   GetApisCommand,

package/src/ValidatorSchema.js

@@ -1254,58 +1254,65 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
       for (const flowSchema of allFlowSchemas) {
         const [status, errors] = utils.validateBasicFlowSchema(_izContext, flowSchema)
 
-        if (!flowSchema.hasOwnProperty("objType")) {
+        if (!status) {
           validateStatus.status = false;
-          validateStatus.validateErrors.push(`flowSchema ${flowSchema.flowTag} must have objType`)
-        } else {
-          let [objSchema] = await getLocalOrS3ObjectSchema(flowSchema.objType);
+          validateStatus.validateErrors.push(errors);
+        }
 
-          if (!objSchema) {
+        if (flowSchema.statusType !== none) {
+          if (!flowSchema.hasOwnProperty("objType")) {
             validateStatus.status = false;
-            validateStatus.validateErrors.push(`${flowSchema.flowTag}.objType is invalid`)
+            validateStatus.validateErrors.push(`flowSchema ${flowSchema.flowTag} must have objType`)
           } else {
+            let [objSchema] = await getLocalOrS3ObjectSchema(flowSchema.objType);
+
+            if (!objSchema) {
+              validateStatus.status = false;
+              validateStatus.validateErrors.push(`${flowSchema.flowTag}.objType is invalid`)
+            } else {
 
-            let dynamoDBStorageTags = [];
+              let dynamoDBStorageTags = [];
 
-            for (const [storageTag, storageResource] of Object.entries(objSchema.storageResources)) {
-              if (storageResource.storageType === consts.STORAGE_TYPES.dynamoDB) {
-                dynamoDBStorageTags.push(storageTag)
+              for (const [storageTag, storageResource] of Object.entries(objSchema.storageResources)) {
+                if (storageResource.storageType === consts.STORAGE_TYPES.dynamoDB) {
+                  dynamoDBStorageTags.push(storageTag)
+                }
               }
-            }
 
-            if (dynamoDBStorageTags.length > 1) {
-              validateStatus.status = false;
-              validateStatus.validateErrors.push(`objectType:${objSchema.objectType} should not shave more than 1 dynamoDB storageResource`)
-            } else {
+              if (dynamoDBStorageTags.length > 1) {
+                validateStatus.status = false;
+                validateStatus.validateErrors.push(`objectType:${objSchema.objectType} should not shave more than 1 dynamoDB storageResource`)
+              } else {
 
-              if (flowSchema.statusType === "statusField") {
-                let specificFieldNames = Object.values(createSpecificFieldNameForCacheTable(utils.createFlowTypeConcat(_izContext, { flowTag: flowSchema.flowTag, serviceTag: iz_serviceTag }), 'statusField'))
+                if (flowSchema.statusType === "statusField") {
+                  let specificFieldNames = Object.values(createSpecificFieldNameForCacheTable(utils.createFlowTypeConcat(_izContext, { flowTag: flowSchema.flowTag, serviceTag: iz_serviceTag }), 'statusField'))
 
-                for (const specificFieldName of specificFieldNames) { // check for specific fieldName
-                  if (objSchema.fieldNames.hasOwnProperty(specificFieldName)) {
-                    if (!objSchema.fieldNames[specificFieldName].storageResourceTags.includes(dynamoDBStorageTags[0])) {
+                  for (const specificFieldName of specificFieldNames) { // check for specific fieldName
+                    if (objSchema.fieldNames.hasOwnProperty(specificFieldName)) {
+                      if (!objSchema.fieldNames[specificFieldName].storageResourceTags.includes(dynamoDBStorageTags[0])) {
+                        validateStatus.status = false;
+                        validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} fieldNames: ${specificFieldName} not have storageResourceTag: ${dynamoDBStorageTags[0]}`);
+                      }
+                    } else {
                       validateStatus.status = false;
-                      validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} fieldNames: ${specificFieldName} not have storageResourceTag: ${dynamoDBStorageTags[0]}`);
+                      validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} not have fieldNames: ${specificFieldName} in objectSchema.fieldNames`)
                     }
-                  } else {
-                    validateStatus.status = false;
-                    validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} not have fieldNames: ${specificFieldName} in objectSchema.fieldNames`)
                   }
-                }
 
 
-              } else if (flowSchema.statusType === "storedCache" || flowSchema.statusType === "triggerCache") {
-                let specificFieldNames = Object.values(createSpecificFieldNameForCacheTable(utils.createFlowTypeConcat(_izContext, { flowTag: flowSchema.flowTag, serviceTag: iz_serviceTag }), "cacheTable"))
+                } else if (flowSchema.statusType === "storedCache" || flowSchema.statusType === "triggerCache") {
+                  let specificFieldNames = Object.values(createSpecificFieldNameForCacheTable(utils.createFlowTypeConcat(_izContext, { flowTag: flowSchema.flowTag, serviceTag: iz_serviceTag }), "cacheTable"))
 
-                for (const specificFieldName of specificFieldNames) { // check for specific fieldName
-                  if (objSchema.fieldNames.hasOwnProperty(specificFieldName)) {
-                    if (!objSchema.fieldNames[specificFieldName].storageResourceTags.includes(dynamoDBStorageTags[0])) {
+                  for (const specificFieldName of specificFieldNames) { // check for specific fieldName
+                    if (objSchema.fieldNames.hasOwnProperty(specificFieldName)) {
+                      if (!objSchema.fieldNames[specificFieldName].storageResourceTags.includes(dynamoDBStorageTags[0])) {
+                        validateStatus.status = false;
+                        validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} fieldNames: ${specificFieldName} not have storageResourceTag: ${dynamoDBStorageTags[0]}`);
+                      }
+                    } else {
                       validateStatus.status = false;
-                      validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} fieldNames: ${specificFieldName} not have storageResourceTag: ${dynamoDBStorageTags[0]}`);
+                      validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} not have fieldNames: ${specificFieldName} in objectSchema.fieldNames`)
                     }
-                  } else {
-                    validateStatus.status = false;
-                    validateStatus.validateErrors.push(`objectType: ${objSchema.objectType} not have fieldNames: ${specificFieldName} in objectSchema.fieldNames`)
                   }
                 }
               }
@@ -1313,10 +1320,6 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
           }
         }
 
-        if (!status) {
-          validateStatus.status = false;
-          validateStatus.validateErrors.push(errors);
-        }
       }
 
     }

package/src/libs/UploadUseCase.js

@@ -263,6 +263,10 @@ function groupRelationshipsPerObjectType(_izContext, allObjectRelationships, obj
           objectType,
           serviceTag: process.env.iz_serviceTag
         },
+        // {
+        //   relationshipTag,
+        //   serviceTag: process.env.iz_serviceTag
+        // },
         relationshipTagData
       );
 
@@ -307,16 +311,16 @@ function groupLinksPerObjectType(_izContext, allObjectRelationships, objectTypes
 
     for (let objectType of objectTypes) {
 
-      const linkRecords = utils.findLinkByObjType(
+      const linkRecords = utils.findLinkByObjTypeV2(
         _izContext,
         { // objType
           objectType,
           serviceTag: process.env.iz_serviceTag
         },
-        // { // relType
-        //   relationshipTag,
-        //   serviceTag: process.env.iz_serviceTag
-        // },
+        { // relType
+          relationshipTag,
+          serviceTag: process.env.iz_serviceTag
+        },
         relationshipTagData
       );
 

package/src/libs/s3Utils.js

@@ -16,26 +16,24 @@ along with this program.If not, see < http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-
-import("@aws-sdk/crc64-nvme-crt");
-import {
-  S3Client,
-  GetObjectCommand,
-  HeadObjectCommand,
-  ListObjectsV2Command,
-  DeleteObjectCommand,
-  DeleteObjectsCommand,
-  PutObjectCommand,
-} from "@aws-sdk/client-s3";
-
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 
 import { NoRetryError, inMemoryCacheLib } from '@izara_project/izara-core-library-core';
 import { consts } from '@izara_project/izara-shared-service-schemas';
+import Logger from '@izara_project/izara-core-library-logger';
 import coreConsts from '../Consts.js';
 
-const s3Client = new S3Client();
+import { s3 } from '@izara_project/izara-core-library-s3'
+const {
+  getObjectS3: getObjectS3Lib,
+  headObjectS3: headObjectS3Lib,
+  listObjectsV2: listObjectS3Lib,
+  deleteObject: deleteObjectS3Lib,
+  deleteObjects: deleteObjectsS3Lib,
+  putObjectS3: putObjectS3Lib
+} = s3;
 
+const _izContext = { Logger };
 
 /**
  *  This function is a simplified version of getObjectS3
@@ -44,20 +42,8 @@ const s3Client = new S3Client();
  * @returns
  */
 async function getObjectS3Shared(param) {
-  let object = [];
-  try {
-    const response = await s3Client.send(new GetObjectCommand(param));
-    object[0] = JSON.parse(await response.Body.transformToString('utf-8'));
-    object[1] = response;
-  } catch (error) {
-    if (error.name === "NoSuchKey") {
-      object = [null, null]; // Return null if the object doesn't exist
-    } else {
-      throw new NoRetryError(error); // Rethrow for further handling
-    }
-  }
-
-  return object;
+  return await getObjectS3Lib(_izContext, param);
+  ;
 }
 
 
@@ -107,42 +93,25 @@ async function getObjectS3(_izContext, param) {
 }
 
 async function headObjectS3(_izContext, param) {
-  let headObject
-  try {
-    headObject = await s3Client.send(new HeadObjectCommand(param));
-    // headObject = JSON.parse(await response.Body.transformToString('utf-8'));
-  } catch (error) {
-    if (error.name === "NotFound") {
-      headObject = null; // Return null if the object doesn't exist
-    } else {
-      _izContext.logger.error(error); // Log other errors
-      throw new NoRetryError(error); // Rethrow for further handling
-    }
-  }
-  return headObject
+
+  return await headObjectS3Lib(_izContext, param)
 }
 
 async function listObjectsV2(_izContext, param) {
-  return await s3Client.send(new ListObjectsV2Command(param));
+  return await listObjectS3Lib(_izContext, param)
 }
 
 
 async function deleteObject(_izContext, param) {
-  const deleteObjectResult = await s3Client.send(new DeleteObjectCommand(param));
-  _izContext.logger.debug("deleteObject result: ", deleteObjectResult);
-  return deleteObjectResult;
+  return await deleteObjectS3Lib(_izContext, param);
 }
 
 async function deleteObjects(_izContext, param) {
-  const deleteObjectsResult = await s3Client.send(new DeleteObjectsCommand(param));
-  _izContext.logger.debug("deleteObjects result: ", deleteObjectsResult);
-  return deleteObjectsResult;
+  return await deleteObjectsS3Lib(_izContext, param);
 }
 
 async function putObjectS3(_izContext, param) {
-  const putResult = await s3Client.send(new PutObjectCommand(param));
-  _izContext.logger.debug("putObject result: ", putResult);
-  return putResult;
+  return await putObjectS3Lib(_izContext, param);
 }
 
 export default {