@itentialopensource/adapter-utils 4.48.13 → 4.48.15

package/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+## 4.48.15 [05-09-2023]
+
+* Add healthcheck headers to adapter properties
+
+Closes ADAPT-2662
+
+See merge request itentialopensource/adapter-utils!256
+
+---
+
+## 4.48.14 [05-09-2023]
+
+* modified connectorRest.js so that if there is a field named 'ca_file_content'...
+
+Closes ADAPT-2603
+
+See merge request itentialopensource/adapter-utils!255
+
+---
+
 ## 4.48.13 [04-10-2023]
 
 * Update xm2json dependency version in package

package/lib/connectorRest.js

@@ -76,6 +76,7 @@ let ecdhAuto = false;
 let sslEnabled = false;
 let sslAcceptInvalid = false;
 let sslCAFile = null;
+let sslCAFileContent = null;
 let sslKeyFile = null;
 let sslCertFile = null;
 let sslCiphers = null;
@@ -1900,7 +1901,11 @@ async function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
               // if we are not accepting invalid certs, need the ca file in the options
               try {
                 options.rejectUnauthorized = true;
-                options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+                if (sslCAFileContent && sslCAFileContent !== '') {
+                  options.ca = [sslCAFileContent];
+                } else {
+                  options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+                }
               } catch (e) {
                 const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [callProperties.ssl.ca_file], null, null, null);
                 log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -1925,7 +1930,11 @@ async function buildTokenRequest(reqPath, reqBody, callProperties, callback) {
             // if we are not accepting invalid certs, need the ca file in the options
             try {
               options.rejectUnauthorized = true;
-              options.ca = [fs.readFileSync(sslCAFile)];
+              if (sslCAFileContent && sslCAFileContent !== '') {
+                options.ca = [sslCAFileContent];
+              } else {
+                options.ca = [fs.readFileSync(sslCAFile)];
+              }
             } catch (e) {
               const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [sslCAFile], null, null, null);
               log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -4058,6 +4067,10 @@ class ConnectorRest {
         sslCAFile = props.ssl.ca_file;
       }
 
+      if (typeof props.ssl.ca_file_content === 'string') {
+        sslCAFileContent = props.ssl.ca_file_content;
+      }
+
       // set the ssl key file (optional - default is null)
       if (typeof props.ssl.key_file === 'string') {
         sslKeyFile = props.ssl.key_file;
@@ -4150,7 +4163,7 @@ class ConnectorRest {
               return callback(false);
             }
           }
-          if (sslEnabled && !sslAcceptInvalid && !sslCAFile) {
+          if (sslEnabled && !sslAcceptInvalid && (!sslCAFile || !sslCAFileContent)) {
             log.error(`${origin}: FAILED TO LOAD - missing required CA File`);
             return callback(false);
           }
@@ -4194,7 +4207,7 @@ class ConnectorRest {
         return callback(false);
       }
     }
-    if (sslEnabled && !sslAcceptInvalid && !sslCAFile) {
+    if (sslEnabled && !sslAcceptInvalid && (!sslCAFile || !sslCAFileContent)) {
       log.error(`${origin}: FAILED TO LOAD - missing required CA File`);
       return callback(false);
     }
@@ -4309,7 +4322,11 @@ class ConnectorRest {
             // if we are not accepting invalid certs, need the ca file in the options
             try {
               options.rejectUnauthorized = true;
-              options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              if (sslCAFileContent && sslCAFileContent !== '') {
+                options.ca = [sslCAFileContent];
+              } else {
+                options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              }
             } catch (e) {
               const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [callProperties.ssl.ca_file], null, null, null);
               log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -4334,7 +4351,11 @@ class ConnectorRest {
           // if we are not accepting invalid certs, need the ca file in the options
           try {
             options.rejectUnauthorized = true;
-            options.ca = [fs.readFileSync(sslCAFile)];
+            if (sslCAFileContent && sslCAFileContent !== '') {
+              options.ca = [sslCAFileContent];
+            } else {
+              options.ca = [fs.readFileSync(sslCAFile)];
+            }
           } catch (e) {
             const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [sslCAFile], null, null, null);
             log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -4496,7 +4517,11 @@ class ConnectorRest {
             // if we are not accepting invalid certs, need the ca file in the options
             try {
               options.rejectUnauthorized = true;
-              options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              if (sslCAFileContent && sslCAFileContent !== '') {
+                options.ca = [sslCAFileContent];
+              } else {
+                options.ca = [fs.readFileSync(callProperties.ssl.ca_file)];
+              }
             } catch (e) {
               const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [callProperties.ssl.ca_file], null, null, null);
               log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -4521,7 +4546,11 @@ class ConnectorRest {
           // if we are not accepting invalid certs, need the ca file in the options
           try {
             options.rejectUnauthorized = true;
-            options.ca = [fs.readFileSync(sslCAFile)];
+            if (sslCAFileContent && sslCAFileContent !== '') {
+              options.ca = [sslCAFileContent];
+            } else {
+              options.ca = [fs.readFileSync(sslCAFile)];
+            }
           } catch (e) {
             const errorObj = this.transUtil.formatErrorObject(origin, 'Missing File', [sslCAFile], null, null, null);
             log.error(`${origin}: ${errorObj.IAPerror.displayString}`);

package/lib/propertyUtil.js

@@ -256,6 +256,7 @@ class AdapterPropertyUtil {
       }
 
       // Merge the information into the entity schema
+      entitySchema.name = actionName;
       entitySchema.protocol = actionInfo.protocol;
       entitySchema.method = actionInfo.method;
       entitySchema.timeout = actionInfo.timeout;
@@ -690,6 +691,7 @@ class AdapterPropertyUtil {
         };
 
         // Merge the information into the entity schema
+        entitySchema.name = actionName;
         entitySchema.protocol = actionInfo.protocol;
         entitySchema.method = actionInfo.method;
         entitySchema.timeout = actionInfo.timeout;

package/lib/restHandler.js

@@ -24,6 +24,7 @@ let encodePath = true;
 let encodeUri = true;
 let stripEscapes = false;
 let returnResponseHeaders = true;
+let healthcheckHeaders = null;
 // INTERNAL FUNCTIONS
 /*
  * INTERNAL FUNCTION: Get the best match for the mock data response
@@ -825,6 +826,13 @@ function mergeHeaders(addlHeaders, entitySchema) {
     thisAHdata = transUtilInst.mergeObjects(thisAHdata, entitySchema.headers);
   }
 
+  // add healthcheck headers if there are healthcheck headers to add
+  if (entitySchema && entitySchema.name === 'healthcheck') {
+    if (healthcheckHeaders && Object.keys(healthcheckHeaders).length > 0) {
+      thisAHdata = transUtilInst.mergeObjects(thisAHdata, healthcheckHeaders);
+    }
+  }
+
   // only add global headers if there are global headers to add
   if (globalRequestGl && globalRequestGl.addlHeaders && Object.keys(globalRequestGl.addlHeaders).length > 0) {
     thisAHdata = transUtilInst.mergeObjects(thisAHdata, globalRequestGl.addlHeaders);
@@ -1051,6 +1059,10 @@ class RestHandler {
     if (typeof properties.request.returnResponseHeaders === 'boolean') {
       returnResponseHeaders = properties.request.returnResponseHeaders;
     }
+
+    if (properties.healthcheck && typeof properties.healthcheck.addlHeaders === 'object') {
+      healthcheckHeaders = properties.healthcheck.addlHeaders;
+    }
   }
 
   /**

package/package.json

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