@itentialopensource/adapter-gcp_compute 1.3.1 → 1.3.3

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## 1.3.3 [08-01-2023]
+
+* Remove any sensitive data logging
+
+See merge request itentialopensource/adapters/cloud/adapter-gcp_compute!8
+
+---
+
+## 1.3.2 [06-22-2023]
+
+* Remove any sensitive data logging
+
+See merge request itentialopensource/adapters/cloud/adapter-gcp_compute!8
+
+---
+
 ## 1.3.1 [05-09-2023]
 
 * updated adapterBase.js with broker integration bug fixes

package/adapter.js

@@ -923,14 +923,11 @@ class GcpCompute extends AdapterBaseCl {
     log.trace(origin);
     try {
       // const keyFile = this.getNested(this, 'allProps', 'authentication', 'configureGtoken', 'keyFile') || process.env.GOOGLE_APPLICATION_CREDENTIALS;
-      // log.debug(`readPropsKeyFile keyFile is ${keyFile}`)
       if (!keyFile) {
         throw new Error('No keyFile specified in Service Config or GOOGLE_APPLICATION_CREDENTIALS');
       } else {
         const content = readFileSync(keyFile, 'utf8');
-        // log.debug(`readPropsKeyFile content length is ${content.length}`);
         const keyObj = JSON.parse(content);
-        // log.debug(`readPropsKeyFile keyObj is ${JSON.stringify(keyObj)}`);
         return keyObj;
       }
     } catch (ex) {
@@ -955,7 +952,6 @@ class GcpCompute extends AdapterBaseCl {
         delete configureGtoken.keyFile;
       }
       if (configureGtoken.key || configureGtoken.keyFile) {
-        // log.debug(`${meth} configureGtoken is ${JSON.stringify(configureGtoken)}`);
         if (this.allProps.stub) {
           this.gtoken = this;
         } else {
@@ -1004,7 +1000,6 @@ class GcpCompute extends AdapterBaseCl {
   refreshAuthorizationHeader(token) {
     const ret = `${token.token_type} ${token.access_token}`;
     this.allProps.request.global_request.addlHeaders.Authorization = ret;
-    // log.debug(`refreshAuthorizationHeader ${JSON.stringify(this.allProps.request.global_request.addlHeaders)}`); // this will LEAK the token!
     return ret;
   }
 
@@ -1167,7 +1162,7 @@ class GcpCompute extends AdapterBaseCl {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
       return this.refreshAuthorizationAndIdentifyRequest('Projects', 'getProject', reqObj, true, (irReturnData, irReturnError) => {
-        // if we received an error or their is no response on the results
+        // if we received an error or there is no response on the results
         // return an error
         if (irReturnError) {
           /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */

package/adapterBase.js

@@ -11,11 +11,11 @@
 /* eslint prefer-destructuring: warn */
 
 /* Required libraries.  */
-const fs = require('fs-extra');
 const path = require('path');
-const jsonQuery = require('json-query');
-const EventEmitterCl = require('events').EventEmitter;
 const { execSync } = require('child_process');
+const EventEmitterCl = require('events').EventEmitter;
+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-gcp_compute",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "This adapter integrates with system described as: computeEngineApi.",
   "main": "adapter.js",
   "systemName": "Google Cloud Compute",

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

@@ -9,13 +9,13 @@
 // include required items for testing & logging
 const assert = require('assert');
 const fs = require('fs');
-const mocha = require('mocha');
 const path = require('path');
+const util = require('util');
+const mocha = require('mocha');
 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 path = require('path');
 const util = require('util');
-const winston = require('winston');
 const execute = require('child_process').execSync;
+const fs = require('fs-extra');
+const mocha = require('mocha');
+const winston = require('winston');
 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 fs = require('fs-extra');
 const { createBundle } = require('./artifactize');
 
 const nodeEntryPath = path.resolve('.');

package/utils/tbUtils.js

@@ -6,8 +6,8 @@
 /* eslint-disable no-console */
 
 const path = require('path');
-const fs = require('fs-extra');
 const cp = require('child_process');
+const fs = require('fs-extra');
 
 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