@itentialopensource/adapter-utils 4.47.0 → 4.48.0

package/CHANGELOG.md

@@ -1,4 +1,14 @@
 
+## 4.48.0 [08-16-2022]
+
+* Changes to support entitypath object with multiple paths
+
+Closes ADAPT-2331
+
+See merge request itentialopensource/adapter-utils!236
+
+---
+
 ## 4.47.0 [08-13-2022]
 
 * Add SSO capability into service instance config

package/lib/connectorRest.js

@@ -45,6 +45,7 @@ let host = null;
 let port = null;
 let basepath = null;
 let version = null;
+let choosepath = null;
 let authMethod = null;
 let authField = null;
 let authFormat = null;
@@ -1503,7 +1504,7 @@ function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
 
   try {
     // Get the entity schema from the file system
-    return propUtilInst.getEntitySchema('.system', 'getToken', this.dbUtil, (tokenSchema, healthError) => {
+    return propUtilInst.getEntitySchema('.system', 'getToken', choosepath, this.dbUtil, (tokenSchema, healthError) => {
       if (healthError || !tokenSchema || Object.keys(tokenSchema).length === 0) {
         log.debug(`${origin}: Using adapter properties for token information`);
         tokenSchema = null;
@@ -3317,6 +3318,11 @@ class ConnectorRest {
       version = props.version;
     }
 
+    // set the choosepath (optional - default is null)
+    if (typeof props.choosepath === 'string') {
+      choosepath = props.choosepath;
+    }
+
     if (props.authentication) {
       // set the authentication method (required - default is null)
       if (typeof props.authentication.auth_method === 'string') {

package/lib/propertyUtil.js

@@ -30,7 +30,7 @@ class AdapterPropertyUtil {
    *
    * @return {Object} entitySchema - the entity schema object
    */
-  getEntitySchemaFromFS(entityName, actionName) {
+  getEntitySchemaFromFS(entityName, actionName, choosepath) {
     const origin = `${this.myid}-propertyUtil-getEntitySchemaFromFS`;
     log.trace(origin);
 
@@ -264,6 +264,32 @@ class AdapterPropertyUtil {
       entitySchema.responseObjects = [];
       entitySchema.mockresponses = [];
 
+      // if the entitypath is an object instead of a string need to figure out which path to use
+      if (actionInfo.entitypath && typeof actionInfo.entitypath === 'object') {
+        const ekeys = Object.keys(actionInfo.entitypath);
+        if (ekeys.length > 0) {
+          // the first one is the default so if we do not have a match that is the one that will be used
+          entitySchema.entitypath = actionInfo.entitypath[ekeys[0]];
+          for (let ep = 1; ep < ekeys.length; ep += 1) {
+            // see if the key matches the choosepath value, if it does set the entitypath
+            if (choosepath && ekeys[ep] === choosepath) {
+              entitySchema.entitypath = actionInfo.entitypath[ekeys[ep]];
+              break;
+            }
+          }
+        } else {
+          // add the specific pieces of the error object
+          errorObj.type = 'Invalid Action File';
+          errorObj.vars = ['missing entity path', actionFile];
+
+          // log (if not system entity) and throw the error
+          if (entityName !== '.system') {
+            log.error(`${origin}: Entity ${entityName} action ${actionName} - missing entity path`);
+          }
+          throw new Error(JSON.stringify(errorObj));
+        }
+      }
+
       // if info provided, replace the defaults
       if (actionInfo.querykey) {
         entitySchema.querykey = actionInfo.querykey;
@@ -399,7 +425,7 @@ class AdapterPropertyUtil {
    *
    * @return {Object} entitySchema - the entity schema object
    */
-  getEntitySchemaFromDB(dbObj, entityName, actionName, dbUtils, callback) {
+  getEntitySchemaFromDB(dbObj, entityName, actionName, choosepath, dbUtils, callback) {
     const origin = `${this.myid}-propertyUtil-getEntitySchemaFromDB`;
     log.trace(origin);
 
@@ -672,6 +698,33 @@ class AdapterPropertyUtil {
         entitySchema.responseObjects = [];
         entitySchema.mockresponses = [];
 
+        // if the entitypath is an object instead of a string need to figure out which path to use
+        if (actionInfo.entitypath && typeof actionInfo.entitypath === 'object') {
+          const ekeys = Object.keys(actionInfo.entitypath);
+          if (ekeys.length > 0) {
+            // the first one is the default so if we do not have a match that is the one that will be used
+            entitySchema.entitypath = actionInfo.entitypath[ekeys[0]];
+            for (let ep = 1; ep < ekeys.length; ep += 1) {
+              // see if the key matches the choosepath value, if it does set the entitypath
+              if (choosepath && ekeys[ep] === choosepath) {
+                entitySchema.entitypath = actionInfo.entitypath[ekeys[ep]];
+                break;
+              }
+            }
+          } else {
+          // add the specific pieces of the error object
+            errorObj.type = 'Invalid Action File';
+            errorObj.vars = ['missing entity path', entityName];
+
+            // log (if not system entity) and return the error
+            if (entityName !== '.system') {
+              log.error(`${origin}: Entity ${entityName} action ${actionName} - missing entity path`);
+              errorObj.error = [`${origin}: Entity ${entityName} action ${actionName} - missing entity path`];
+            }
+            return callback(null, errorObj);
+          }
+        }
+
         // if info provided, replace the defaults
         if (actionInfo.querykey) {
           entitySchema.querykey = actionInfo.querykey;
@@ -796,14 +849,14 @@ class AdapterPropertyUtil {
    *
    * @return {Object} entitySchema - the entity schema object
    */
-  getEntitySchema(entityName, actionName, dbUtils, callback) {
+  getEntitySchema(entityName, actionName, choosepath, dbUtils, callback) {
     const origin = `${this.myid}-propertyUtil-getEntitySchema`;
     log.trace(origin);
 
     // need to try to get the entity schema from the adapter database
     try {
       // call to get the adapter schema from the database
-      return this.getEntitySchemaFromDB(null, entityName, actionName, dbUtils, (dbresp, dberror) => {
+      return this.getEntitySchemaFromDB(null, entityName, actionName, choosepath, dbUtils, (dbresp, dberror) => {
         // if we got an error back - just means db config not in place
         if (dberror || !dbresp || (dbresp && Object.keys(dbresp).length === 0)) {
           log.debug('unable to get adapter config from adapter database');
@@ -816,7 +869,7 @@ class AdapterPropertyUtil {
           };
 
           // need to try to get the entity schema from the iap database
-          return this.getEntitySchemaFromDB(iapDB, entityName, actionName, dbUtils, (iapdbresp, iapdberror) => {
+          return this.getEntitySchemaFromDB(iapDB, entityName, actionName, choosepath, dbUtils, (iapdbresp, iapdberror) => {
             // if we got an error back - just means db config not in place
             if (iapdberror || !iapdbresp || (iapdbresp && Object.keys(iapdbresp).length === 0)) {
               log.debug('unable to get adapter config from iap database');
@@ -824,7 +877,7 @@ class AdapterPropertyUtil {
               // need to try to get the entity schema from the filesystem
               log.debug('returning adapter config from file system');
               try {
-                return callback(this.getEntitySchemaFromFS(entityName, actionName), null);
+                return callback(this.getEntitySchemaFromFS(entityName, actionName, choosepath), null);
               } catch (exc) {
                 log.error('Exception caught on File System');
                 return callback(null, exc);

package/lib/requestHandler.js

@@ -117,6 +117,11 @@ function walkThroughActionFiles(directory) {
     const actionSchema = JSON.parse(fs.readFileSync(actionSchemaFile, 'utf-8'));
     const entitydir = `${directory}/entities`;
 
+    // if there is no entity directory - return
+    if (!fs.existsSync(directory) || !fs.existsSync(entitydir)) {
+      return clean;
+    }
+
     // if there is an entity directory
     if (fs.statSync(directory).isDirectory() && fs.statSync(entitydir).isDirectory()) {
       const entities = fs.readdirSync(entitydir);
@@ -577,7 +582,7 @@ class RequestHandler {
       }
 
       // Get the entity schema from the file system
-      return this.propUtil.getEntitySchema(entity, action, this.dbUtil, (entitySchema, entityError) => {
+      return this.propUtil.getEntitySchema(entity, action, this.props.choosepath, this.dbUtil, (entitySchema, entityError) => {
         // verify protocol for call
         if (entityError) {
           const errorObj = this.transUtil.checkAndReturn(entityError, origin, 'Issue identifiying request');
@@ -673,7 +678,7 @@ class RequestHandler {
       let prot = this.props.healthcheck.protocol;
 
       // Get the entity schema from the file system
-      return this.propUtil.getEntitySchema('.system', 'healthcheck', this.dbUtil, (healthSchema, healthError) => {
+      return this.propUtil.getEntitySchema('.system', 'healthcheck', this.props.choosepath, this.dbUtil, (healthSchema, healthError) => {
         if (healthError || !healthSchema || Object.keys(healthSchema).length === 0) {
           log.debug(`${origin}: Using adapter properties for healthcheck information`);
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-utils",
-  "version": "4.47.0",
+  "version": "4.48.0",
   "description": "Itential Adapter Utility Libraries",
   "scripts": {
     "postinstall": "node utils/setup.js",

package/schemas/actionSchema.json

@@ -32,10 +32,12 @@
             ]
           },
           "entitypath": {
-            "type": "string",
-            "description": "the path to use for this action",
-            "default": "GET",
-            "pattern": "^({base_path}|\\/)[-a-zA-Z0-9!@$:&%_+.,~#\\/*=:]*({version})?([-a-zA-Z0-9!@$:&%_+.,~#\\/*=:]*({pathv[0-9]+})?)*(\\??[-a-zA-Z0-9!@$:&%_+.,\\(\\)~#\\/*=:]*({username})?[-a-zA-Z0-9!@$:&%_+.,\\(\\)~#\/*=:]*({password})?({query})?)?$",
+            "type": [
+              "string",
+              "object"
+            ],
+            "description": "the path(s) to use for this action",
+            "default": "",
             "examples": [
               "/api/devices{pathv1}{query}", "/api/devices{pathv1}/components{pathv2}{query}",
               "/api/devices", "/api/devices{query}"

package/schemas/propertiesSchema.json

@@ -18,6 +18,11 @@
       "minimum": 1,
       "maximum": 65535
     },
+    "choosepath": {
+      "type": "string",
+      "description": "choose the path to use -- requires entityPath choices",
+      "default": ""
+    },
     "base_path": {
       "type": "string",
       "description": "a base path that is consistent across api calls",
@@ -382,7 +387,8 @@
         },
         "query_object": {
           "type": "object",
-          "description": "Query object { device: xxxxx } to be placed into the healthcheck, will be converted to query string by the adapter"
+          "description": "Query object { device: xxxxx } to be placed into the healthcheck, will be converted to query string by the adapter",
+          "default": {}
         }
       },
       "required": [
@@ -462,6 +468,7 @@
         "priorities": {
           "type": "array",
           "description": "define your priorities here",
+          "default": [],
           "items": {
             "type": "object",
             "properties": {
@@ -532,6 +539,7 @@
         "failover_codes": {
           "type": "array",
           "description": "An array of codes where it is ok to try another method",
+          "default": [],
           "items": {
             "type": "integer"
           }
@@ -549,19 +557,23 @@
           "properties": {
             "payload": {
               "type": "object",
-              "description": "payload fields that will be appended to the provided payload (excluding GET calls)"
+              "description": "payload fields that will be appended to the provided payload (excluding GET calls)",
+              "default": {}
             },
             "uriOptions": {
               "type": "object",
-              "description": "options that will be appended to all GET calls"
+              "description": "options that will be appended to all GET calls",
+              "default": {}
             },
             "addlHeaders": {
               "type": "object",
-              "description": "headers that will be appended to the headers for the call"
+              "description": "headers that will be appended to the headers for the call",
+              "default": {}
             },
             "authData": {
               "type": "object",
-              "description": "authentication data that will be appended to the payload for authentication calls"
+              "description": "authentication data that will be appended to the payload for authentication calls",
+              "default": {}
             }
           }
         },