Merge pull request #86 from codefresh-io/CR-10126-sec

yaroslav-codefresh · web-flow · commit 5aec75cc41ae · 2022-03-22T13:23:45.000+02:00
CR-10126-sec
diff --git a/__tests__/Config.spec.js b/__tests__/Config.spec.js
@@ -8,7 +8,7 @@ const { Http } = require('../helpers/http');
 const { ConfigManager, contexts } = require('../lib/auth');
 const defaults = require('../lib/defaults');
 
-jest.mock('swagger-client', () => jest.fn(options => options));
+jest.mock('swagger-client', () => jest.fn((options) => options));
 
 jest.mock('../helpers/http', () => {
     let response = { test: 'test' };
diff --git a/__tests__/ConfigManager.spec.js b/__tests__/ConfigManager.spec.js
@@ -32,7 +32,7 @@ jest.mock('fs', () => {
 
 jest.mock('fs-extra', () => ({ mkdirp: jest.fn() }));
 
-jest.mock('bluebird', () => ({ promisify: func => func }));
+jest.mock('bluebird', () => ({ promisify: (func) => func }));
 
 jest.spyOn(manager, 'clearConfig');
 jest.spyOn(manager, '_getConfigFilePath');
@@ -41,7 +41,6 @@ jest.spyOn(manager, '_loadConfig');
 jest.spyOn(manager, 'addContext');
 jest.spyOn(manager, 'isConfigLoaded');
 
-
 const CONTEXTS = {
     contexts: {
         jwt: { type: JWTContext.TYPE, name: 'jwt' },
@@ -50,15 +49,14 @@ const CONTEXTS = {
     'current-context': 'jwt',
 };
 
-
 describe('ConfigManager', () => {
     beforeEach(() => {
         const testData = { test: 'test' };
         fs._readFile = jest.fn(() => testData);
         fs._writeFile = jest.fn();
         fse.mkdirp.mockClear();
-        yaml.safeDump = jest.fn(data => data);
-        yaml.safeLoad = jest.fn(data => data);
+        yaml.safeDump = jest.fn((data) => data);
+        yaml.safeLoad = jest.fn((data) => data);
     });
 
     describe('#_loadConfig', () => {
@@ -275,7 +273,7 @@ describe('ConfigManager', () => {
         });
 
         it('should do a fallback in case there was a failure during user validation', async () => {
-            jest.resetModuleRegistry();
+            jest.resetModules();
             const token = 'token';
             const url = 'url';
 
diff --git a/__tests__/Sdk.spec.js b/__tests__/Sdk.spec.js
@@ -1,8 +1,7 @@
 const _ = require('lodash');
 const { Codefresh, Config } = require('../index');
-const Clusters = require('../lib/logic/clusters.logic.js');
-const Workflows = require('../lib/logic/workflows.logic.js');
-
+const Clusters = require('../lib/logic/clusters.logic');
+const Workflows = require('../lib/logic/workflows.logic');
 
 jest.mock('fs', () => ({
     readdirSync: () => [
@@ -18,7 +17,6 @@ jest.mock('fs-extra', () => ({ mkdirp: () => ({}) }));
 jest.mock('../lib/logic/clusters.logic.js');
 jest.mock('../lib/logic/workflows.logic.js');
 
-
 const swaggerApis = {
     clusters: { clusters_list: () => 'clusters_list' },
     workflows: { workflows_list: () => 'workflows_list' },
@@ -41,7 +39,6 @@ const spec = {
     },
 };
 
-
 describe('Sdk', () => {
     describe('loading', () => {
         it('should load Sdk from logic and api spec', async () => {
diff --git a/__tests__/helpers.spec.js b/__tests__/helpers.spec.js
@@ -4,7 +4,7 @@ const defaults = require('../lib/defaults');
 const { postProcessApi, _resolveArgs, _wrapHandler } = require('../helpers/api');
 const { handleErrors } = require('../helpers/error');
 const { Http } = require('../helpers/http');
-const { version } = require('../package');
+const { version } = require('../package.json');
 
 jest.mock('../helpers/error', () => ({ handleErrors: jest.fn() }));
 
@@ -50,7 +50,6 @@ const swaggerApis = {
     },
 };
 
-
 describe('helpers', () => {
     describe('api', () => {
         describe('postProcessApi', () => {
@@ -147,7 +146,7 @@ describe('helpers', () => {
 
     describe('http', () => {
         beforeEach(() => {
-            JSON.parse = jest.fn(res => res);
+            JSON.parse = jest.fn((res) => res);
         });
 
         it('should use defaults when request options are not provided', () => {
diff --git a/__tests__/logs.helper.unit.spec.js b/__tests__/logs.helper.unit.spec.js
@@ -5,10 +5,6 @@ const mockedClose = jest.fn();
 const mockedSubscribe = jest.fn();
 jest.mock('@codefresh-io/cf-receiver', () => ({
     CfReceiverService: class CfReceiverService {
-        constructor() {
-            return null;
-        }
-
         watch() {
             return this;
         }
@@ -23,7 +19,6 @@ jest.mock('@codefresh-io/cf-receiver', () => ({
     },
 }));
 
-
 describe('logs helpers', () => {
     beforeEach(() => {
         mockedClose.mockClear();
@@ -33,7 +28,7 @@ describe('logs helpers', () => {
     it('should close ws connection with flag -f and with failure result', async () => {
         const sdk = _.set({}, 'config.context', { url: String(), token: String() });
         mockedSubscribe.mockReturnValue(null);
-        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, true, sdk).catch(err => err);
+        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, true, sdk).catch((err) => err);
         expect(mockedClose.mock.calls.length).toEqual(1);
         expect(_.isError(result)).toEqual(true);
     });
@@ -42,7 +37,7 @@ describe('logs helpers', () => {
         const validMsg = { type: 'message', event: { data: JSON.stringify({ msgID: 'getStatus', payload: null }) } };
         const sdk = _.set({}, 'config.context', { url: String(), token: String() });
         mockedSubscribe.mockReturnValue(validMsg);
-        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, true, sdk).catch(err => err);
+        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, true, sdk).catch((err) => err);
         expect(mockedClose.mock.calls.length).toEqual(1);
         expect(_.isError(result)).toEqual(false);
     });
@@ -51,15 +46,15 @@ describe('logs helpers', () => {
         const validMsg = { type: 'message', event: { data: JSON.stringify({ slot: 'status', payload: 'success' }) } };
         const sdk = _.set({}, 'config.context', { url: String(), token: String() });
         mockedSubscribe.mockReturnValue(validMsg);
-        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, true, sdk).catch(err => err);
+        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, true, sdk).catch((err) => err);
         expect(mockedClose.mock.calls.length).toEqual(1);
         expect(_.isError(result)).toEqual(false);
     });
 
     it('should close ws connection without flag -f and with failure result', async () => {
         const sdk = _.set({}, 'config.context', { url: String(), token: String() });
         mockedSubscribe.mockReturnValue(null);
-        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, false, sdk).catch(err => err);
+        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, false, sdk).catch((err) => err);
         expect(mockedClose.mock.calls.length).toEqual(1);
         expect(_.isError(result)).toEqual(true);
     });
@@ -68,7 +63,7 @@ describe('logs helpers', () => {
         const validMsg = { type: 'message', event: { data: JSON.stringify({ slot: 'keepAlive' }) } };
         const sdk = _.set({}, 'config.context', { url: String(), token: String() });
         mockedSubscribe.mockReturnValue(validMsg);
-        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, false, sdk).catch(err => err);
+        const result = await logsHelper.showWorkflowLogsByWebsocket(null, null, false, sdk).catch((err) => err);
         expect(mockedClose.mock.calls.length).toEqual(1);
         expect(_.isError(result)).toEqual(false);
     });
diff --git a/__tests__/test.unit.spec.js b/__tests__/test.unit.spec.js
diff --git a/__tests__/whoami.spec.js b/__tests__/whoami.spec.js
@@ -36,7 +36,6 @@ jest.mock('../helpers/http', () => {
     return { Http: HttpConstructor };
 });
 
-
 describe('whoami', () => {
     beforeEach(() => {
         Http.__reset();
diff --git a/codefresh.yml b/codefresh.yml
@@ -15,21 +15,21 @@ steps:
   install_dependencies:
     title: 'Installing testing dependencies'
     stage: CI
-    image: codefresh/node-tester-image:10.13.0
+    image: codefresh/node-tester-image:10.15.3
     commands:
         - yarn install --frozen-lockfile
 
   eslint:
     title: 'Running linting logic'
     stage: CI
-    image: codefresh/node-tester-image:10.13.0
+    image: codefresh/node-tester-image:10.15.3
     commands:
         - yarn eslint
 
   unit-tests:
     stage: CI
     title: 'Running unit tests'
-    image: codefresh/node-tester-image:10.13.0
+    image: codefresh/node-tester-image:10.15.3
     commands:
         - yarn test
 
diff --git a/helpers/http.js b/helpers/http.js
@@ -4,7 +4,7 @@ const debug = require('debug')('codefresh:sdk:http');
 const defaults = require('../lib/defaults');
 const { version } = require('../package.json');
 
-const { handleErrors } = require('../helpers/error');
+const { handleErrors } = require('./error');
 
 const RETRY_STATUS_CODES = [502, 503, 504];
 const RETRY_STRATEGY = (err, response) => {
diff --git a/helpers/jwt.js b/helpers/jwt.js
@@ -1,7 +1,6 @@
 const debug = require('debug')('codefresh:sdk:jwt');
 const jwt = require('jsonwebtoken');
 
-
 const testJwt = (token) => {
     let isJwt = false;
     try {
diff --git a/helpers/whoami.js b/helpers/whoami.js
@@ -38,7 +38,7 @@ const getCurrentAccount = async (context) => {
 
     const accounts = _.get(user, 'account', {});
     const accountInfo = _.chain(accounts)
-        .filter(account => account.name === user.activeAccountName)
+        .filter((account) => account.name === user.activeAccountName)
         .get('[0]', {})
         .pick('name', 'runtimeEnvironment')
         .value();
diff --git a/lib/Client.js b/lib/Client.js
@@ -28,7 +28,6 @@ class Client {
             throw new CFError(message);
         }
 
-
         this.api = postProcessApi(swagger, specJson);
         _.merge(this.sdk, this.api);
     }
diff --git a/lib/auth/contexts/Context.js b/lib/auth/contexts/Context.js
@@ -88,5 +88,4 @@ class Context {
     }
 }
 
-
 module.exports = Context;
diff --git a/lib/auth/contexts/JWTContext.js b/lib/auth/contexts/JWTContext.js
@@ -40,7 +40,7 @@ class JWTContext extends Context {
         try {
             const user = await getUser(this);
             this.userName = user.userName;
-            const account = _.find(user.account, acc => acc._id === this.accountId);
+            const account = _.find(user.account, (acc) => acc._id === this.accountId);
             this.accountName = _.get(account, 'name');
             this._reCalculateName();
             return user;
diff --git a/lib/logic/Resource.base.js b/lib/logic/Resource.base.js
@@ -8,7 +8,7 @@ class ResourceBase {
     getApis() {
         const proto = Object.getPrototypeOf(this);
         return Object.getOwnPropertyNames(proto)
-            .filter(p => p !== 'constructor')
+            .filter((p) => p !== 'constructor')
             .reduce((acc, prop) => {
                 const method = this[prop];
                 if (_.isFunction(method)) {
@@ -21,8 +21,8 @@ class ResourceBase {
     toString() {
         const proto = Object.getPrototypeOf(this);
         const props = Object.getOwnPropertyNames(proto)
-            .filter(p => p !== 'constructor')
-            .map(p => `${p}()`);
+            .filter((p) => p !== 'constructor')
+            .map((p) => `${p}()`);
         return `${proto.constructor.name}: [ ${props.join(', ')} ]`;
     }
 }
diff --git a/lib/logic/Spwan.helper.js b/lib/logic/Spwan.helper.js
@@ -12,7 +12,6 @@ const compareVersions = require('compare-versions');
 
 const CODEFRESH_PATH = resolve(homedir(), '.Codefresh');
 
-
 const prepareSpwan = async ({ name, repoName, pathName, branch = 'master', excludeVersionPrefix = false, events }) => {
     const dirPath = join(CODEFRESH_PATH, name);
     const versionPath = join(CODEFRESH_PATH, name, 'version.txt');
diff --git a/lib/logic/agents.logic.js b/lib/logic/agents.logic.js
@@ -2,7 +2,6 @@ const { spawn } = require('child_process');
 const Resource = require('./Resource.base');
 const prepareSpwan = require('./Spwan.helper');
 
-
 const _installVenonaScript = async (info, filePath) => {
     const {
         apiHost, // --api-host
@@ -101,7 +100,6 @@ const _unInstallVenonaScript = async (info, filePath) => {
         kubeNamespace,
     ];
 
-
     if (kubeConfigPath) {
         commands.push(`--kube-config-path=${kubeConfigPath}`);
     }
diff --git a/lib/logic/clusters.logic.js b/lib/logic/clusters.logic.js
@@ -2,7 +2,6 @@ const { spawn } = require('child_process');
 const Resource = require('./Resource.base');
 const prepareSpwan = require('./Spwan.helper');
 
-
 const _createClusterScript = async (info, filePath) => {
     const {
         contextName,
diff --git a/lib/logic/index.js b/lib/logic/index.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 
 const LOGIC = fs.readdirSync(__dirname)
-    .filter(file => file.endsWith('.logic.js'))
+    .filter((file) => file.endsWith('.logic.js'))
     .reduce((acc, file) => {
         const name = file.replace('.logic.js', '');
         acc[name] = require(`./${file}`); // eslint-disable-line
diff --git a/lib/logic/logs.helper.js b/lib/logic/logs.helper.js
@@ -7,7 +7,7 @@ const Firebase = require('firebase');
 const rp = require('request-promise');
 const { CfReceiverService } = require('@codefresh-io/cf-receiver');
 
-const _connectToFirebase = async firebaseAuth => new Promise((resolve, reject) => {
+const _connectToFirebase = async (firebaseAuth) => new Promise((resolve, reject) => {
     const jobIdRef = new Firebase(firebaseAuth.url);
     jobIdRef.authWithCustomToken(firebaseAuth.accessToken, (err) => {
         if (err) {
@@ -136,13 +136,13 @@ const showWorkflowLogsFromGCS = async (progressJob, removeTimestamps) => {
 function _prepareWsStepsLogsForPrint(steps) {
     const result = {};
     // sorting logs by time
-    Object.keys(steps).forEach(name => Object.assign(steps[name], { name, logs: _.sortBy(steps[name].logs, 'time') }));
+    Object.keys(steps).forEach((name) => Object.assign(steps[name], { name, logs: _.sortBy(steps[name].logs, 'time') }));
     // sorting steps by time
-    _.sortBy(Object.values(steps), step => _.get(step, 'logs[0].time'))
+    _.sortBy(Object.values(steps), (step) => _.get(step, 'logs[0].time'))
         .forEach((step) => {
             const logs = {};
             // changing logs to 'common' cf format
-            step.logs.forEach(log => Object.assign(logs, { [uniqId()]: log.payload }));
+            step.logs.forEach((log) => Object.assign(logs, { [uniqId()]: log.payload }));
             Object.assign(step, { logs });
             Object.assign(result, { [step.name]: step });
         });
@@ -203,7 +203,7 @@ function _printCurrentWsLogs(receiver) {
 
 function _printMessageQueue(messageQueue) {
     const result = { steps: {} };
-    messageQueue.forEach(msg => _setMessageToResult(result, msg));
+    messageQueue.forEach((msg) => _setMessageToResult(result, msg));
     _printLogsFromJson(_prepareWsStepsLogsForPrint(result.steps));
     // return printed steps, for avoid duplication step beginning logs
     return Object.keys(result.steps);
diff --git a/lib/logic/runtime.logic.js b/lib/logic/runtime.logic.js
@@ -2,7 +2,6 @@ const { spawn } = require('child_process');
 const Resource = require('./Resource.base');
 const prepareSpwan = require('./Spwan.helper');
 
-
 const _installRuntimeScript = async (info, filePath) => {
     const {
         apiHost, // --api-host
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
