@itentialopensource/adapter-meraki 0.8.1 → 0.8.2

package/report/updateReport1651511176919.json

@@ -0,0 +1,115 @@
+{
+  "errors": [],
+  "statistics": [
+    {
+      "owner": "errorJson",
+      "description": "New adapter errors available for use",
+      "value": 0
+    },
+    {
+      "owner": "errorJson",
+      "description": "Adapter errors no longer available for use",
+      "value": 0
+    },
+    {
+      "owner": "errorJson",
+      "description": "Adapter errors that have been updated (e.g. recommendation changes)",
+      "value": 31
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of production dependencies",
+      "value": 13
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of development dependencies",
+      "value": 7
+    },
+    {
+      "owner": "packageJson",
+      "description": "Number of npm scripts",
+      "value": 23
+    },
+    {
+      "owner": "packageJson",
+      "description": "Runtime Library dependency",
+      "value": "^4.45.4"
+    },
+    {
+      "owner": "propertiesSchemaJson",
+      "description": "Adapter properties defined in the propertiesSchema file",
+      "value": 69
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the README.md",
+      "value": 258
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the SUMMARY.md",
+      "value": 9
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the PROPERTIES.md",
+      "value": 248
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the TROUBLESHOOT.md",
+      "value": 47
+    },
+    {
+      "owner": "markdown",
+      "description": "Number of lines in the ENHANCE.md",
+      "value": 70
+    },
+    {
+      "owner": "unitTestJS",
+      "description": "Number of lines of code in unit tests",
+      "value": 13280
+    },
+    {
+      "owner": "unitTestJS",
+      "description": "Number of unit tests",
+      "value": 852
+    },
+    {
+      "owner": "integrationTestJS",
+      "description": "Number of lines of code in integration tests",
+      "value": 9678
+    },
+    {
+      "owner": "integrationTestJS",
+      "description": "Number of integration tests",
+      "value": 334
+    },
+    {
+      "owner": "staticFile",
+      "description": "Number of lines of code in adapterBase.js",
+      "value": 1294
+    },
+    {
+      "owner": "staticFile",
+      "description": "Number of static files added",
+      "value": 35
+    },
+    {
+      "owner": "Overall",
+      "description": "Total lines of Code",
+      "value": 24252
+    },
+    {
+      "owner": "Overall",
+      "description": "Total Tests",
+      "value": 1186
+    },
+    {
+      "owner": "Overall",
+      "description": "Total Files",
+      "value": 6
+    }
+  ]
+}

package/test/unit/adapterBaseTestUnit.js

@@ -317,7 +317,7 @@ describe('[unit] Adapter Base Test', () => {
       });
       it('should return a list of functions', (done) => {
         const returnedFunctions = ['addEntityCache', 'capabilityResults', 'checkActionFiles', 'checkProperties', 'connect', 'encryptProperty',
-          'entityInList', 'getAllCapabilities', 'getAllFunctions', 'healthCheck', 'iapFindAdapterPath', 'iapGetAdapterQueue', 'iapGetAdapterWorkflowFunctions', 'iapMoveAdapterEntitiesToDB',
+          'entityInList', 'getAllCapabilities', 'getAllFunctions', 'healthCheck', 'iapFindAdapterPath', 'iapGetAdapterQueue', 'iapGetAdapterWorkflowFunctions', 'iapMakeBrokerCall', 'iapMoveAdapterEntitiesToDB',
           'iapRunAdapterBasicGet', 'iapRunAdapterConnectivity', 'iapRunAdapterHealthcheck', 'iapSuspendAdapter', 'iapTroubleshootAdapter', 'iapUnsuspendAdapter', 'iapUpdateAdapterConfiguration', 'refreshProperties', 'addListener',
           'emit', 'eventNames', 'getMaxListeners', 'listenerCount', 'listeners', 'off', 'on', 'once', 'prependListener',
           'prependOnceListener', 'rawListeners', 'removeAllListeners', 'removeListener', 'setMaxListeners'];

package/test/unit/adapterTestUnit.js

@@ -725,11 +725,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}`);

package/utils/tbUtils.js

@@ -352,13 +352,7 @@ module.exports = {
 
   // get database connection and existing adapter config
   getAdapterConfig: async function getAdapterConfig() {
-    const newDirname = this.getDirname();
-    let iapDir;
-    if (this.withinIAP(newDirname)) { // when this script is called from IAP
-      iapDir = newDirname;
-    } else {
-      iapDir = path.join(this.getDirname(), 'utils', '../../../../');
-    }
+    const iapDir = this.getIAPHome();
     const pronghornProps = this.getPronghornProps(iapDir);
     console.log('Connecting to Database...');
     const database = await this.connect(iapDir, pronghornProps);
@@ -434,6 +428,25 @@ module.exports = {
     return stdout.trim();
   },
 
+  /**
+   * @summary Obtain the IAP installation directory depending on how adapter is used:
+   * by IAP, or by npm run CLI interface
+   * @returns IAP installation directory
+   * @function getIAPHome
+   */
+  getIAPHome: function getIAPHome() {
+    // if adapter started via IAP, use path injected by core
+    if (process.env.iap_home) return process.env.iap_home;
+    // adapter started via CLI `npm run <command>` so we have to be located under
+    // <IAP_HOME>/node_modules/@itentialopensource/<adapter>/ directory,
+    // use `pwd` command wihout option -P(resolving symlinks) https://linux.die.net/man/1/pwd
+    const { stdout } = this.systemSync('pwd', true);
+    if (stdout.indexOf('/node_modules') >= 0) {
+      return stdout.trim().split('/node_modules')[0];
+    }
+    return path.join(stdout.trim(), '../../../');
+  },
+
   /**
    * @summary connect to mongodb
    *