CM-40774, CM-40773, CM-40772 - Code refactoring (#104)

Author: MarshalX

.eslintignore

@@ -2,3 +2,4 @@
 node_modules
 # don't lint build output
 dist
+out

.eslintrc.js

@@ -40,6 +40,7 @@ module.exports = {
         'format': ['camelCase', 'UPPER_CASE', 'PascalCase'],
       },
     ],
+    '@typescript-eslint/restrict-plus-operands': 'error',
     // FIXME(MarshalX): refactor code and enable these rules:
     'no-unused-vars': 0,
     'camelcase': 0,
@@ -49,7 +50,6 @@ module.exports = {
     '@typescript-eslint/no-unsafe-return': 0,
     '@typescript-eslint/no-unsafe-argument': 0,
     '@typescript-eslint/no-explicit-any': 0,
-    '@typescript-eslint/restrict-plus-operands': 0,
     '@typescript-eslint/restrict-template-expressions': 0,
     '@typescript-eslint/no-unsafe-call': 0,
   },

.github/workflows/lint_test_build.yml renamed to .github/workflows/lint_build.yml

@@ -1,4 +1,4 @@
-name: Lint, test and build
+name: Lint and build
 
 on: [ push ]
 
@@ -33,21 +33,15 @@ jobs:
       - name: Code Linting
         run: npm run lint
 
-      - name: Run tests
-        run: |
-          sudo apt-get install xvfb
-          export DISPLAY=:99.0
-          Xvfb -ac :99 -screen 0 1920x1080x16 &
-          npm run test
-
       - name: Build extension
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
         run: |
           npm install -g @vscode/vsce
           vsce package
           mv *.vsix cycode-extension.vsix
-      - name: Upload extension package
+
+      - name: Upload extension package to artifacts
         uses: actions/upload-artifact@v3
         with:
           name: cycode-extension.vsix

LICENSE.MD

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Cycode Ltd.
+Copyright (c) 2024 Cycode Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -220,13 +220,13 @@
           "type": "webview",
           "id": "cycode.view.main",
           "name": "scan",
-          "when": "cycode:auth.isAuthed && (!cycode:scan.hasDetections || !cycode:treeView.isShowed)"
+          "when": "cycode:auth.isAuthed && (!cycode:scan.hasAnyDetections || !cycode:treeView.isShowed)"
         },
         {
           "type": "tree",
           "id": "cycode.view.tree",
           "name": "Scan Results",
-          "when": "cycode:scan.hasDetections && cycode:treeView.isShowed"
+          "when": "cycode:scan.hasAnyDetections && cycode:treeView.isShowed"
         }
       ]
     },
@@ -241,15 +241,11 @@
     }
   },
   "scripts": {
-    "vscode:prepublish": "yarn run package",
-    "compile": "webpack",
+    "lint": "eslint src --ext ts",
     "watch": "webpack --watch",
+    "compile": "webpack",
     "package": "webpack --mode production",
-    "compile-tests": "tsc -p . --outDir out",
-    "watch-tests": "tsc -p . -w --outDir out",
-    "pretest": "yarn run compile-tests && yarn run compile && yarn run lint",
-    "lint": "eslint src --ext ts",
-    "test": "node ./out/test/runTest.js"
+    "vscode:prepublish": "yarn run package"
   },
   "devDependencies": {
     "@sentry/webpack-plugin": "^2.21.1",
@@ -276,8 +272,10 @@
   "dependencies": {
     "@sentry/node": "^8.20.0",
     "decompress": "^4.2.1",
+    "reflect-metadata": "^0.2.2",
     "semver": "7.5.4",
     "shelljs": "0.8.5",
-    "showdown": "^2.1.0"
+    "showdown": "^2.1.0",
+    "tsyringe": "^4.8.0"
   }
 }

src/cli-wrapper/runner.ts

@@ -1,7 +1,9 @@
 import {spawn} from 'child_process';
 import * as os from 'os';
-import {extensionOutput} from '../logging/extension-output';
 import {CommandResult, RunCliArgs, RunCliResult} from './types';
+import {container} from 'tsyringe';
+import {ILoggerService} from '../services/logger-service';
+import {LoggerServiceSymbol} from '../symbols';
 
 const parseResult = (out: string): object => {
   let result = {};
@@ -17,6 +19,7 @@ const parseResult = (out: string): object => {
 };
 
 export const getRunnableCliCommand = (args: RunCliArgs): RunCliResult => {
+  const logger = container.resolve<ILoggerService>(LoggerServiceSymbol);
   const {
     cliPath,
     cliEnv,
@@ -25,7 +28,7 @@ export const getRunnableCliCommand = (args: RunCliArgs): RunCliResult => {
     printToOutput,
   } = args;
 
-  extensionOutput.info(
+  logger.debug(
       `Running command: "${cliPath} ${commandParams.join(' ')}"`
   );
 
@@ -39,7 +42,7 @@ export const getRunnableCliCommand = (args: RunCliArgs): RunCliResult => {
   });
 
   const getCancelPromise = () => new Promise<void>((resolve) => {
-    extensionOutput.info(
+    logger.debug(
         `Killing child process: "${cliPath} ${commandParams.join(' ')}"`
     );
 
@@ -58,7 +61,7 @@ export const getRunnableCliCommand = (args: RunCliArgs): RunCliResult => {
       }
       stderr += data.toString();
       if (printToOutput) {
-        extensionOutput.debug(data.toString());
+        logger.debug(data.toString());
       }
     };
 
@@ -67,13 +70,13 @@ export const getRunnableCliCommand = (args: RunCliArgs): RunCliResult => {
 
     childProcess.on('exit', (code: number) => {
       // exit occurs earlier than close
-      extensionOutput.debug(`Command exited with code: ${code}`);
+      logger.debug(`Command exited with code: ${code}`);
       exitCode = code;
     });
 
     childProcess.on('close', (code: number) => {
       // we receive all "data" events before close
-      extensionOutput.debug(`Streams of a command have been closed with code: ${code}`);
+      logger.debug(`Streams of a command have been closed with code: ${code}`);
       resolve({
         exitCode: exitCode,
         stderr: stderr,
@@ -92,7 +95,7 @@ export const getRunnableCliCommand = (args: RunCliArgs): RunCliResult => {
 
     childProcess.stdout?.on('data', (data) => {
       if (printToOutput) {
-        extensionOutput.info(`Command stdout: ${data.toString()}`);
+        logger.debug(`Command stdout: ${data.toString()}`);
       }
 
       if (!data) {

src/commands/auth-command.ts

@@ -0,0 +1,17 @@
+import * as vscode from 'vscode';
+import {config, validateConfig} from '../utils/config';
+import {auth} from '../services/auth';
+
+export default () => {
+  if (validateConfig()) {
+    return;
+  }
+
+  const params = {
+    config,
+    workspaceFolderPath:
+            vscode.workspace.workspaceFolders?.[0]?.uri.fsPath || '',
+  };
+
+  auth(params);
+};

src/commands/iac-scan-command.ts

@@ -0,0 +1,36 @@
+import * as vscode from 'vscode';
+import TrayNotifications from '../utils/tray-notifications';
+import {config, validateConfig} from '../utils/config';
+import {iacScan} from '../services/scanners/iac-scanner';
+import {container} from 'tsyringe';
+import {IExtensionService} from '../services/extension-service';
+import {ExtensionServiceSymbol} from '../symbols';
+
+export default () => {
+  // scan the current open document if opened
+
+  if (!vscode.window.activeTextEditor?.document ||
+          vscode.window?.activeTextEditor?.document?.uri.scheme === 'output'
+  ) {
+    TrayNotifications.showMustBeFocusedOnFile();
+
+    return;
+  }
+
+  if (validateConfig()) {
+    return;
+  }
+
+  const extension = container.resolve<IExtensionService>(ExtensionServiceSymbol);
+
+  iacScan(
+      {
+        config,
+        pathToScan: vscode.window.activeTextEditor.document.fileName,
+        workspaceFolderPath: vscode.workspace.workspaceFolders?.[0]?.uri.fsPath,
+        diagnosticCollection: extension.diagnosticCollection,
+        onDemand: true,
+      },
+      extension.treeView,
+  );
+};

src/commands/iac-scan-for-current-project-command.ts

@@ -0,0 +1,30 @@
+import * as vscode from 'vscode';
+import {config, validateConfig} from '../utils/config';
+import {iacScan} from '../services/scanners/iac-scanner';
+import {container} from 'tsyringe';
+import {IExtensionService} from '../services/extension-service';
+import {ExtensionServiceSymbol} from '../symbols';
+
+export default () => {
+  if (validateConfig()) {
+    return;
+  }
+
+  const projectPath = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath;
+  if (!projectPath) {
+    return;
+  }
+
+  const extension = container.resolve<IExtensionService>(ExtensionServiceSymbol);
+
+  iacScan(
+      {
+        config,
+        pathToScan: projectPath,
+        workspaceFolderPath: projectPath,
+        diagnosticCollection: extension.diagnosticCollection,
+        onDemand: true,
+      },
+      extension.treeView,
+  );
+};

src/commands/ignore-command.ts

@@ -0,0 +1,24 @@
+import * as vscode from 'vscode';
+import {IgnoreCommandConfig} from '../types/commands';
+import {config, validateConfig} from '../utils/config';
+import {ignore} from '../services/ignore';
+import {container} from 'tsyringe';
+import {IExtensionService} from '../services/extension-service';
+import {ExtensionServiceSymbol} from '../symbols';
+
+export default async (ignoreConfig: IgnoreCommandConfig) => {
+  if (validateConfig()) {
+    return;
+  }
+
+  const extension = container.resolve<IExtensionService>(ExtensionServiceSymbol);
+
+  await ignore({
+    config,
+    workspaceFolderPath: vscode.workspace.workspaceFolders?.[0]?.uri.fsPath,
+    ignoreConfig,
+    diagnosticCollection: extension.diagnosticCollection,
+    treeView: extension.treeView,
+  });
+};
+