@itentialopensource/adapter-meraki 1.5.1 → 1.5.3

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## 1.5.3 [09-01-2024]
+
+* update dependencies and metadata
+
+See merge request itentialopensource/adapters/adapter-meraki!46
+
+---
+
+## 1.5.2 [08-15-2024]
+
+* Changes made at 2024.08.14_19:48PM
+
+See merge request itentialopensource/adapters/adapter-meraki!45
+
+---
+
 ## 1.5.1 [08-07-2024]
 
 * Changes made at 2024.08.06_21:53PM

package/SYSTEMINFO.md

@@ -23,5 +23,5 @@ The Cisco Meraki adapter from Itential is used to integrate the Itential Automat
 - Claims
 
 ## Additional Product Documentation
-The [API documents for Cisco Meraki](https://developer.cisco.com/meraki/api-latest/)
+The [API documents for Cisco Meraki](https://developer.cisco.com/meraki/api-v1/)
 [Cisco Meraki Products](https://www.cisco.com/c/m/en_hk/products/meraki.html)

package/TAB2.md

@@ -51,7 +51,7 @@ Sample Properties can be used to help you configure the adapter in the Itential
 
 ```json
   "properties": {
-    "host": "api.meraki.com",
+    "host": "localhost",
     "port": 443,
     "choosepath": "",
     "base_path": "/api",
@@ -67,7 +67,7 @@ Sample Properties can be used to help you configure the adapter in the Itential
       "auth_method": "static_token",
       "username": "username",
       "password": "password",
-      "token": "<token>",
+      "token": "token",
       "token_timeout": 1800000,
       "token_cache": "local",
       "invalid_token_error": 401,

package/entities/.generic/action.json

@@ -18,26 +18,6 @@
           "type": "default",
           "key": "",
           "mockFile": ""
-        },
-        {
-          "type": "mockData=getDevicesFiltered",
-          "key": "",
-          "mockFile": "mockdatafiles/getDevicesFiltered.json"
-        },
-        {
-          "type": "mockData=getConfig",
-          "key": "",
-          "mockFile": "mockdatafiles/getConfig.json"
-        },
-        {
-          "type": "mockData=isAlive",
-          "key": "",
-          "mockFile": "mockdatafiles/isAlive.json"
-        },
-        {
-          "type": "mockData=getCount",
-          "key": "",
-          "mockFile": "mockdatafiles/getDevicesFiltered.json"
         }
       ]
     },

package/metadata.json

@@ -1,8 +1,10 @@
 {
   "name": "adapter-meraki",
   "webName": "Adapter for Integration to Cisco Meraki",
+  "supportLevel": "certified",
   "vendor": "Cisco Systems",
   "product": "Meraki",
+  "techAlliance": true,
   "osVersion": [],
   "apiVersions": [
     "v1"
@@ -47,7 +49,7 @@
     "storeLink": "",
     "npmLink": "https://www.npmjs.com/package/@itentialopensource/adapter-meraki",
     "repoLink": "https://gitlab.com/itentialopensource/adapters/adapter-meraki",
-    "docLink": "https://docs.itential.com/opensource/docs/meraki",
+    "docLink": "https://gitlab.com/itentialopensource/adapters/adapter-meraki/-/blob/master/README.md?ref_type=heads",
     "demoLinks": [
       {
         "title": "Meraki SD-WAN Branch Management",
@@ -73,9 +75,15 @@
     "apiLinks": [
       {
         "title": "Meraki Dashboard API",
-        "link": "https://developer.cisco.com/meraki/api-latest/"
+        "link": "https://developer.cisco.com/meraki/api-v1/"
       }
-    ]
+    ],
+    "workshopLinks": [
+      {
+        "title": "Cloud Managed Networks"
+      }
+    ],
+    "workshopHomePage": "https://www.itential.com/get-started/"
   },
   "assets": [],
   "relatedItems": {
@@ -98,6 +106,5 @@
     ],
     "transformationProjects": [],
     "exampleProjects": []
-  },
-  "supportLevel": "community"
+  }
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@itentialopensource/adapter-meraki",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "This adapter integrates with system described as: merakiDashboardApi.",
   "main": "adapter.js",
   "systemName": "Meraki",
   "wizardVersion": "2.44.7",
-  "engineVersion": "1.67.19",
+  "engineVersion": "1.68.2",
   "adapterType": "http",
   "scripts": {
     "artifactize": "npm i && node utils/packModificationScript.js",
@@ -53,22 +53,22 @@
   "author": "Itential",
   "homepage": "https://gitlab.com/itentialopensource/adapters/adapter-meraki#readme",
   "dependencies": {
-    "@itentialopensource/adapter-utils": "^5.6.0",
+    "@itentialopensource/adapter-utils": "^5.7.0",
     "acorn": "^8.12.1",
     "ajv": "^8.17.1",
-    "axios": "^1.7.2",
+    "axios": "^1.7.4",
     "commander": "^11.0.0",
     "dns-lookup-promise": "^1.0.4",
     "fs-extra": "^11.2.0",
     "json-query": "^2.2.2",
-    "mocha": "^10.7.0",
+    "mocha": "^10.7.3",
     "mocha-param": "^2.0.1",
     "mongodb": "^4.16.0",
     "ping": "^0.4.4",
     "prompts": "^2.4.2",
     "readline-sync": "^1.4.10",
     "semver": "^7.6.3",
-    "winston": "^3.13.1"
+    "winston": "^3.14.2"
   },
   "devDependencies": {
     "chai": "^4.3.7",

package/report/adapterInfo.json

@@ -1,10 +1,10 @@
 {
-  "version": "1.4.8",
+  "version": "1.5.2",
   "configLines": 63068,
   "scriptLines": 1783,
   "codeLines": 53869,
-  "testLines": 43444,
-  "testCases": 2230,
-  "totalCodeLines": 99096,
+  "testLines": 43428,
+  "testCases": 2229,
+  "totalCodeLines": 99080,
   "wfTasks": 611
 }

package/sampleProperties.json

@@ -2,7 +2,7 @@
   "id": "meraki",
   "type": "Meraki",
   "properties": {
-    "host": "api.meraki.com",
+    "host": "localhost",
     "port": 443,
     "choosepath": "",
     "base_path": "/api",
@@ -18,7 +18,7 @@
       "auth_method": "static_token",
       "username": "username",
       "password": "password",
-      "token": "<token>",
+      "token": "token",
       "token_timeout": 1800000,
       "token_cache": "local",
       "invalid_token_error": 401,

package/test/integration/adapterTestConnectivity.js

@@ -4,7 +4,6 @@
 /* eslint no-unused-vars: warn */
 
 const assert = require('assert');
-const http = require('http');
 const https = require('https');
 const mocha = require('mocha');
 const ping = require('ping');
@@ -53,29 +52,6 @@ describe('[integration] Adapter Test', () => {
         });
     });
 
-    it('Support HTTP on port 80', (done) => {
-      const requestOptions = {
-        host,
-        port: 80,
-        method: 'HEAD'
-      };
-
-      const req = http.request(requestOptions, (res) => {
-        try {
-          assert.ok(res.statusCode >= 200 && res.statusCode < 400);
-          done();
-        } catch (error) {
-          done(error);
-        }
-      });
-
-      req.on('error', (err) => {
-        done(err);
-      });
-
-      req.end();
-    });
-
     it('Support HTTPS on port 443', (done) => {
       const requestOptions = {
         host,

package/test/integration/adapterTestIntegration.js

@@ -36,13 +36,17 @@ 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!!!
 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;
+
+// uncomment if connecting
+// samProps.host = 'replace.hostorip.here';
+// samProps.authentication.username = 'username';
+// samProps.authentication.password = 'password';
+// samProps.authentication.token = 'password';
+// samProps.protocol = 'http';
+// samProps.port = 80;
+// samProps.ssl.enabled = false;
+// samProps.ssl.accept_invalid_cert = false;
+
 if (samProps.request.attempt_timeout < 30000) {
   samProps.request.attempt_timeout = 30000;
 }
@@ -6383,12 +6387,12 @@ describe('[integration] Meraki Adapter Test', () => {
         {
           host: '<string>',
           port: '<integer>',
-          secret: '<string>'
+          secret: samProps.authentication.password
         },
         {
           host: '<string>',
           port: '<integer>',
-          secret: '<string>'
+          secret: samProps.authentication.password
         }
       ],
       radiusTestingEnabled: '<boolean>',
@@ -6409,12 +6413,12 @@ describe('[integration] Meraki Adapter Test', () => {
         {
           host: '<string>',
           port: '<integer>',
-          secret: '<string>'
+          secret: samProps.authentication.password
         },
         {
           host: '<string>',
           port: '<integer>',
-          secret: '<string>'
+          secret: samProps.authentication.password
         }
       ],
       radiusGroupAttribute: '<string>',
@@ -6502,12 +6506,12 @@ describe('[integration] Meraki Adapter Test', () => {
         {
           host: '<string>',
           port: '<integer>',
-          secret: '<string>'
+          secret: samProps.authentication.password
         },
         {
           host: '<string>',
           port: '<integer>',
-          secret: '<string>'
+          secret: samProps.authentication.password
         }
       ],
       radius: {
@@ -6526,12 +6530,12 @@ describe('[integration] Meraki Adapter Test', () => {
         {
           host: '<string>',
           port: '<integer>',
-          secret: '<string>'
+          secret: samProps.authentication.password
         },
         {
           host: '<string>',
           port: '<integer>',
-          secret: '<string>'
+          secret: samProps.authentication.password
         }
       ],
       radiusGroupAttribute: '<string>',

package/test/unit/adapterTestUnit.js

@@ -36,13 +36,17 @@ 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!!!
 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;
+
+// uncomment if connecting
+// samProps.host = 'replace.hostorip.here';
+// samProps.authentication.username = 'username';
+// samProps.authentication.password = 'password';
+// samProps.authentication.token = 'password';
+// samProps.protocol = 'http';
+// samProps.port = 80;
+// samProps.ssl.enabled = false;
+// samProps.ssl.accept_invalid_cert = false;
+
 samProps.request.attempt_timeout = 1200000;
 const attemptTimeout = samProps.request.attempt_timeout;
 const { stub } = samProps;
@@ -315,15 +319,15 @@ describe('[unit] Meraki Adapter Test', () => {
           assert.notEqual(null, packageDotJson.dependencies);
           assert.notEqual('', packageDotJson.dependencies);
           assert.equal('^8.17.1', packageDotJson.dependencies.ajv);
-          assert.equal('^1.7.2', packageDotJson.dependencies.axios);
+          assert.equal('^1.7.4', packageDotJson.dependencies.axios);
           assert.equal('^11.0.0', packageDotJson.dependencies.commander);
           assert.equal('^11.2.0', packageDotJson.dependencies['fs-extra']);
-          assert.equal('^10.7.0', packageDotJson.dependencies.mocha);
+          assert.equal('^10.7.3', packageDotJson.dependencies.mocha);
           assert.equal('^2.0.1', packageDotJson.dependencies['mocha-param']);
           assert.equal('^0.4.4', packageDotJson.dependencies.ping);
           assert.equal('^1.4.10', packageDotJson.dependencies['readline-sync']);
           assert.equal('^7.6.3', packageDotJson.dependencies.semver);
-          assert.equal('^3.13.1', packageDotJson.dependencies.winston);
+          assert.equal('^3.14.2', packageDotJson.dependencies.winston);
           done();
         } catch (error) {
           log.error(`Test Failure: ${error}`);
@@ -561,7 +565,7 @@ describe('[unit] Meraki Adapter Test', () => {
           log.error(`Adapter Exception: ${error}`);
           done(error);
         }
-      });
+      }).timeout(attemptTimeout);
     });
 
     describe('propertiesSchema.json', () => {