@itentialopensource/adapter-meraki 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## 1.0.4 [08-01-2023]
+
+* Update adapter base and import order
+
+See merge request itentialopensource/adapters/sd-wan/adapter-meraki!27
+
+---
+
+## 1.0.3 [07-10-2023]
+
+* Migrate adapter base to have broker changes
+
+See merge request itentialopensource/adapters/sd-wan/adapter-meraki!25
+
+---
+
 ## 1.0.2 [05-10-2023]
 
 * Migrate adapter base to have broker changes

package/adapterBase.js

@@ -11,11 +11,11 @@
 /* eslint prefer-destructuring: warn */
 
 /* Required libraries.  */
-const fs = require('fs-extra');
+const { execSync } = require('child_process');
 const path = require('path');
-const jsonQuery = require('json-query');
 const EventEmitterCl = require('events').EventEmitter;
-const { execSync } = require('child_process');
+const fs = require('fs-extra');
+const jsonQuery = require('json-query');
 
 const sampleProperties = require(`${__dirname}/sampleProperties.json`).properties;
 
@@ -26,14 +26,11 @@ const AjvCl = require('ajv');
 const PropUtilCl = require('@itentialopensource/adapter-utils').PropertyUtility;
 const RequestHandlerCl = require('@itentialopensource/adapter-utils').RequestHandler;
 
-const TransUtilCl = require(path.join(__dirname, 'node_modules/@itentialopensource/adapter-utils/lib/translatorUtil.js'));
-
 const entitiesToDB = require(path.join(__dirname, 'utils/entitiesToDB'));
 const troubleshootingAdapter = require(path.join(__dirname, 'utils/troubleshootingAdapter'));
 const tbUtils = require(path.join(__dirname, 'utils/tbUtils'));
 
 let propUtil = null;
-let transUtil = null;
 let choosepath = null;
 
 /*
@@ -217,10 +214,6 @@ class AdapterBase extends EventEmitterCl {
       this.id = prongid;
       this.propUtilInst = new PropUtilCl(prongid, __dirname);
       propUtil = this.propUtilInst;
-      this.transUtilInst = new TransUtilCl(prongid, this.propUtilInst);
-      transUtil = this.transUtilInst;
-      this.transUtilInst = new TransUtilCl(prongid, this.propUtilInst);
-      transUtil = this.transUtilInst;
       this.initProps = properties;
       this.alive = false;
       this.healthy = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-meraki",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "This adapter integrates with system described as: merakiDashboardApi.",
   "main": "adapter.js",
   "systemName": "Meraki",
@@ -53,7 +53,7 @@
   "author": "Itential",
   "homepage": "https://gitlab.com/itentialopensource/adapters/sd-wan/adapter-meraki#readme",
   "dependencies": {
-    "@itentialopensource/adapter-utils": "^4.48.10",
+    "@itentialopensource/adapter-utils": "^4.49.0",
     "ajv": "^6.12.0",
     "axios": "^0.21.0",
     "commander": "^2.20.0",

package/test/integration/adapterTestBasicGet.js

@@ -7,9 +7,9 @@
 /* eslint import/no-dynamic-require: warn */
 /* eslint import/no-unresolved: warn */
 
-const mocha = require('mocha');
 const path = require('path');
 const assert = require('assert');
+const mocha = require('mocha');
 const itParam = require('mocha-param');
 
 const utils = require('../../utils/tbUtils');

package/test/integration/adapterTestConnectivity.js

@@ -3,8 +3,8 @@
 /* global describe it context before after */
 /* eslint no-unused-vars: warn */
 
-const mocha = require('mocha');
 const assert = require('assert');
+const mocha = require('mocha');
 const diagnostics = require('network-diagnostics');
 
 let host;

package/test/integration/adapterTestIntegration.js

@@ -8,14 +8,14 @@
 
 // include required items for testing & logging
 const assert = require('assert');
+const path = require('path');
 const fs = require('fs');
+const util = require('util');
 const mocha = require('mocha');
-const path = require('path');
 const winston = require('winston');
 const { expect } = require('chai');
 const { use } = require('chai');
 const td = require('testdouble');
-const util = require('util');
 
 const anything = td.matchers.anything();
 

package/test/unit/adapterBaseTestUnit.js

@@ -5,9 +5,9 @@
 
 // include required items for testing & logging
 const assert = require('assert');
+const path = require('path');
 const fs = require('fs-extra');
 const mocha = require('mocha');
-const path = require('path');
 const winston = require('winston');
 const { expect } = require('chai');
 const { use } = require('chai');

package/test/unit/adapterTestUnit.js

@@ -8,12 +8,12 @@
 
 // include required items for testing & logging
 const assert = require('assert');
-const fs = require('fs-extra');
-const mocha = require('mocha');
+const execute = require('child_process').execSync;
 const path = require('path');
 const util = require('util');
+const fs = require('fs-extra');
+const mocha = require('mocha');
 const winston = require('winston');
-const execute = require('child_process').execSync;
 const { expect } = require('chai');
 const { use } = require('chai');
 const td = require('testdouble');

package/utils/adapterInfo.js

@@ -4,8 +4,8 @@
 /* eslint import/no-dynamic-require:warn */
 /* eslint prefer-destructuring:warn */
 
-const fs = require('fs-extra');
 const path = require('path');
+const fs = require('fs-extra');
 
 /**
  * This script will determine the information about the adapter and store

package/utils/addAuth.js

@@ -2,9 +2,9 @@
 /* eslint global-require: warn */
 /* eslint import/no-dynamic-require: warn */
 
-const rls = require('readline-sync');
 const path = require('path');
 const fs = require('fs');
+const rls = require('readline-sync');
 
 function getQuestions(props, obj) {
   const questions = props.map((p) => `${p}: ${(obj[p] !== undefined) ? `(${obj[p]})` : ''} `);

package/utils/artifactize.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 /* @copyright Itential, LLC 2019 */
 
-const fs = require('fs-extra');
 const path = require('path');
+const fs = require('fs-extra');
 
 async function createBundle(adapterOldDir) {
   // set directories

package/utils/checkMigrate.js

@@ -1,7 +1,7 @@
 const { execSync } = require('child_process');
+const fs = require('fs');
 const semver = require('semver');
 const axios = require('axios');
-const fs = require('fs');
 const packageJson = require('../package.json');
 
 const localEngineVer = packageJson.engineVersion;

package/utils/findPath.js

@@ -4,8 +4,8 @@
 /* eslint import/no-dynamic-require:warn */
 /* eslint prefer-destructuring:warn */
 
-const fs = require('fs-extra');
 const path = require('path');
+const fs = require('fs-extra');
 const rls = require('readline-sync');
 
 /**

package/utils/modify.js

@@ -1,7 +1,7 @@
+const { execSync } = require('child_process');
 const fs = require('fs-extra');
 const Ajv = require('ajv');
 const rls = require('readline-sync');
-const { execSync } = require('child_process');
 const { existsSync } = require('fs-extra');
 const { getAdapterConfig } = require('./tbUtils');
 const { name } = require('../package.json');

package/utils/packModificationScript.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 /* @copyright Itential, LLC 2019 */
 
-const fs = require('fs-extra');
-const path = require('path');
 const { spawnSync } = require('child_process');
+const path = require('path');
+const fs = require('fs-extra');
 const { createBundle } = require('./artifactize');
 
 const nodeEntryPath = path.resolve('.');

package/utils/tbUtils.js

@@ -5,9 +5,9 @@
 /* eslint import/no-dynamic-require: warn */
 /* eslint-disable no-console */
 
+const cp = require('child_process');
 const path = require('path');
 const fs = require('fs-extra');
-const cp = require('child_process');
 
 module.exports = {
   SERVICE_CONFIGS_COLLECTION: 'service_configs',

package/utils/testRunner.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 /* @copyright Itential, LLC 2019 */
 
+const execute = require('child_process').exec;
 const fs = require('fs-extra');
 const rl = require('readline-sync');
-const execute = require('child_process').exec;
 
 /**
  * This script will determine the type of integration test to run

package/adapter_modifications/archive/UPD-2022-09-13T20:59:22.909Z/README.md

@@ -1,59 +0,0 @@
-# Update
-
-This update script will update an adapter by appending or updating API calls selected for modification. 
-
-Calls can be selected for change within an adapter by providing a specification document to the Update Tool in the adapter-engine and choosing which calls to modify via the CLI or adapter-wizard (to be implemented in later versions).
-
-Ability to properly delete API calls via this update script will be implemented in the future.
-
-## Usage
-
-Navigate to the directory of the adapter you want to update. If necessary, move an adapter-modifications folder generated by the Update Tool into the adapter directory.
-
-```
-cd adapter_modifications
-
-node update.js {sub-directory name}
-```
-
-The second argument in the above command should be identical to the name of a immediate sub-directory within adapter-modifications. The provided directory should contain the components required to update a certain adapter.
-
-The name of this folder is initialized based on the specification document you provide as input to the Update Tool. If you rename that folder, you will need to reflect that change in the given command argument.
-
-Running this command will update the adapter and run unit and integration tests.  If updated correctly, the adapter should pass all tests.
-
-In order to pass all tests, note that adapter names should be formatted as: 'adapter-name'. Names such as 'adapter-name-test' or similar will cause the tests to error at this point in time. 
-
-## Directory Structure
-
-A sub-directory within adapter-modifications should have the following file structure:
-
-```
-{name of sub-directory}
-  -- components
-    -- adapter.js
-    -- entities
-      -- {entity name}
-        -- schema.json
-        -- action.json
-        -- mockdatafiles
-          -- mockdata.json
-    -- pronghorn.json
-    -- test
-      -- unit
-        -- adapterTestUnit.js
-      -- integration
-        -- adapterTestIntegration.js
-```
-
-Each of these files contains the changes to their adapter equivalents that are enacted when an adapter is updated.
-
-Note that depending on how many calls are being updated, the number of sub-directories within entities/ will vary. Each entity sub-directory will have its own action.json, schema.json, and mockdatafiles/ directory.
-
-## Linting
-
-If this is an adapter built prior to update capabilities being added (9/2020) you may need to add a line to the .eslintignore (adapter_modifications/*) to ignore any lint errors in the update files. These files have lint errors because they are parital js files.
-
-## Testing
-
-Refer to the adapter's README file to perform unit and integration tests post-update. Integration tests can be performed in standalone or integrated mode.

package/adapter_modifications/archive/UPD-2022-09-13T20:59:22.909Z/specificCallScript.js

@@ -1,97 +0,0 @@
-/* @copyright Itential, LLC 2019 */
-
-/* eslint prefer-destructuring:warn */
-/* eslint prefer-template:warn */
-
-// const updateScript = require('update.js');
-const fs = require('fs-extra');
-const path = require('path');
-
-const folder = process.argv[2];
-
-/**
- *
- * This is the file to run in order to add specific calls to your existing adapter.
- * Make sure the zip is in the adapter's top level directory, then navigate there in the terminal and run 'node specficCallScript {folderName}'.
- *
- */
-
-/**
-  *@summary the main function to be run in this file.
-  *@function main
-*/
-
-function main() {
-  const entityPath = path.join(__dirname, '../entities');
-  const entitiesFull = fs.readdirSync(entityPath, 'utf8').filter((entity) => (entity !== '.system' && entity !== '.DS_Store' && entity !== '.generic'));
-  const mockArray = [];
-
-  // loop through existing adapter entities
-  entitiesFull.forEach((e) => {
-    if (fs.existsSync(path.join(__dirname, `../entities/${e}/mockdatafiles`))) {
-      fs.readdirSync(path.join(__dirname, `../entities/${e}/mockdatafiles`)).forEach((file) => {
-        const mockObj = {};
-        mockObj.name = file;
-        mockObj.contents = JSON.parse(fs.readFileSync(path.join(__dirname, `../entities/${e}/mockdatafiles/${file}`), 'utf8'));
-        mockObj.entity = e;
-        mockObj.function = file.slice(0, -13);
-        mockArray.push(mockObj);
-      });
-    }
-    // find and loop through entities of methods being added
-    if (fs.existsSync(path.join(__dirname, `./${folder}/components/entities`))) {
-      const entityAddPath = path.join(__dirname, `./${folder}/components/entities`);
-      const entitiesAdding = fs.readdirSync(entityAddPath, 'utf8').filter((entity) => (entity !== '.system' && entity !== '.DS_Store' && entity !== '.generic'));
-
-      // for each entity in the specific additions, get the appropriate integration test info from generic call for the specific calls
-      let finalAddedIntegrationTest = '';
-      let entityIntegrationTests = '';
-      entitiesAdding.forEach((eSpecific) => {
-        const existingActionFile = JSON.parse(fs.readFileSync(path.join(__dirname, `../entities/${e}/action.json`), 'utf8'));
-        const existingIntegrationFile = fs.readFileSync(path.join(__dirname, '../test/integration/adapterTestIntegration.js'), 'utf8');
-        const testSplit = existingIntegrationFile.split('describe');
-        existingActionFile.actions.forEach((action) => {
-          let replaceTest = '';
-          testSplit.every((test) => {
-            const testSlice = test.slice(0, action.name.length + 3);
-            if (testSlice.includes(action.name)) {
-              replaceTest = test.split('if (stub) {\n');
-              replaceTest = replaceTest[1].split('} else {\n');
-              replaceTest = replaceTest[0];
-              return false;
-            }
-            return true;
-          });
-          if (replaceTest !== '') {
-            const addingIntegrationFile = fs.readFileSync(path.join(__dirname, `${folder}/components/test/integration/adapterTestIntegration.js`), 'utf8');
-            const addingTestSplit = addingIntegrationFile.split('describe');
-            const addingActionFile = JSON.parse(fs.readFileSync(path.join(__dirname, `./${folder}/components/entities/${eSpecific}/action.json`)), 'utf8');
-            addingActionFile.forEach((addingAction) => {
-              let replacedTest = '';
-              addingTestSplit.forEach((addedTest) => {
-                const addingTestSlice = addedTest.slice(0, addingAction.name.length + 3);
-                if (addingTestSlice.includes(addingAction.name) && (action.method === addingAction.method)) {
-                  replacedTest = addedTest.split('if (stub) {\n');
-                  replacedTest = replacedTest[1].split('} else {\n');
-                  replacedTest = replacedTest[0];
-                  let finalTest = addedTest.replace(replacedTest, replaceTest);
-                  finalTest = finalTest.replace('should work if integrated but since no mockdata should error when run standalone', 'should work if integrated or standalone with mockdata');
-                  finalTest = 'describe' + finalTest;
-                  entityIntegrationTests = finalTest;
-                  finalAddedIntegrationTest += entityIntegrationTests;
-                }
-              });
-            });
-          }
-        });
-        // clear out the action.json and schema.json file of the specific call so it does not get added to action.json and schema.json of generic adapter
-        fs.writeFileSync(path.join(__dirname, `./${folder}/components/entities/${eSpecific}/action.json`), '[]');
-        fs.writeFileSync(path.join(__dirname, `./${folder}/components/entities/${eSpecific}/schema.json`), '[]');
-      });
-      finalAddedIntegrationTest = '\n    ' + finalAddedIntegrationTest;
-      fs.writeFileSync(path.join(__dirname, `${folder}/components/test/integration/adapterTestIntegration.js`), finalAddedIntegrationTest);
-    }
-  });
-}
-
-main();