@izara_project/izara-core-library-service-schemas 1.0.76 → 1.0.78

package/src/SharedUtils.js

@@ -77,7 +77,8 @@ async function _processNodeRelationships(
   newLinkRelSchema,
   storageResourceTags,
   objectRelationships,
-  relationshipSchema
+  relationshipSchema,
+  bucketName
 ) {
   const { node, isBase, relationshipDirection } = nodeConfig;
   const results = [];
@@ -86,7 +87,7 @@ async function _processNodeRelationships(
 
   // Get object relationships from S3
   const getObjRelPathParam = {
-    Bucket: OBJECT_SCHEMA_BUCKET_NAME,
+    Bucket: bucketName ? bucketName : OBJECT_SCHEMA_BUCKET_NAME,
     Key: UPLOAD_PATH_S3.objectRelationship(_izContext, node.objType)
   };
   _izContext.logger.debug('==> getObjRelPathParam:', getObjRelPathParam);
@@ -214,7 +215,7 @@ async function _processNodeRelationships(
  * @param {number} loopSetting.depth - Current depth of recursion
  * @returns {Promise<Object>} - Result of the processing
  */
-async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinksGroup, loopSetting = { depth: 0 }) {
+async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinksGroup, loopSetting = { depth: 0 }, bucketName = OBJECT_SCHEMA_BUCKET_NAME) {
   // ** == initialize variables ==
   const depthLimit = 4;
   const results = [];
@@ -240,7 +241,7 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
     const [relationshipSchema, rawRelationshipSchema] = await getObjectS3(
       _izContext,
       {
-        Bucket: OBJECT_SCHEMA_BUCKET_NAME,
+        Bucket: bucketName,
         Key: UPLOAD_PATH_S3.relationshipTag(_izContext, relType)
       }
     );
@@ -282,8 +283,8 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
         _izContext.logger.debug('createObjectRelationshipConfig:', createObjectRelationshipConfig);
 
         // ** get object schema for firstNode and secondNode
-        let firstNodeObjSchema = await getObjSchemaS3WithCache(_izContext, firstNode.objType);
-        let secondNodeObjSchema = await getObjSchemaS3WithCache(_izContext, secondNode.objType);
+        let firstNodeObjSchema = await getObjSchemaS3WithCache(_izContext, firstNode.objType, bucketName);
+        let secondNodeObjSchema = await getObjSchemaS3WithCache(_izContext, secondNode.objType, bucketName);
         _izContext.logger.debug(`
           firstNodeObjSchema: ${JSON.stringify(firstNodeObjSchema, null, 2)}
           , secondNodeObjSchema: ${JSON.stringify(secondNodeObjSchema, null, 2)}`);
@@ -473,7 +474,8 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
               newLinkRelSchema,
               storageResourceTags,
               objectRelationships,
-              relationshipSchema
+              relationshipSchema,
+              bucketName
             );
             results.push(...firstNodeResults);
           } catch (error) {
@@ -497,7 +499,8 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
               newLinkRelSchema,
               storageResourceTags,
               objectRelationships,
-              relationshipSchema
+              relationshipSchema,
+              bucketName
             );
             results.push(...secondNodeResults);
           } catch (error) {
@@ -551,7 +554,8 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
         _izContext,
         relType.relationshipTag,
         objectLinksGroup,
-        { depth: loopSetting.depth + 1 }
+        { depth: loopSetting.depth + 1 },
+        bucketName
       )
     }
 
@@ -598,7 +602,7 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
       uploadObjectToS3(
         _izContext,
         UPLOAD_PATH_S3.objectRelationship(_izContext, objType),
-        relationships
+        relationships,
       )
     );
 
@@ -635,7 +639,8 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
         _izContext,
         relType.relationshipTag,
         objectLinksGroup,
-        { depth: loopSetting.depth + 1 }
+        { depth: loopSetting.depth + 1 },
+        bucketName
       )
     }
   } catch (error) {

package/src/UploadObjSchema.js

@@ -86,6 +86,7 @@ async function uploadObjectToS3(
   _izContext,
   pathToUpload,
   objectToUpload,
+  bucketName = OBJECT_SCHEMA_BUCKET_NAME,
   additionalOptions = {}
 ) {
 
@@ -93,7 +94,7 @@ async function uploadObjectToS3(
   const Key = pathToUpload
 
   let data = {
-    Bucket: OBJECT_SCHEMA_BUCKET_NAME,
+    Bucket: bucketName,
     Key,
     Body: buffer,
     ContentEncoding: 'base64',
@@ -163,13 +164,13 @@ async function emptyS3Path(
  *
  * @param {object} _izContext
  */
-async function uploadObjectSchemaByUseCase(_izContext) {
+async function uploadObjectSchemaByUseCase(_izContext, bucketName = OBJECT_SCHEMA_BUCKET_NAME) {
   let uploadList = [];
 
   const objectTypesForCreate = [];
 
   const allObjectSchemasResult = await getAllLocalObjectSchemasWithoutHierarchy(_izContext);
-  console.log("allObjectSchemasResult: ", allObjectSchemasResult);
+  // console.log("allObjectSchemasResult: ", allObjectSchemasResult);
   const allObjectSchema = await allObjectSchemasResult.records;
   // const allObjectRelationships = getDataFromPath(_izContext, LOCAL_FILENAME.OBJECT_RELATIONSHIPS, LOCAL_OBJECT_SCHEMA_PATH, { fileLimit: 1 })[0] || [];
   // const allReferenceObjectRelationships = getDataFromPath(_izContext, LOCAL_FILENAME.REFERENCE_OBJECT_RELATIONSHIPS, LOCAL_OBJECT_SCHEMA_PATH, { fileLimit: 1 })[0] || [];
@@ -234,7 +235,7 @@ async function uploadObjectSchemaByUseCase(_izContext) {
   // end validate all schema
 
   // delete all file in servicePath before upload
-  await emptyS3Path(_izContext, OBJECT_SCHEMA_BUCKET_NAME, `${PREFIX_PATH_S3.perServiceSchemas}/${process.env.iz_serviceTag}/`);
+  await emptyS3Path(_izContext, bucketName, `${PREFIX_PATH_S3.perServiceSchemas}/${process.env.iz_serviceTag}/`);
 
 
   if (lambdaFunctions) {
@@ -242,7 +243,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
       uploadObjectToS3(
         _izContext,
         UPLOAD_PATH_S3.lambdaFunctions(_izContext, process.env.iz_serviceTag),
-        lambdaFunctions
+        lambdaFunctions,
+        bucketName
       )
     );
   }
@@ -252,7 +254,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
     uploadObjectToS3(
       _izContext,
       UPLOAD_PATH_S3.serviceName(_izContext, process.env.iz_serviceTag),
-      { serviceName: process.env.iz_serviceName }
+      { serviceName: process.env.iz_serviceName },
+      bucketName
     )
   );
 
@@ -270,7 +273,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
             objectType: objSchema.objectType
           }
         ),
-        objSchema
+        objSchema,
+        bucketName
       )
     );
 
@@ -287,7 +291,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
             objectType: createFieldSchema.objectType
           }
         ),
-        createFieldSchema
+        createFieldSchema,
+        bucketName
       )
     );
 
@@ -306,14 +311,15 @@ async function uploadObjectSchemaByUseCase(_izContext) {
             objectType: createFieldSchema.objectType
           }
         ),
-        updateFieldSchema
+        updateFieldSchema,
+        bucketName
       )
     );
 
 
     // case schema combine fieldNames
     let combineFieldNamesObjectSchema = generateObjectSchemaForCombineFieldNames(_izContext, objSchema);
-    console.log("combineFieldNamesObjectSchema", combineFieldNamesObjectSchema)
+    // console.log("combineFieldNamesObjectSchema", combineFieldNamesObjectSchema)
     uploadList.push(
       uploadObjectToS3(
         _izContext,
@@ -324,17 +330,19 @@ async function uploadObjectSchemaByUseCase(_izContext) {
             objectType: combineFieldNamesObjectSchema.objectType
           }
         ),
-        combineFieldNamesObjectSchema
+        combineFieldNamesObjectSchema,
+        bucketName
       )
     );
 
     let apiLink = await getApiLinks();
-    console.log("apiLink", apiLink)
+    // console.log("apiLink", apiLink)
     uploadList.push(
       uploadObjectToS3(
         _izContext,
         UPLOAD_PATH_S3.getEndpointPerObjectType(_izContext, { objectType: objSchema.objectType, serviceTag: process.env.iz_serviceTag }),
-        apiLink
+        apiLink,
+        bucketName
       )
     )
 
@@ -342,7 +350,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
       uploadObjectToS3(
         _izContext,
         UPLOAD_PATH_S3.getEndpointPerService(process.env.iz_serviceTag),
-        apiLink
+        apiLink,
+        bucketName
       )
     )
 
@@ -360,7 +369,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
               serviceTag: process.env.iz_serviceTag
             }
           ),
-          existsRefObjectRel
+          existsRefObjectRel,
+          bucketName
         )
       )
     } else {
@@ -379,7 +389,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
               serviceTag: process.env.iz_serviceTag
             }
           ),
-          await refRelationshipPerObjectSchema(_izContext, objSchema)
+          await refRelationshipPerObjectSchema(_izContext, objSchema),
+          bucketName
         )
       )
     }
@@ -392,7 +403,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
     uploadObjectToS3(
       _izContext,
       UPLOAD_PATH_S3.objectListAll(_izContext, process.env.iz_serviceTag),
-      foundedObjectTypes
+      foundedObjectTypes,
+      bucketName
     )
   );
 
@@ -502,7 +514,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
           {
             relationshipServiceTag: process.env.iz_serviceTag,
             ...relTagDetail[relationshipTag],
-          }
+          },
+          bucketName
         )
       );
 
@@ -514,7 +527,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
           uploadObjectToS3(
             _izContext,
             UPLOAD_PATH_S3.linkByLinkTypeId(_izContext, process.env.iz_serviceTag, linkTypeId),
-            link
+            link,
+            bucketName
           )
         );
       }
@@ -553,13 +567,14 @@ async function uploadObjectSchemaByUseCase(_izContext) {
         uploadObjectToS3(
           _izContext,
           UPLOAD_PATH_S3.objectRelationship(_izContext, { serviceTag: process.env.iz_serviceTag, objectType: relObjectType }),
-          relTagsData
+          relTagsData,
+          bucketName
         )
       );
     }
 
 
-  } //  All objectRelaetionship
+  } //  All objectRelationship
 
 
   // // upload refObjectRelationships
@@ -588,7 +603,8 @@ async function uploadObjectSchemaByUseCase(_izContext) {
               flowTag: flowSchema.flowTag
             }
           ),
-          flowSchema
+          flowSchema,
+          bucketName
         )
       )
     }

package/src/Utils.js

@@ -279,7 +279,7 @@ function validateAddOnDataStructure(_izContext, objectSchema) {
 
   let errors = [];
   let fieldNameCollection = Object.keys(objectSchema.fieldNames || {});
-  let attriutebuteTreeTags = [];
+  let attributeTreeTags = [];
 
   if (objectSchema.addOnDataStructure?.length) {
     for (const [idx, addOn] of objectSchema.addOnDataStructure.entries()) {
@@ -717,7 +717,7 @@ async function getApiLinks() {
         }
       }
     }
-    console.log("apiGateway in function getApiLink", apiGateway)
+    // console.log("apiGateway in function getApiLink", apiGateway)
     return apiGateway
   } catch (err) {
     console.error("Error fetching API info:", err);

package/src/ValidatorSchema.js

@@ -62,7 +62,8 @@ const {
   createValidationFieldNameForEachType,
   S3_UPLOAD_TYPE,
   FLOW_SCHEMA_HOOK_STATE,
-  HANDLER
+  HANDLER,
+  OBJECT_SCHEMA_BUCKET_NAME
 } = require("./Consts");
 const { validateObjType } = require('@izara_project/izara-shared-service-schemas').validateObjType;
 
@@ -76,7 +77,7 @@ const { validateObjType } = require('@izara_project/izara-shared-service-schemas
  * @param {Number} iter                 iterate count
  * @returns
  */
-async function generateValidatorSchemaTreePerFieldName(_izContext, fieldName, fieldNameSetting, iter = 0) {
+async function generateValidatorSchemaTreePerFieldName(_izContext, fieldName, fieldNameSetting, bucketName = OBJECT_SCHEMA_BUCKET_NAME, iter = 0) {
   if (iter > 50) {
     throw new NoRetryError("generateValidatorSchemaPerFieldName reach max iteration limit")
   } else {
@@ -104,7 +105,8 @@ async function generateValidatorSchemaTreePerFieldName(_izContext, fieldName, fi
       {
         objectType: fieldNameSetting.fromObjectType,
         serviceTag: fieldNameSetting.fromServiceNameTag
-      }
+      },
+      bucketName
     );
 
     if (!childObjectSchema) {
@@ -129,6 +131,7 @@ async function generateValidatorSchemaTreePerFieldName(_izContext, fieldName, fi
         { logger: Logger },
         eachKey, // fieldName
         childObjectSchema.fieldNames[eachKey], // fieldName setting
+        bucketName,
         iter
       );
 
@@ -152,7 +155,7 @@ async function generateValidatorSchemaTreePerFieldName(_izContext, fieldName, fi
   return validatorTree;
 }
 
-async function validatorSchemaTreeIdentifiers(_izContext, objectSchema, iter = 0) {
+async function validatorSchemaTreeIdentifiers(_izContext, objectSchema, bucketName = OBJECT_SCHEMA_BUCKET_NAME, iter = 0) {
   if (iter > 50) {
     throw new NoRetryError("generateValidatorSchemaPerFieldName reach max iteration limit")
   } else {
@@ -173,7 +176,7 @@ async function validatorSchemaTreeIdentifiers(_izContext, objectSchema, iter = 0
 
           let allValidatorTreeCompositeKey = {};
           for (let compositeKey of identifier.fieldNames) {
-            let validatorTreeCompositeKey = await generateValidatorSchemaTreePerFieldName(_izContext, compositeKey, objectSchema.fieldNames[compositeKey]);
+            let validatorTreeCompositeKey = await generateValidatorSchemaTreePerFieldName(_izContext, compositeKey, objectSchema.fieldNames[compositeKey], bucketName);
             _izContext.logger.debug("validatorTreeCompositeKey: ", JSON.stringify(validatorTreeCompositeKey));
 
             Object.assign(allValidatorTreeCompositeKey, validatorTreeCompositeKey);
@@ -182,7 +185,7 @@ async function validatorSchemaTreeIdentifiers(_izContext, objectSchema, iter = 0
           Object.assign(validatorSchemaTree, { [identifierName]: allValidatorTreeCompositeKey });
 
         } else {
-          let validatorTreeIdentifier = await generateValidatorSchemaTreePerFieldName(_izContext, identifierName, objectSchema.fieldNames[identifierName])
+          let validatorTreeIdentifier = await generateValidatorSchemaTreePerFieldName(_izContext, identifierName, objectSchema.fieldNames[identifierName], bucketName)
           _izContext.logger.debug("validatorTreeIdentifier: ", JSON.stringify(validatorTreeIdentifier))
 
           Object.assign(validatorSchemaTree, validatorTreeIdentifier);
@@ -196,7 +199,7 @@ async function validatorSchemaTreeIdentifiers(_izContext, objectSchema, iter = 0
 }
 
 
-async function validatorSchemaTreeIdentifiersFieldNames(_izContext, objectSchema, iter = 0) {
+async function validatorSchemaTreeIdentifiersFieldNames(_izContext, objectSchema, bucketName = OBJECT_SCHEMA_BUCKET_NAME, iter = 0) {
   if (iter > 50) {
     throw new NoRetryError("generateValidatorSchemaPerFieldName reach max iteration limit")
   } else {
@@ -215,7 +218,7 @@ async function validatorSchemaTreeIdentifiersFieldNames(_izContext, objectSchema
         await Promise.all(
           identifierFieldNames.map(
             async (identifierFieldName) => {
-              let validatorTreeIdentifierFieldName = await generateValidatorSchemaTreePerFieldName(_izContext, identifierFieldName, objectSchema.fieldNames[identifierFieldName]);
+              let validatorTreeIdentifierFieldName = await generateValidatorSchemaTreePerFieldName(_izContext, identifierFieldName, objectSchema.fieldNames[identifierFieldName], bucketName);
               _izContext.logger.debug("validatorTreeIdentifierFieldName: ", validatorTreeIdentifierFieldName);
 
               Object.assign(validatorSchemaTree, validatorTreeIdentifierFieldName);
@@ -240,7 +243,7 @@ async function validatorSchemaTreeIdentifiersFieldNames(_izContext, objectSchema
  * @param {String} objType.objectType
  * @param {String} objType.serviceTag
  */
-async function generateRelationshipValidatorSchemaForCreate(_izContext, objType) {
+async function generateRelationshipValidatorSchemaForCreate(_izContext, objType, bucketName = OBJECT_SCHEMA_BUCKET_NAME) {
   const validateObjTypeResult = validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("generateRelationshipValidatorSchemaForCreate validateObjTypeResult", validateObjTypeResult);
@@ -297,7 +300,7 @@ async function generateRelationshipValidatorSchemaForCreate(_izContext, objType)
               && parent.linkConfig.requiredOnCreate === true
             ) {
 
-              let parentObjSchema = await getObjSchemaS3WithHierarchy(_izContext, parent.objType);
+              let parentObjSchema = await getObjSchemaS3WithHierarchy(_izContext, parent.objType, bucketName);
 
               if (!parentObjSchema) {
                 throw new NoRetryError(`Not found parent ${JSON.stringify(parent.objType)} in relationship:${relTag}`);
@@ -377,7 +380,7 @@ async function generateRelationshipValidatorSchemaForCreate(_izContext, objType)
  * @param {String[]} specificFieldNames
  * @returns
  */
-async function generateValidatorSchemaForCreate(_izContext, objType, specificFieldNames = []) {
+async function generateValidatorSchemaForCreate(_izContext, objType, settings = { specificFieldNames: [], bucketName: OBJECT_SCHEMA_BUCKET_NAME }) {
   const validateObjTypeResult = validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("generateValidatorSchemaForCreate validateObjTypeResult", validateObjTypeResult);
@@ -385,10 +388,10 @@ async function generateValidatorSchemaForCreate(_izContext, objType, specificFie
   }
   _izContext.logger.debug("Function:generateValidatorSchemaForCreate ", {
     objType,
-    specificFieldNames
+    specificFieldNames: settings.specificFieldNames
   })
 
-  const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType);
+  const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType, settings.bucketName);
   _izContext.logger.debug("objectSchema in generateValidatorSchemaForCreate", objectSchema)
   let usedFieldNamesData = {};
   let requiredFieldNames = [];
@@ -400,8 +403,8 @@ async function generateValidatorSchemaForCreate(_izContext, objType, specificFie
       requiredFieldNames.push(mainFieldName);
       Object.assign(usedFieldNamesData, { [mainFieldName]: objectSchema.fieldNames[mainFieldName] });
     } else if (objectSchema.fieldNames[mainFieldName].optionalOnCreate === true) {
-      if (specificFieldNames.length) {
-        if (specificFieldNames.includes(mainFieldName)) {
+      if (settings.specificFieldNames.length) {
+        if (settings.specificFieldNames.includes(mainFieldName)) {
           Object.assign(usedFieldNamesData, { [mainFieldName]: objectSchema.fieldNames[mainFieldName] });
         }
       } else {
@@ -426,8 +429,8 @@ async function generateValidatorSchemaForCreate(_izContext, objType, specificFie
           );
         } else if (versionedDataFieldSetting.optionalOnCreate === true) {
 
-          if (specificFieldNames.length) {
-            if (specificFieldNames.includes(versionedDataFieldName)) {
+          if (settings.specificFieldNames.length) {
+            if (settings.specificFieldNames.includes(versionedDataFieldName)) {
               Object.assign(
                 usedFieldNamesData,
                 { [versionedDataFieldName]: versionedDataFieldName }
@@ -453,7 +456,8 @@ async function generateValidatorSchemaForCreate(_izContext, objType, specificFie
         let validatorSchemaFieldName = await generateValidatorSchemaTreePerFieldName(
           _izContext,
           fieldName,
-          usedFieldNamesData[fieldName]
+          usedFieldNamesData[fieldName],
+          settings.bucketName
         );
 
         Object.assign(allValidatorSchemaFieldNames, validatorSchemaFieldName);
@@ -493,19 +497,18 @@ async function generateValidatorSchemaForCreate(_izContext, objType, specificFie
 
 
 /*
-  collect which field is requied and optional
+  collect which field is required and optional
   should require name of identifier instead of fieldName that part of identifiers
   Note : should add setting for api in this function
 */
-async function generateValidatorSchemaForUpdate(_izContext, objType, setting = {}) {
+async function generateValidatorSchemaForUpdate(_izContext, objType, settings = { specificFieldNames: [], bucketName: OBJECT_SCHEMA_BUCKET_NAME }) {
 
   _izContext.logger.debug("Function:generateValidatorSchemaForUpdate2 ", {
     objType,
-    setting,
+    setting: settings,
   })
-  setting.specificFieldNames = setting?.specificFieldNames ? setting.specificFieldNames : []
   // const objType = createObjType(objectType);
-  const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType);
+  const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType, settings.bucketName);
   _izContext.logger.debug("objectSchema", objectSchema)
 
   const objectSchemas = await uploadUseCase.generateObjectSchemaForCombineFieldNames(_izContext, objectSchema)
@@ -530,9 +533,9 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, setting = {
   }
 
   // collect usedFieldNames
-  if (setting?.specificFieldNames) {
-    if (setting.specificFieldNames.length) {
-      for (let specificFieldName of setting.specificFieldNames) {
+  if (settings?.specificFieldNames) {
+    if (settings.specificFieldNames.length) {
+      for (let specificFieldName of settings.specificFieldNames) {
         if (canUpdateFieldNames.includes(specificFieldName)) {
           usedFieldNames.push(specificFieldName);
         } else {
@@ -563,7 +566,7 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, setting = {
         properties: {
           identifiers: {
             type: "object",
-            ... await filteredFieldNamesOfValidatorSchema(_izContext, objType, identifiersFieldNames, identifiersFieldNames)
+            ... await filteredFieldNamesOfValidatorSchema(_izContext, objType, identifiersFieldNames, identifiersFieldNames, settings.bucketName)
           },
           fields: {
             type: "object",
@@ -605,7 +608,7 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, setting = {
   }
 
 
-  Object.assign(initialValidatorSchemaForUpdate.properties.objInstanceFull.properties.fields, await filteredFieldNamesOfValidatorSchema(_izContext, objType, [], defaultFieldNames))
+  Object.assign(initialValidatorSchemaForUpdate.properties.objInstanceFull.properties.fields, await filteredFieldNamesOfValidatorSchema(_izContext, objType, [], defaultFieldNames, settings.bucketName))
   Object.assign(initialValidatorSchemaForUpdate.properties.objInstanceFull.properties.fields.properties, versionedDataReturnInFieldsObjInstanceFull);
 
   _izContext.logger.debug("validatorSchema", initialValidatorSchemaForUpdate)
@@ -623,7 +626,7 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, setting = {
  *
  * @returns {object} json validator schema
  */
-async function generateValidatorSchemaForIdentifier(_izContext, objType) {
+async function generateValidatorSchemaForIdentifier(_izContext, objType, settings = { bucketName: OBJECT_SCHEMA_BUCKET_NAME }) {
   const validateObjTypeResult = validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("generateValidatorSchemaForIdentifier validateObjTypeResult", validateObjTypeResult);
@@ -633,9 +636,9 @@ async function generateValidatorSchemaForIdentifier(_izContext, objType) {
     objType,
   })
 
-  const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType);
+  const objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType, settings.bucketName);
 
-  let generatedIdentifiersValidatorSchema = await validatorSchemaTreeIdentifiersFieldNames(_izContext, objectSchema);
+  let generatedIdentifiersValidatorSchema = await validatorSchemaTreeIdentifiersFieldNames(_izContext, objectSchema, settings.bucketName);
   _izContext.logger.debug("generatedIdentifiersValidatorSchema: ", generatedIdentifiersValidatorSchema);
 
   return {
@@ -664,7 +667,7 @@ async function generateValidatorSchemaForIdentifier(_izContext, objType) {
  * @param {string[]} usedFieldNames
  * @returns
  */
-async function filteredFieldNamesOfValidatorSchema(_izContext, objType, requiredFieldNames, usedFieldNames) {
+async function filteredFieldNamesOfValidatorSchema(_izContext, objType, requiredFieldNames, usedFieldNames, bucketName = OBJECT_SCHEMA_BUCKET_NAME) {
   const validateObjTypeResult = validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("filteredFieldNamesOfValidatorSchema validateObjTypeResult", validateObjTypeResult);
@@ -676,7 +679,7 @@ async function filteredFieldNamesOfValidatorSchema(_izContext, objType, required
     usedFieldNames
   });
 
-  let allValidatorSchema = await generateValidatorSchemaForExplodedDataWithCache(_izContext, objType);
+  let allValidatorSchema = await generateValidatorSchemaForExplodedDataWithCache(_izContext, objType, bucketName);
   _izContext.logger.debug("filteredFieldNamesOfValidatorSchema allValidatorSchema : ", allValidatorSchema)
 
   allValidatorSchema.required = requiredFieldNames;
@@ -710,7 +713,7 @@ async function filteredFieldNamesOfValidatorSchema(_izContext, objType, required
  * 2 >> create validatorSchema of fieldName and identifier
  * 3 >> not required, Use for validate only
  */
-async function generateValidatorSchemaForExplodedData(_izContext, objType) {
+async function generateValidatorSchemaForExplodedData(_izContext, objType, bucketName = OBJECT_SCHEMA_BUCKET_NAME) {
   const validateObjTypeResult = validateObjType(objType);
   if (validateObjTypeResult.errorsFound.length > 0) {
     _izContext.logger.error("generateValidatorSchemaForExplodedData validateObjTypeResult", validateObjTypeResult);
@@ -723,10 +726,10 @@ async function generateValidatorSchemaForExplodedData(_izContext, objType) {
     properties: {}
   };
 
-  let objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType);
+  let objectSchema = await getObjSchemaS3WithHierarchy(_izContext, objType, bucketName);
   // generate validatorSchema for each fieldName
   for (let [fieldName, fieldData] of Object.entries(objectSchema.fieldNames)) {
-    let fieldNameValidator = await generateValidatorFieldNameWithCache(_izContext, fieldName, fieldData);
+    let fieldNameValidator = await generateValidatorFieldNameWithCache(_izContext, fieldName, fieldData, bucketName);
     Object.assign(validatorSchema.properties, fieldNameValidator);
   }
 
@@ -810,7 +813,7 @@ const generateValidatorFieldNameWithCache = inMemoryCacheLib(
  * @param {Object} fieldData
  * @returns
  */
-async function generateValidatorFieldName(_izContext, fieldName, fieldData) {
+async function generateValidatorFieldName(_izContext, fieldName, fieldData, bucketName = OBJECT_SCHEMA_BUCKET_NAME) {
 
   if (fieldData.hasOwnProperty("fromObjectType") || fieldData.hasOwnProperty("fromServiceNameTag")) {
     // validate reference
@@ -823,7 +826,8 @@ async function generateValidatorFieldName(_izContext, fieldName, fieldData) {
       {
         serviceTag: fieldData.fromServiceNameTag,
         objectType: fieldData.fromObjectType
-      }
+      },
+      bucketName
     );
 
     let usedIdentifier = null
@@ -854,7 +858,7 @@ async function generateValidatorFieldName(_izContext, fieldName, fieldData) {
           throw new Error(`Invalid reference fieldName:${compositeKey}`);
         }
 
-        let childValidator = await generateValidatorFieldNameWithCache(_izContext, compositeKey, objectSchemaChild.fieldNames[compositeKey]);
+        let childValidator = await generateValidatorFieldNameWithCache(_izContext, compositeKey, objectSchemaChild.fieldNames[compositeKey], bucketName);
 
         Object.assign(returnValidator, childValidator)
 
@@ -914,7 +918,7 @@ async function generateValidatorFieldName(_izContext, fieldName, fieldData) {
  * @param {String} serviceConfigPath    - path that config file of service located
  * @returns
  */
-async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
+async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath, bucketName = OBJECT_SCHEMA_BUCKET_NAME) {
   try {
     const serviceConfig = readYamlFile.sync(serviceConfigPath);
     const iz_serviceTag = serviceConfig.main_config.iz_serviceTag;
@@ -968,7 +972,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
             const storageResource = objSchema.storageResources[storageTag];
 
             if (storageResource.storageType === STORAGE_TYPES.graph) {
-              const graphServiceTag = await getGraphServiceTag(_izContext, storageResource.graphServerTag);
+              const graphServiceTag = await getGraphServiceTag(_izContext, storageResource.graphServerTag, bucketName);
 
               if (!graphServiceTag) {
                 validateStatus.status = false;
@@ -1039,7 +1043,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
             const storageResource = relData.storageResources[storageTag];
 
             if (storageResource.storageType === STORAGE_TYPES.graph) {
-              const graphServiceTag = await getGraphServiceTag(_izContext, storageResource.graphServerTag);
+              const graphServiceTag = await getGraphServiceTag(_izContext, storageResource.graphServerTag, bucketName);
 
               if (!graphServiceTag) {
                 validateStatus.status = false;
@@ -1122,7 +1126,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
                   }
                   return res.records[0]
                 })
-              : await getObjSchemaS3WithHierarchy(_izContext, link.from.objType);
+              : await getObjSchemaS3WithHierarchy(_izContext, link.from.objType, bucketName);
 
             const toObjectSchema = (link.to.objType.serviceTag === iz_serviceTag)
               ? await getLocalObjectSchemasWithHierarchy(_izContext, link.to.objType.objectType, schemasPath)
@@ -1133,7 +1137,7 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
                   }
                   return res.records[0]
                 })
-              : await getObjSchemaS3WithHierarchy(_izContext, link.to.objType);
+              : await getObjSchemaS3WithHierarchy(_izContext, link.to.objType, bucketName);
 
 
             if (!validateStatus.validateErrors.length) {
@@ -1208,14 +1212,14 @@ async function validateLocalSchema(_izContext, schemasPath, serviceConfigPath) {
       // validate ref relationships in external path s3
       await Promise.all(
         allReferenceObjectRelationships.map(async (refRelSchema) => {
-          const relSchemaFromRef = await getRelationshipSchema
-            (
-              _izContext,
-              {
-                serviceTag: refRelSchema.relationshipServiceTag,
-                relationshipTag: refRelSchema.relationshipTag
-              }
-            )
+          const relSchemaFromRef = await getRelationshipSchema(
+            _izContext,
+            {
+              serviceTag: refRelSchema.relationshipServiceTag,
+              relationshipTag: refRelSchema.relationshipTag
+            },
+            bucketName
+          )
           if (!relSchemaFromRef) {
             validateStatus.status = false;
             validateStatus.referenceErrors.push(`Invalid reference relationship of objectType: '${refRelSchema.objectType}' >> relationshipTag: '${refRelSchema.relationshipTag}' not exists in service: '${refRelSchema.relationshipServiceTag}'`)