@itentialopensource/adapter-oracle_cloud 0.1.1 → 0.3.0

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');
@@ -21,9 +21,7 @@ async function updateServiceItem() {
   const validate = ajv.compile(propertiesSchema);
   validate(currentProps);
   console.log('Updating Properties...');
-  await database.collection('service_configs').updateOne(
-    { model: name }, { $set: serviceItem }
-  );
+  await database.collection('service_configs').updateOne({ model: name }, { $set: serviceItem });
   console.log('Properties Updated');
 }
 
@@ -35,7 +33,7 @@ async function updateServiceItem() {
 function backup() {
   // zip all files except node_modules and package-lock
   const backupCmd = 'zip -r previousVersion.zip .';
-  execSync(backupCmd, { encoding: 'utf-8' });
+  execSync(backupCmd, { encoding: 'utf-8', maxBuffer: 1024 * 1024 * 2 });
 }
 
 /**
@@ -53,9 +51,9 @@ function archiveMod(modType) {
   const archiveName = `${modType}-${now.toISOString()}`;
   execSync(`mkdir adapter_modifications/archive/${archiveName}`);
   const archiveCmd = 'mv adapter_modifications/archive .'
-  + ` && mv adapter_modifications/* archive/${archiveName}`
-  + ' && mv archive adapter_modifications'
-  + ` && rm ${zipFile}`;
+    + ` && mv adapter_modifications/* archive/${archiveName}`
+    + ' && mv archive adapter_modifications'
+    + ` && rm ${zipFile}`;
   execSync(archiveCmd, { encoding: 'utf-8' });
 }
 
@@ -73,7 +71,7 @@ function revertMod() {
     }
   });
   // // unzip previousVersion, reinstall dependencies and delete zipfile
-  execSync('unzip -o previousVersion.zip && rm -rf node_modules && rm package-lock.json && npm install');
+  execSync('unzip -o previousVersion.zip && rm -rf node_modules && rm package-lock.json && npm install', { maxBuffer: 1024 * 1024 * 2 });
   execSync('rm previousVersion.zip');
   console.log('Changes have been reverted');
 }
@@ -90,12 +88,12 @@ if (flags === '-m') {
   backup();
   console.log('Migrating adapter and running tests...');
   const migrateCmd = 'unzip -o migrationPackage.zip'
-  + ' && cd adapter_modifications'
-  + ' && node migrate';
+    + ' && cd adapter_modifications'
+    + ' && node migrate';
   const migrateOutput = execSync(migrateCmd, { encoding: 'utf-8' });
   console.log(migrateOutput);
   if (migrateOutput.indexOf('Lint exited with code 1') >= 0
-  || migrateOutput.indexOf('Tests exited with code 1') >= 0) {
+    || migrateOutput.indexOf('Tests exited with code 1') >= 0) {
     if (rls.keyInYN('Adapter failed tests or lint after migrating. Would you like to revert the changes?')) {
       console.log('Reverting changes...');
       revertMod();
@@ -125,12 +123,12 @@ if (flags === '-u') {
   // Backup current adapter
   backup();
   const updateCmd = 'unzip -o updatePackage.zip'
-  + ' && cd adapter_modifications'
-  + ' && node update.js updateFiles';
+    + ' && cd adapter_modifications'
+    + ' && node update.js updateFiles';
   execSync(updateCmd, { encoding: 'utf-8' });
   const updateOutput = execSync(updateCmd, { encoding: 'utf-8' });
   if (updateOutput.indexOf('Lint exited with code 1') >= 0
-  || updateOutput.indexOf('Tests exited with code 1') >= 0) {
+    || updateOutput.indexOf('Tests exited with code 1') >= 0) {
     if (rls.keyInYN('Adapter failed tests or lint after updating. Would you like to revert the changes?')) {
       console.log('Reverting changes...');
       revertMod();

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 fs = require('fs-extra');
 const { createBundle } = require('./artifactize');
 
 const nodeEntryPath = path.resolve('.');

package/utils/patches2bundledDeps.js

@@ -0,0 +1,90 @@
+const fs = require('fs');
+const semverSatisfies = require('semver/functions/satisfies');
+const packageJson = require('../package.json');
+
+try {
+  // pattern supplied by semver.org via https://regex101.com/r/vkijKf/1/ but removed gm from end to only match a single semver
+  // const semverPat = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+  // pattern supplied by semver.org via https://regex101.com/r/Ly7O1x/3/ with following changes
+  // removed P's from before capturing group names and
+  // removed  gm from end to only match a single semver
+  // const semverPat = /^(?<major>0|[1-9]\d*)\.(?<minor>0|[1-9]\d*)\.(?<patch>0|[1-9]\d*)(?:-(?<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+
+  const patches = (fs.existsSync('./patches')) ? fs.readdirSync('./patches', { withFileTypes: true }) : [];
+  if (!patches.length) {
+    console.error('\nno patches - nothing to do\n');
+    process.exitCode = 1;
+  }
+
+  const dependencies = packageJson.dependencies || {};
+  if (!Object.keys(dependencies).length) {
+    console.error('\nno dependencies - nothing to do\n');
+    process.exitCode = 1;
+  }
+
+  let changed = false;
+  console.error('\nprocessing patches');
+  const bundledDependencies = packageJson.bundledDependencies || packageJson.bundleDependencies || [];
+
+  patches.forEach((patch) => {
+    if (!patch.isFile()) {
+      console.error(`${patch.name} skipped, is not a regular file`);
+      return;
+    }
+    if (!patch.name.endsWith('.patch')) {
+      console.error(`${patch.name} skipped, does not end with .patch`);
+      return;
+    }
+    const splits = patch.name.slice(0, -6).split('+');
+    if (splits.length > 4) {
+      console.error(`${patch.name} skipped, does not follow the naming convention (cannot use '+' other than to separate scope/package/semver and at most once within semver)`);
+      return;
+    }
+    const scope = splits[0][0] === '@' ? splits.shift() : null;
+    const packageName = splits.shift();
+    const semver = splits.join('+');
+    // const { groups } = semver.match(semverPat);
+    const file = scope ? `${scope}/${packageName}` : packageName;
+    if (dependencies[file] && semverSatisfies(semver, dependencies[file])) {
+      if (!bundledDependencies.includes(file)) {
+        bundledDependencies.push(file);
+        console.error(`added ${file} to bundledDependencies`);
+        changed = true;
+      } else {
+        console.error(`bundledDependencies already has ${file}`);
+      }
+    } else {
+      const depmsg = dependencies[file] ? `version mismatch (${dependencies[file]}) in dependencies` : 'not found in dependencies';
+      console.error(`patch ${patch.name} ${depmsg}`);
+    }
+  });
+
+  if (!packageJson.bundledDependencies && bundledDependencies.length) {
+    delete packageJson.bundleDependencies;
+    packageJson.bundledDependencies = bundledDependencies;
+    console.error('renaming bundleDependencies to bundledDependencies');
+    changed = true;
+  }
+  if (changed) {
+    fs.writeFileSync('./package.json.new', JSON.stringify(packageJson, null, 2));
+    console.error('wrote package.json.new');
+    fs.renameSync('./package.json', './package.json.old');
+    console.error('moved package.json to package.json.old');
+    fs.renameSync('./package.json.new', './package.json');
+    console.error('moved package.json.new to package.json');
+  } else {
+    console.error('no changes\n');
+    process.exitCode = 1;
+  }
+} catch (e) {
+  if (e) {
+    // caught error, exit with status 2 to signify abject failure
+    console.error(`\ncaught exception - ${e}\n`);
+    process.exitCode = 2;
+  } else {
+    // caught false, exit with status 1 to signify nothing done
+    process.exitCode = 1;
+  }
+} finally {
+  console.error('done\n');
+}

package/utils/pre-commit.sh

@@ -17,6 +17,11 @@ 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
+node utils/methodDocumentor.js
+git add CALLS.md report/adapterInfo.json
+
 # security audit on the code
 npm audit --registry=https://registry.npmjs.org --audit-level=moderate
 

package/utils/taskMover.js

@@ -0,0 +1,309 @@
+/* eslint-disable */
+const fs = require('fs');
+
+const blacklistTasks = [
+  'genericAdapterRequest',
+  'genericAdapterRequestNoBasePath',
+  'hasEntities',
+  'healthcheck'
+];
+
+const adapterBaseTasks = [
+    'getDevicesFiltered',
+    'isAlive',
+    'getConfig',
+    'getDevice',
+    'iapUpdateAdapterConfiguration',
+    'iapFindAdapterPath',
+    'iapSuspendAdapter',
+    'iapUnsuspendAdapter',
+    'iapGetAdapterQueue',
+    'iapTroubleshootAdapter',
+    'iapRunAdapterHealthcheck',
+    'iapRunAdapterConnectivity',
+    'iapRunAdapterBasicGet',
+    'iapMoveAdapterEntitiesToDB',
+    'getDevice',
+    'getDevicesFiltered',
+    'isAlive',
+    'getConfig',
+    'iapGetDeviceCount',
+    'iapRunAdapterLint',
+    'iapRunAdapterTests',
+    'iapGetAdapterInventory'
+];
+
+function updatePronghorn(tasks, original, updated) {
+  const originalFile = require(original);
+  const unusedMethods = [];
+  const usedMethods = originalFile.methods.filter((method) => {
+    if (tasks.includes(method.name)) {
+      unusedMethods.push(method);
+      return false;
+    }
+    return true;
+  });
+  //write used and unused to new files
+  let updatedFile;
+  if (!fs.existsSync(updated)) {
+    updatedFile = { ...originalFile, methods: [], src: 'adapter-inactive.js' };
+  } else {
+    updatedFile = require(updated);
+  }
+  updatedFile.methods = updatedFile.methods.concat(unusedMethods);
+  originalFile.methods = usedMethods;
+  fs.writeFileSync(updated, JSON.stringify(updatedFile, null, 2));
+  fs.writeFileSync(original, JSON.stringify(originalFile, null, 2));
+  return 'Done';
+}
+
+function flipTaskFlag(task, pronghornPath, value)
+{
+  const pronghorn = require(pronghornPath);
+  const index = pronghorn.methods.findIndex((method) => method.name === task);
+  pronghorn.methods[index] = { ...pronghorn.methods[index], task: value };
+  fs.writeFileSync(pronghornPath, JSON.stringify(pronghorn, null, 2));
+}
+
+//Return array of relevant paths given adapter directory
+function createPaths(currentAdapter) {
+  const paths = [];
+  const filePaths = [
+    'adapter.js',
+    'pronghorn.json',
+    'test/integration/adapterTestIntegration.js',
+    'test/unit/adapterTestUnit.js',
+    'adapter-inactive.js',
+    'pronghorn-inactive.json',
+  ];
+  filePaths.forEach((file) => {
+    paths.push(`${currentAdapter}/${file}`);
+  });
+  return paths;
+}
+
+function insert(str, index, value) {
+  return str.substr(0, index) + value + str.substr(index);
+}
+
+//modify adapter js
+//original - path to file containing tasks we want to remove
+// updated - path to file we want to move the tasks to
+function updateAdapterJs(tasks, original, updated, adapterDir) {
+  if (!fs.existsSync(original)) {
+    //could do this or just let the error ocurr lower down and catch in warpper
+    throw new Error(`Original file ${original} does not exist.`);
+  }
+  let originalFile = fs.readFileSync(original, 'utf8');
+  let updatedFile;
+  if (!fs.existsSync(updated)) {
+    const adapterExport = require(`${adapterDir}/pronghorn.json`).export;
+    updatedFile = `/* @copyright Itential, LLC 2019 */\n\n/* eslint import/no-dynamic-require: warn */\n/* eslint no-unused-vars: warn */\n/* global log */\n\nconst path = require('path');\n\nconst AdapterBaseCl = require(path.join(__dirname, 'adapterBase.js'));\n\nclass ${adapterExport}Inactive extends AdapterBaseCl {}\n`;
+    //To do handles backup files where og doesn't exist
+  } else {
+    updatedFile = fs.readFileSync(updated, 'utf8');
+  }
+
+  tasks.forEach((method) => {
+    //accounting for different js docs format
+    const comment = originalFile.indexOf(`* @function ${method}`);
+    const start = originalFile.slice(0, comment).lastIndexOf('/**');
+    if (start !== -1) {
+      //next comment block
+      const end = originalFile.indexOf('/**\n', start + 1);
+      let func = end === -1
+        ? originalFile.substring(start - 3, originalFile.lastIndexOf('}'))
+        : originalFile.substring(start, end);
+      originalFile = originalFile.replace(func, '');
+      func = '\n  ' + func.trim() + '\n';
+      updatedFile = insert(updatedFile, updatedFile.lastIndexOf('}'), func);
+    } else {
+      console.log(`Task ${method} wasn't found in original file. Skipping.`);
+    }
+  });
+  fs.writeFileSync(original, originalFile, 'utf8');
+  fs.writeFileSync(updated, updatedFile, 'utf8');
+  return 'done';
+}
+
+//Update test file for when we deactivate a task
+function deactivateTest(adapterPath, testPath, tasks) {
+  let unitTest = fs.readFileSync(`${adapterPath}/${testPath}`, 'utf8');
+  tasks.forEach((task) => {
+    const searchStr = `describe('#${task}`;
+    unitTest = unitTest.replace(searchStr, `describe.skip('#${task}`);
+  });
+  fs.writeFileSync(`${adapterPath}/${testPath}`, unitTest, 'utf8');
+}
+
+//Update test file when we activate tasks
+function activateTest(adapterPath, testPath, tasks) {
+  let unitTest = fs.readFileSync(`${adapterPath}/${testPath}`, 'utf8');
+  //tasks ==> toMove
+  tasks.forEach((task) => {
+    const searchStr = `describe.skip('#${task}`;
+    unitTest = unitTest.replace(searchStr, `describe('#${task}`);
+  });
+  fs.writeFileSync(`${adapterPath}/${testPath}`, unitTest, 'utf8');
+}
+
+//backups are not actually being written back
+function rollbackChanges(adapterPath) {
+  const backups = fs.readdirSync(`${adapterPath}/temp`); //this is an array of file names not the full path
+  const filePaths = createPaths(adapterPath);
+  for (let i = 0; i < backups.length; i++) {
+    const file = fs.readFileSync(`${adapterPath}/temp/${backups[i]}`, 'utf8'); //make sure this is getting the file
+    const currentFile = filePaths.find((path) => {
+      const index = path.split('/').length - 1;
+      const fileName = path.split('/')[index];
+      return fileName === backups[i].replace('temp-', '');
+    }); //returns undefined if no match
+
+    if (currentFile) {
+      fs.writeFileSync(currentFile, file, 'utf8');
+    }
+  }
+  //inactive didn't exist before script
+  if (!backups.includes('temp-adapter-inactive.js')) {
+    fs.unlinkSync(`${adapterPath}/pronghorn-inactive.json`);
+    fs.unlinkSync(`${adapterPath}/adapter-inactive.js`);
+  }
+  deleteBackups(adapterPath);
+}
+
+function deleteBackups(adapterPath) {
+  fs.rmSync(`${adapterPath}/temp`, { recursive: true });
+}
+
+function activateTasks(adapterDir, tasks) {
+  const toDelete = [];
+  const backupFiles = [];
+  const filePaths = createPaths(adapterDir);
+  try {
+    //take backup of each file here
+    if (!fs.existsSync(`${adapterDir}/temp`)) {
+      fs.mkdirSync(`${adapterDir}/temp`);
+    }
+    filePaths.forEach((filePath) => {
+      if (fs.existsSync(filePath)) {
+        const index = filePath.split('/').length - 1;
+        const backupName = `temp-${filePath.split('/')[index]}`;
+        backupFiles.push(`${adapterDir}/temp/${backupName}`);
+        fs.copyFileSync(filePath, `${adapterDir}/temp/${backupName}`);
+      } else {
+        //File doesn't exist before script
+        toDelete.push(filePath);
+      }
+    });
+    tasks = tasks.filter((task) => {
+      if (adapterBaseTasks.includes(task)) {
+        flipTaskFlag(task, `${adapterDir}/pronghorn.json`, true);
+        return false;
+      } else {
+        return true;
+      }
+    });
+    updateAdapterJs(
+      tasks,
+      `${adapterDir}/adapter-inactive.js`,
+      `${adapterDir}/adapter.js`,
+      adapterDir
+    );
+    updatePronghorn(
+      tasks,
+      `${adapterDir}/pronghorn-inactive.json`,
+      `${adapterDir}/pronghorn.json`
+    );
+    activateTest(
+      adapterDir,
+      '/test/integration/adapterTestIntegration.js',
+      tasks
+    );
+    activateTest(adapterDir, '/test/unit/adapterTestUnit.js', tasks);
+    return 'success';
+  } catch (e) {
+    console.log(`Error: ${e} ocurred during execution. Rolling back changes.`);
+    for (let i = 0; i < backupFiles.length; i++) {
+      const file = fs.readFileSync(backupFiles[i], 'utf8');
+      fs.writeFileSync(filePaths[i], file, 'utf8');
+    }
+    toDelete.forEach((filePath) => {
+      if (fs.existsSync(filePath)) {
+        fs.unlinkSync(filePath);
+      }
+    });
+    deleteBackups(adapterDir);
+    process.exit(1);
+  }
+}
+
+//moving from adapter.js to adapter-inactive.js
+function deactivateTasks(adapterDir, tasks) {
+  const toDelete = [];
+  const backupFiles = [];
+  const filePaths = createPaths(adapterDir);
+  try {
+    //take backup of each file here
+    if (!fs.existsSync(`${adapterDir}/temp`)) {
+      fs.mkdirSync(`${adapterDir}/temp`);
+    }
+    filePaths.forEach((filePath) => {
+      if (fs.existsSync(filePath)) {
+        const index = filePath.split('/').length - 1;
+        const backupName = `temp-${filePath.split('/')[index]}`;
+        backupFiles.push(`${adapterDir}/temp/${backupName}`);
+        fs.copyFileSync(filePath, `${adapterDir}/temp/${backupName}`);
+      } else {
+        //File doesn't exist before script
+        toDelete.push(filePath);
+      }
+    });
+    //filter tasks for blacklisted tasks or IAP tasks
+    tasks = tasks.filter((task) => {
+      if (blacklistTasks.includes(task)) {
+        console.log(`${task} cannot be deactivated.`);
+        return false;
+      } else if (adapterBaseTasks.includes(task)) {
+        flipTaskFlag(task, `${adapterDir}/pronghorn.json`, false);
+        return false;
+      } else {
+        return true;
+      }
+    });
+    updateAdapterJs(
+      tasks,
+      `${adapterDir}/adapter.js`,
+      `${adapterDir}/adapter-inactive.js`,
+      adapterDir
+    );
+    updatePronghorn(
+      tasks,
+      `${adapterDir}/pronghorn.json`,
+      `${adapterDir}/pronghorn-inactive.json`
+    );
+    deactivateTest(
+      adapterDir,
+      '/test/integration/adapterTestIntegration.js',
+      tasks
+    );
+    deactivateTest(adapterDir, '/test/unit/adapterTestUnit.js', tasks);
+    return 'success';
+  } catch (e) {
+    console.log(`Error: ${e} ocurred during execution. Rolling back changes.`);
+    for (let i = 0; i < backupFiles.length; i++) {
+      const file = fs.readFileSync(backupFiles[i], 'utf8');
+      fs.writeFileSync(filePaths[i], file, 'utf8');
+    }
+    toDelete.forEach((filePath) => {
+      if (fs.existsSync(filePath)) {
+        fs.unlinkSync(filePath);
+      }
+    });
+    deleteBackups(adapterDir);
+    process.exit(1);
+  }
+}
+
+module.exports = {
+  activateTasks, deactivateTasks, rollbackChanges, deleteBackups
+};