@itentialopensource/adapter-meraki 0.8.1 → 0.8.4

package/test/unit/adapterTestUnit.js

@@ -4,6 +4,7 @@
 /* global describe it log pronghornProps */
 /* eslint global-require: warn */
 /* eslint no-unused-vars: warn */
+/* eslint import/no-dynamic-require:warn */
 
 // include required items for testing & logging
 const assert = require('assert');
@@ -18,22 +19,31 @@ const { use } = require('chai');
 const td = require('testdouble');
 
 const anything = td.matchers.anything();
-
-// stub and attemptTimeout are used throughout the code so set them here
 let logLevel = 'none';
-const stub = true;
 const isRapidFail = false;
-const attemptTimeout = 600000;
+
+// read in the properties from the sampleProperties files
+let adaptdir = __dirname;
+if (adaptdir.endsWith('/test/integration')) {
+  adaptdir = adaptdir.substring(0, adaptdir.length - 17);
+} else if (adaptdir.endsWith('/test/unit')) {
+  adaptdir = adaptdir.substring(0, adaptdir.length - 10);
+}
+const samProps = require(`${adaptdir}/sampleProperties.json`).properties;
 
 // these variables can be changed to run in integrated mode so easier to set them here
 // always check these in with bogus data!!!
-const host = 'replace.hostorip.here';
-const username = 'username';
-const password = 'password';
-const protocol = 'http';
-const port = 80;
-const sslenable = false;
-const sslinvalid = false;
+samProps.stub = true;
+samProps.host = 'replace.hostorip.here';
+samProps.authentication.username = 'username';
+samProps.authentication.password = 'password';
+samProps.protocol = 'http';
+samProps.port = 80;
+samProps.ssl.enabled = false;
+samProps.ssl.accept_invalid_cert = false;
+samProps.request.attempt_timeout = 60000;
+const attemptTimeout = samProps.request.attempt_timeout;
+const { stub } = samProps;
 
 // these are the adapter properties. You generally should not need to alter
 // any of these after they are initially set up
@@ -45,102 +55,7 @@ global.pronghornProps = {
     adapters: [{
       id: 'Test-meraki',
       type: 'Meraki',
-      properties: {
-        host,
-        port,
-        base_path: '//api',
-        version: 'v0',
-        cache_location: 'none',
-        encode_pathvars: true,
-        save_metric: false,
-        protocol,
-        stub,
-        authentication: {
-          auth_method: 'basic user_password',
-          username,
-          password,
-          token: '',
-          token_timeout: -1,
-          token_cache: 'local',
-          invalid_token_error: 401,
-          auth_field: 'header.headers.Authorization',
-          auth_field_format: 'Basic {b64}{username}:{password}{/b64}',
-          auth_logging: false,
-          client_id: '',
-          client_secret: '',
-          grant_type: ''
-        },
-        healthcheck: {
-          type: 'none',
-          frequency: 60000,
-          query_object: {}
-        },
-        throttle: {
-          throttle_enabled: false,
-          number_pronghorns: 1,
-          sync_async: 'sync',
-          max_in_queue: 1000,
-          concurrent_max: 1,
-          expire_timeout: 0,
-          avg_runtime: 200,
-          priorities: [
-            {
-              value: 0,
-              percent: 100
-            }
-          ]
-        },
-        request: {
-          number_redirects: 0,
-          number_retries: 3,
-          limit_retry_error: 0,
-          failover_codes: [],
-          attempt_timeout: attemptTimeout,
-          global_request: {
-            payload: {},
-            uriOptions: {},
-            addlHeaders: {},
-            authData: {}
-          },
-          healthcheck_on_timeout: true,
-          return_raw: true,
-          archiving: false,
-          return_request: false
-        },
-        proxy: {
-          enabled: false,
-          host: '',
-          port: 1,
-          protocol: 'http',
-          username: '',
-          password: ''
-        },
-        ssl: {
-          ecdhCurve: '',
-          enabled: sslenable,
-          accept_invalid_cert: sslinvalid,
-          ca_file: '',
-          key_file: '',
-          cert_file: '',
-          secure_protocol: '',
-          ciphers: ''
-        },
-        mongo: {
-          host: '',
-          port: 0,
-          database: '',
-          username,
-          password: '',
-          replSet: '',
-          db_ssl: {
-            enabled: false,
-            accept_invalid_cert: false,
-            ca_file: '',
-            key_file: '',
-            cert_file: ''
-          }
-        }
-      }
+      properties: samProps
     }]
   }
 };
@@ -475,6 +390,7 @@ describe('[unit] Meraki Adapter Test', () => {
           assert.notEqual(undefined, pronghornDotJson.methods.find((e) => e.name === 'iapUnsuspendAdapter'));
           assert.notEqual(undefined, pronghornDotJson.methods.find((e) => e.name === 'iapGetAdapterQueue'));
           assert.notEqual(undefined, pronghornDotJson.methods.find((e) => e.name === 'genericAdapterRequest'));
+          assert.notEqual(undefined, pronghornDotJson.methods.find((e) => e.name === 'genericAdapterRequestNoBasePath'));
           done();
         } catch (error) {
           log.error(`Test Failure: ${error}`);
@@ -646,6 +562,8 @@ describe('[unit] Meraki Adapter Test', () => {
           assert.equal('string', propertiesDotJson.definitions.authentication.properties.client_id.type);
           assert.equal('string', propertiesDotJson.definitions.authentication.properties.client_secret.type);
           assert.equal('string', propertiesDotJson.definitions.authentication.properties.grant_type.type);
+          assert.notEqual(undefined, propertiesDotJson.definitions.ssl);
+          assert.notEqual(null, propertiesDotJson.definitions.ssl);
           assert.notEqual('', propertiesDotJson.definitions.ssl);
           assert.equal('string', propertiesDotJson.definitions.ssl.properties.ecdhCurve.type);
           assert.equal('boolean', propertiesDotJson.definitions.ssl.properties.enabled.type);
@@ -659,6 +577,7 @@ describe('[unit] Meraki Adapter Test', () => {
           assert.equal('string', propertiesDotJson.properties.version.type);
           assert.equal('string', propertiesDotJson.properties.cache_location.type);
           assert.equal('boolean', propertiesDotJson.properties.encode_pathvars.type);
+          assert.equal('boolean', propertiesDotJson.properties.encode_queryvars.type);
           assert.equal(true, Array.isArray(propertiesDotJson.properties.save_metric.type));
           assert.equal('string', propertiesDotJson.properties.protocol.type);
           assert.notEqual(undefined, propertiesDotJson.definitions);
@@ -707,8 +626,6 @@ describe('[unit] Meraki Adapter Test', () => {
           assert.equal('string', propertiesDotJson.definitions.proxy.properties.protocol.type);
           assert.equal('string', propertiesDotJson.definitions.proxy.properties.username.type);
           assert.equal('string', propertiesDotJson.definitions.proxy.properties.password.type);
-          assert.notEqual(undefined, propertiesDotJson.definitions.ssl);
-          assert.notEqual(null, propertiesDotJson.definitions.ssl);
           assert.notEqual(undefined, propertiesDotJson.definitions.mongo);
           assert.notEqual(null, propertiesDotJson.definitions.mongo);
           assert.notEqual('', propertiesDotJson.definitions.mongo);
@@ -725,11 +642,11 @@ describe('[unit] Meraki Adapter Test', () => {
           assert.equal('string', propertiesDotJson.definitions.mongo.properties.db_ssl.properties.key_file.type);
           assert.equal('string', propertiesDotJson.definitions.mongo.properties.db_ssl.properties.cert_file.type);
           assert.notEqual('', propertiesDotJson.definitions.devicebroker);
-          assert.equal('object', propertiesDotJson.definitions.devicebroker.properties.getDevice.type);
-          assert.equal('object', propertiesDotJson.definitions.devicebroker.properties.getDevicesFiltered.type);
-          assert.equal('object', propertiesDotJson.definitions.devicebroker.properties.isAlive.type);
-          assert.equal('object', propertiesDotJson.definitions.devicebroker.properties.getConfig.type);
-          assert.equal('object', propertiesDotJson.definitions.devicebroker.properties.getCount.type);
+          assert.equal('array', propertiesDotJson.definitions.devicebroker.properties.getDevice.type);
+          assert.equal('array', propertiesDotJson.definitions.devicebroker.properties.getDevicesFiltered.type);
+          assert.equal('array', propertiesDotJson.definitions.devicebroker.properties.isAlive.type);
+          assert.equal('array', propertiesDotJson.definitions.devicebroker.properties.getConfig.type);
+          assert.equal('array', propertiesDotJson.definitions.devicebroker.properties.getCount.type);
           done();
         } catch (error) {
           log.error(`Test Failure: ${error}`);
@@ -846,17 +763,13 @@ describe('[unit] Meraki Adapter Test', () => {
           assert.notEqual(undefined, sampleDotJson.properties.ssl.cert_file);
           assert.notEqual(undefined, sampleDotJson.properties.ssl.secure_protocol);
           assert.notEqual(undefined, sampleDotJson.properties.ssl.ciphers);
-
           assert.notEqual(undefined, sampleDotJson.properties.base_path);
           assert.notEqual(undefined, sampleDotJson.properties.version);
           assert.notEqual(undefined, sampleDotJson.properties.cache_location);
           assert.notEqual(undefined, sampleDotJson.properties.encode_pathvars);
+          assert.notEqual(undefined, sampleDotJson.properties.encode_queryvars);
           assert.notEqual(undefined, sampleDotJson.properties.save_metric);
           assert.notEqual(undefined, sampleDotJson.properties.protocol);
-          assert.notEqual(undefined, sampleDotJson.properties.stub);
-          assert.notEqual(undefined, sampleDotJson.properties.stub);
-          assert.notEqual(undefined, sampleDotJson.properties.stub);
-          assert.notEqual(undefined, sampleDotJson.properties.stub);
           assert.notEqual(undefined, sampleDotJson.properties.healthcheck);
           assert.notEqual(null, sampleDotJson.properties.healthcheck);
           assert.notEqual('', sampleDotJson.properties.healthcheck);
@@ -915,6 +828,12 @@ describe('[unit] Meraki Adapter Test', () => {
           assert.notEqual(undefined, sampleDotJson.properties.mongo.db_ssl.ca_file);
           assert.notEqual(undefined, sampleDotJson.properties.mongo.db_ssl.key_file);
           assert.notEqual(undefined, sampleDotJson.properties.mongo.db_ssl.cert_file);
+          assert.notEqual(undefined, sampleDotJson.properties.devicebroker);
+          assert.notEqual(undefined, sampleDotJson.properties.devicebroker.getDevice);
+          assert.notEqual(undefined, sampleDotJson.properties.devicebroker.getDevicesFiltered);
+          assert.notEqual(undefined, sampleDotJson.properties.devicebroker.isAlive);
+          assert.notEqual(undefined, sampleDotJson.properties.devicebroker.getConfig);
+          assert.notEqual(undefined, sampleDotJson.properties.devicebroker.getCount);
           done();
         } catch (error) {
           log.error(`Test Failure: ${error}`);
@@ -1291,18 +1210,6 @@ describe('[unit] Meraki Adapter Test', () => {
       });
     });
 
-    describe('#hasDevices', () => {
-      it('should have a hasDevices function', (done) => {
-        try {
-          assert.equal(true, typeof a.hasDevices === 'function');
-          done();
-        } catch (error) {
-          log.error(`Test Failure: ${error}`);
-          done(error);
-        }
-      });
-    });
-
     describe('#getDevice', () => {
       it('should have a getDevice function', (done) => {
         try {

package/utils/adapterInfo.js

@@ -0,0 +1,206 @@
+#!/usr/bin/env node
+/* @copyright Itential, LLC 2019 */
+/* eslint global-require:warn */
+/* eslint import/no-dynamic-require:warn */
+/* eslint prefer-destructuring:warn */
+
+const fs = require('fs-extra');
+const path = require('path');
+
+/**
+ * This script will determine the information about the adapter and store
+ * it into a file in the adapter.
+ */
+
+/**
+ * get adapter information
+ */
+function adapterInfo() {
+  // set the base pase of the adapter - tool shoud be one level up in utils
+  let adaptdir = __dirname;
+  const infoRes = {};
+
+  if (adaptdir.endsWith('/utils')) {
+    adaptdir = adaptdir.substring(0, adaptdir.length - 6);
+  }
+  const pack = require(`${adaptdir}/package.json`);
+  infoRes.version = pack.version;
+
+  let configCount = 0;
+  if (fs.existsSync(`${adaptdir}/pronghorn.json`)) {
+    const cFile = fs.readFileSync(`${adaptdir}/pronghorn.json`, 'utf8');
+    configCount += cFile.split('\n').length;
+  } else {
+    console.log('Missing - pronghorn.json');
+  }
+  if (fs.existsSync(`${adaptdir}/propertiesSchema.json`)) {
+    const cFile = fs.readFileSync(`${adaptdir}/propertiesSchema.json`, 'utf8');
+    configCount += cFile.split('\n').length;
+  } else {
+    console.log('Missing - propertiesSchema.json');
+  }
+  if (fs.existsSync(`${adaptdir}/error.json`)) {
+    const cFile = fs.readFileSync(`${adaptdir}/error.json`, 'utf8');
+    configCount += cFile.split('\n').length;
+  } else {
+    console.log('Missing - error.json');
+  }
+  const entitydir = path.join(adaptdir, '/entities');
+  if (fs.existsSync(entitydir) && fs.statSync(entitydir).isDirectory()) {
+    const entities = fs.readdirSync(entitydir);
+    // need to go through each entity in the entities directory
+    for (let e = 0; e < entities.length; e += 1) {
+      if (fs.statSync(`${entitydir}/${entities[e]}`).isDirectory()) {
+        const cfiles = fs.readdirSync(entitydir);
+        for (let c = 0; c < cfiles.length; c += 1) {
+          if (cfiles[c].endsWith('.json')) {
+            const ccFile = fs.readFileSync(`${entitydir}/${entities[e]}/${cfiles[c]}`, 'utf8');
+            configCount += ccFile.split('\n').length;
+          }
+        }
+      }
+    }
+  } else {
+    console.log('Could not find the entities directory');
+  }
+  infoRes.configLines = configCount;
+
+  let scodeCount = 0;
+  if (fs.existsSync(`${adaptdir}/utils/artifactize.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/artifactize.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/artifactize.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/basicGet.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/basicGet.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/basicGet.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/checkMigrate.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/checkMigrate.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/checkMigrate.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/findPath.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/findPath.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/findPath.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/modify.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/modify.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/modify.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/packModificationScript.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/packModificationScript.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/packModificationScript.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/setup.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/setup.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/setup.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/tbScript.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/tbScript.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/tbScript.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/tbUtils.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/tbUtils.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/tbUtils.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/testRunner.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/testRunner.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/testRunner.js');
+  }
+  if (fs.existsSync(`${adaptdir}/utils/troubleshootingAdapter.js`)) {
+    const sFile = fs.readFileSync(`${adaptdir}/utils/troubleshootingAdapter.js`, 'utf8');
+    scodeCount += sFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/troubleshootingAdapter.js');
+  }
+  infoRes.scriptLines = scodeCount;
+
+  let codeCount = 0;
+  if (fs.existsSync(`${adaptdir}/adapter.js`)) {
+    const aFile = fs.readFileSync(`${adaptdir}/adapter.js`, 'utf8');
+    codeCount += aFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/adapter.js');
+  }
+  if (fs.existsSync(`${adaptdir}/adapterBase.js`)) {
+    const aFile = fs.readFileSync(`${adaptdir}/adapterBase.js`, 'utf8');
+    codeCount += aFile.split('\n').length;
+  } else {
+    console.log('Missing - utils/adapterBase.js');
+  }
+  infoRes.codeLines = codeCount;
+
+  let tcodeCount = 0;
+  let ttestCount = 0;
+  if (fs.existsSync(`${adaptdir}/test/integration/adapterTestBasicGet.js`)) {
+    const tFile = fs.readFileSync(`${adaptdir}/test/integration/adapterTestBasicGet.js`, 'utf8');
+    tcodeCount += tFile.split('\n').length;
+    ttestCount += tFile.split('it(\'').length;
+  } else {
+    console.log('Missing - test/integration/adapterTestBasicGet.js');
+  }
+  if (fs.existsSync(`${adaptdir}/test/integration/adapterTestConnectivity.js`)) {
+    const tFile = fs.readFileSync(`${adaptdir}/test/integration/adapterTestConnectivity.js`, 'utf8');
+    tcodeCount += tFile.split('\n').length;
+    ttestCount += tFile.split('it(\'').length;
+  } else {
+    console.log('Missing - test/integration/adapterTestConnectivity.js');
+  }
+  if (fs.existsSync(`${adaptdir}/test/integration/adapterTestIntegration.js`)) {
+    const tFile = fs.readFileSync(`${adaptdir}/test/integration/adapterTestIntegration.js`, 'utf8');
+    tcodeCount += tFile.split('\n').length;
+    ttestCount += tFile.split('it(\'').length;
+  } else {
+    console.log('Missing - test/integration/adapterTestIntegration.js');
+  }
+  if (fs.existsSync(`${adaptdir}/test/unit/adapterBaseTestUnit.js`)) {
+    const tFile = fs.readFileSync(`${adaptdir}/test/unit/adapterBaseTestUnit.js`, 'utf8');
+    tcodeCount += tFile.split('\n').length;
+    ttestCount += tFile.split('it(\'').length;
+  } else {
+    console.log('Missing - test/unit/adapterBaseTestUnit.js');
+  }
+  if (fs.existsSync(`${adaptdir}/test/unit/adapterTestUnit.js`)) {
+    const tFile = fs.readFileSync(`${adaptdir}/test/unit/adapterTestUnit.js`, 'utf8');
+    tcodeCount += tFile.split('\n').length;
+    ttestCount += tFile.split('it(\'').length;
+  } else {
+    console.log('Missing - test/unit/adapterTestUnit.js');
+  }
+  infoRes.testLines = tcodeCount;
+  infoRes.testCases = ttestCount;
+  infoRes.totalCodeLines = scodeCount + codeCount + tcodeCount;
+
+  if (fs.existsSync(`${adaptdir}/pronghorn.json`)) {
+    // Read the entity schema from the file system
+    const phFile = path.join(adaptdir, '/pronghorn.json');
+    const prong = require(phFile);
+    infoRes.wfTasks = prong.methods.length;
+  } else {
+    console.log('Missing - pronghorn.json');
+  }
+
+  console.log(JSON.stringify(infoRes));
+  fs.writeFileSync(`${adaptdir}/report/adapterInfo.json`, JSON.stringify(infoRes, null, 2));
+}
+
+adapterInfo();

package/utils/entitiesToDB.js

@@ -14,10 +14,8 @@
  */
 
 const fs = require('fs');
-const { MongoClient } = require('mongodb');
 const path = require('path');
-// const { argv } = require('process');
-// const { string } = require('yargs');
+const utils = require('./tbUtils');
 
 // get the pronghorn database information
 const getPronghornProps = async (iapDir) => {
@@ -99,7 +97,7 @@ const optionsHandler = (options) => {
 /**
  *  Function used to put the adapter configuration into the provided database
  */
-const moveEntitiesToDB = (targetPath, options) => {
+const moveEntitiesToDB = async (targetPath, options) => {
   // set local variables
   let myOpts = options;
   let myPath = targetPath;
@@ -120,25 +118,7 @@ const moveEntitiesToDB = (targetPath, options) => {
   }
 
   // get the pronghorn database properties
-  optionsHandler(options).then((currentProps) => {
-    let mongoUrl;
-    let dbName;
-
-    // find the mongo properties so we can connect
-    if (currentProps.mongoProps) {
-      mongoUrl = currentProps.mongoProps.url;
-      dbName = currentProps.mongoProps.db;
-    } else if (currentProps.mongo) {
-      if (currentProps.mongo.url) {
-        mongoUrl = currentProps.mongo.url;
-      } else {
-        mongoUrl = `mongodb://${currentProps.mongo.host}:${currentProps.mongo.port}`;
-      }
-      dbName = currentProps.mongo.database;
-    } else {
-      throw new Error('Mongo properties are not specified in adapter preferences!');
-    }
-
+  return optionsHandler(options).then(async (currentProps) => {
     // Check valid filepath provided
     if (!myPath) {
       // if no path use the current directory without the utils
@@ -184,41 +164,16 @@ const moveEntitiesToDB = (targetPath, options) => {
     });
 
     // Upload documents to db collection
-    MongoClient.connect(mongoUrl, (err, db) => {
-      if (err) {
-        log.error(JSON.stringify(err));
-        throw err;
-      }
-
-      // get the proper collection
-      const collection = db.db(dbName).collection(myOpts.targetCollection);
-      // insert the documents into the collection
-      collection.insertMany(docs, { checkKeys: false }, (error, res) => {
-        if (error) {
-          log.error(JSON.stringify(error));
-          throw error;
-        }
-        // log the insertion, close the database and return
-        log.debug(`Inserted ${docs.length} documents to ${dbName}.${myOpts.targetCollection} with response ${JSON.stringify(res)}`);
-        db.close();
-        return res;
-      });
-    });
+    const iapDir = utils.getIAPHome();
+    const db = await utils.connect(iapDir, currentProps).catch((err) => { console.error(err); throw err; });
+    if (!db) {
+      console.error('Error occured when connectiong to database', currentProps);
+      throw new Error('Database not found');
+    }
+    const collection = db.collection(myOpts.targetCollection);
+    const res = await collection.insertMany(docs, { checkKeys: false }).catch((err) => { console.error(err); throw err; });
+    return res;
   });
 };
 
-// const args = process.argv.slice(2);
-
-// throw new SyntaxError(args[0]);
-
-// if (args.length === 0) {
-//   console.error('ERROR: target path not specified!');
-// } else if (args[0] === 'help') {
-//   log.trace('node ./entitiesToDB <target path> <options object: {iapDir: string, pronghornProps: string, targetCollection: string}>');
-// } else if (args.length === 1) {
-//   console.error('ERROR: IAP directory not specified');
-// } else {
-//   moveEntitiesToDB(args[0], args[1]);
-// }
-
 module.exports = { moveEntitiesToDB };

package/utils/pre-commit.sh

@@ -17,6 +17,9 @@ printf "%b" "Running pre-commit hooks...\\n"
 # verify testing script is stubbed and no credentials
 node utils/testRunner.js -r
 
+# update the adapter information file
+node utils/adapterInfo.js
+
 # security audit on the code
 npm audit --registry=https://registry.npmjs.org --audit-level=moderate
 

package/utils/tbScript.js

@@ -1,4 +1,4 @@
-/* eslint no-console: warn */
+/* eslint-disable no-console */
 /* eslint import/no-unresolved: warn */
 /* eslint global-require: warn */
 
@@ -7,7 +7,6 @@
 /* eslint import/no-extraneous-dependencies: warn */
 /* eslint import/no-dynamic-require: warn */
 
-const path = require('path');
 const program = require('commander');
 const rls = require('readline-sync');
 const utils = require('./tbUtils');
@@ -19,32 +18,39 @@ const { addAuthInfo } = require('./addAuth');
 
 const { troubleshoot, offline } = require('./troubleshootingAdapter');
 
-const main = async (command) => {
-  const dirname = utils.getDirname();
-  const iapDir = path.join(dirname, '../../../');
-  if (!utils.withinIAP(iapDir)) {
-    if (command === 'install') {
-      console.log('Not currently in IAP directory - installation not possible');
-      process.exit(0);
-    } else if (command === 'connectivity') {
+const executeInStandaloneMode = async (command) => {
+  console.info('\n> Executing the script outside of IAP installation directory');
+  console.info('> Using sampleProperties.json configuration');
+  switch (command) {
+    case 'install': {
+      console.error('Not currently in IAP directory - installation not possible');
+      break;
+    }
+    case 'connectivity': {
       const { host } = sampleProperties.properties;
       console.log(`perform networking diagnositics to ${host}`);
-      await utils.runConnectivity(host);
-      process.exit(0);
-    } else if (command === 'healthcheck') {
+      utils.runConnectivity(host);
+      break;
+    }
+    case 'healthcheck': {
       const a = basicGet.getAdapterInstance({ properties: sampleProperties });
       await utils.healthCheck(a);
-      process.exit(0);
-    } else if (command === 'basicget') {
-      await utils.runBasicGet();
-      process.exit(0);
+      break;
     }
-    if (rls.keyInYN('Troubleshooting without IAP?')) {
-      await offline();
+    case 'basicget': {
+      utils.runBasicGet();
+      break;
+    }
+    default: {
+      if (rls.keyInYN('Troubleshooting without IAP?')) {
+        await offline();
+      }
     }
-    process.exit(0);
   }
+  process.exit(0);
+};
 
+const executeUnderIAPInstallationDirectory = async (command) => {
   if (command === undefined) {
     await troubleshoot({}, true, true);
   } else if (command === 'install') {
@@ -79,6 +85,7 @@ const main = async (command) => {
         process.exit(0);
       }
     } else {
+      const dirname = utils.getCurrentExecutionPath();
       utils.verifyInstallationDir(dirname, name);
       utils.runTest();
       if (rls.keyInYN(`Do you want to install ${name} to IAP?`)) {
@@ -123,6 +130,14 @@ const main = async (command) => {
   }
 };
 
+const main = async (command) => {
+  if (!utils.areWeUnderIAPinstallationDirectory()) {
+    executeInStandaloneMode(command); // configuration from sampleproperties.json
+  } else {
+    executeUnderIAPInstallationDirectory(command); // configuration from $IAP_HOME/properties.json
+  }
+};
+
 program
   .command('connectivity')
   .alias('c')