@itentialopensource/adapter-meraki 1.3.0 → 1.4.1

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## 1.4.1 [12-20-2023]
+
+* add keys to broker config, update axios
+
+See merge request itentialopensource/adapters/sd-wan/adapter-meraki!35
+
+---
+
+## 1.4.0 [12-14-2023]
+
+* More migration changes
+
+See merge request itentialopensource/adapters/sd-wan/adapter-meraki!34
+
+---
+
 ## 1.3.0 [11-06-2023]
 
 * More migration changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-meraki",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "This adapter integrates with system described as: merakiDashboardApi.",
   "main": "adapter.js",
   "systemName": "Meraki",
@@ -57,7 +57,7 @@
     "@itentialopensource/adapter-utils": "^5.3.0",
     "acorn": "^8.10.0",
     "ajv": "^8.12.0",
-    "axios": "^1.4.0",
+    "axios": "^1.6.2",
     "commander": "^11.0.0",
     "dns-lookup-promise": "^1.0.4",
     "fs-extra": "^11.1.1",

package/report/adapterInfo.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.4",
+  "version": "1.4.0",
   "configLines": 63063,
   "scriptLines": 1783,
   "codeLines": 53869,

package/sampleProperties.json

@@ -13,6 +13,7 @@
     "save_metric": false,
     "stub": true,
     "protocol": "https",
+    "orgID": "1076949",
     "authentication": {
       "auth_method": "static_token",
       "username": "username",
@@ -21,8 +22,8 @@
       "token_timeout": 1800000,
       "token_cache": "local",
       "invalid_token_error": 401,
-      "auth_field": "header.headers.X-Cisco-Meraki-API-Key",
-      "auth_field_format": "{token}",
+      "auth_field": "header.headers.Authorization",
+      "auth_field_format": "Bearer {token}",
       "auth_logging": false,
       "client_id": "",
       "client_secret": "",
@@ -116,27 +117,24 @@
     "devicebroker": {
       "getDevice": [
         {
-          "path": "/organizations/{orgID}/devices",
+          "path": "/organizations/{orgID}/networks/{networkId}/devices/{serial}",
           "method": "GET",
-          "query": {
-            "networkID": "networkID",
-            "serial": "serial"
-          },
+          "query": {},
           "body": {},
           "headers": {},
           "handleFailure": "ignore",
           "requestFields": {
-            "networkID": "port",
-            "serial": "name",
-            "orgID": "orgID"
+            "networkID": "{port}",
+            "serial": "{serial}"
           },
           "responseDatakey": "",
           "responseFields": {
-            "name": "serial",
-            "ostype": "model",
+            "name": "{name}{||}{serial}",
+            "ostype": "{model}",
             "ostypePrefix": "meraki-",
-            "port": "networkId",
-            "ipaddress": "mac"
+            "port": "{networkId}",
+            "ipaddress": "{mac}",
+            "serial" : "{serial}"
           }
         }
       ],
@@ -154,17 +152,16 @@
           "body": {},
           "headers": {},
           "handleFailure": "ignore",
-          "requestFields": {
-            "orgID": "1076949"
-          },
+          "requestFields": {},
           "responseDatakey": "",
           "responseFields": {
-            "name": "serial",
-            "ostype": "model",
+            "name": "{name}{||}{serial}",
+            "ostype": "{model}",
             "ostypePrefix": "meraki-",
-            "port": "networkId",
-            "ipaddress": "mac",
-            "orgID": "orgID"
+            "port": "{networkId}",
+            "ipaddress": "{mac}",
+            "serial" : "{serial}",
+            "orgID": "{orgID}"
           }
         }
       ],
@@ -177,9 +174,8 @@
           "headers": {},
           "handleFailure": "ignore",
           "requestFields": {
-            "networkID": "port",
-            "serial": "name",
-            "orgID": "orgID"
+            "networkID": "{port}",
+            "serial": "{serial}"
           },
           "responseDatakey": "",
           "responseFields": {
@@ -197,9 +193,8 @@
           "headers": {},
           "handleFailure": "ignore",
           "requestFields": {
-            "networkID": "port",
-            "serial": "name",
-            "orgID": "orgID"
+            "networkID": "{port}",
+            "serial": "{serial}"
           },
           "responseDatakey": "",
           "responseFields": {}
@@ -213,9 +208,7 @@
           "body": {},
           "headers": {},
           "handleFailure": "ignore",
-          "requestFields": {
-            "orgID": "1076949"
-          },
+          "requestFields": {},
           "responseDatakey": "",
           "responseFields": {}
         }
@@ -245,16 +238,16 @@
               "body": {},
               "headers": {},
               "handleFailure": "ignore",
-              "requestFields": {
-                "orgID": "1076949"
-              },
+              "requestFields": {},
               "responseDatakey": "",
               "responseFields": {
-                "serial": "serial",
-                "model": "model",
-                "networkId": "networkId",
-                "mac": "mac",
-                "orgID": "orgID"
+                "name": "{name}{||}{serial}",
+                "ostype": "{model}",
+                "ostypePrefix": "meraki-",
+                "port": "{networkId}",
+                "ipaddress": "{mac}",
+                "serial" : "{serial}",
+                "orgID": "{orgID}"
               }
             }
           ],

package/test/unit/adapterTestUnit.js

@@ -316,7 +316,7 @@ describe('[unit] Meraki Adapter Test', () => {
           assert.notEqual(null, packageDotJson.dependencies);
           assert.notEqual('', packageDotJson.dependencies);
           assert.equal('^8.12.0', packageDotJson.dependencies.ajv);
-          assert.equal('^1.4.0', packageDotJson.dependencies.axios);
+          assert.equal('^1.6.2', packageDotJson.dependencies.axios);
           assert.equal('^11.0.0', packageDotJson.dependencies.commander);
           assert.equal('^11.1.1', packageDotJson.dependencies['fs-extra']);
           assert.equal('^10.2.0', packageDotJson.dependencies.mocha);