fix: tests

src/snyk/cli/cliExecutable.ts

@@ -1,8 +1,8 @@
-import os from 'os';
 import path from 'path';
 import fs from 'fs/promises';
 import { CliSupportedPlatform } from './supportedPlatforms';
 import { Checksum } from './checksum';
+import { Platform } from '../common/platform';
 
 export class CliExecutable {
   public static filenameSuffixes: Record<CliSupportedPlatform, string> = {
@@ -30,8 +30,8 @@ export class CliExecutable {
 
   static async getCurrentWithArch(): Promise<CliSupportedPlatform> {
     let platform = '';
-    const osName = os.platform().toString().toLowerCase();
-    const archName = os.arch().toLowerCase();
+    const osName = Platform.getCurrent().toString().toLowerCase();
+    const archName = Platform.getArch().toLowerCase();
     if (osName === 'linux') {
       if (await this.isAlpine()) {
         platform = 'linux_alpine';

src/snyk/common/configuration/configuration.ts

@@ -32,7 +32,7 @@ import {
 import SecretStorageAdapter from '../vscode/secretStorage';
 import { IVSCodeWorkspace } from '../vscode/workspace';
 import { CliExecutable } from '../../cli/cliExecutable';
-import SnykExtension from '../../extension';
+import { extensionContext } from '../vscode/extensionContext';
 
 const NEWISSUES = 'Net new issues';
 
@@ -321,7 +321,6 @@ export class Configuration implements IConfiguration {
   }
 
   async setCliPath(cliPath: string | undefined): Promise<void> {
-    const extensionContext = SnykExtension.getExtensionContext();
     if (!cliPath && extensionContext) {
       cliPath = await CliExecutable.getPath(extensionContext.extensionPath);
     }
@@ -531,9 +530,8 @@ export class Configuration implements IConfiguration {
       CONFIGURATION_IDENTIFIER,
       this.getConfigName(ADVANCED_CLI_PATH),
     );
-    const extensionContext = SnykExtension.getExtensionContext();
     if (!cliPath && extensionContext) {
-      cliPath = await CliExecutable.getPath(SnykExtension.getExtensionContext().extensionPath);
+      cliPath = await CliExecutable.getPath(extensionContext.extensionPath);
       await this.setCliPath(cliPath);
     }
     return cliPath;

src/snyk/common/download/downloader.ts

@@ -40,6 +40,9 @@ export class Downloader {
       this.extensionContext.extensionPath,
       await this.configuration.getCliPath(),
     );
+    if (await this.binaryExists(cliPath)) {
+      await this.deleteFileAtPath(cliPath);
+    }
     const lsVersion = await this.cliApi.getLatestCliVersion(this.configuration.getCliReleaseChannel());
     const sha256 = await this.cliApi.getSha256Checksum(lsVersion, platform);
     const checksum = await this.downloadCli(cliPath, platform, sha256);
@@ -56,6 +59,15 @@ export class Downloader {
     return new CliExecutable(lsVersion, checksum);
   }
 
+  private async binaryExists(filePath: string): Promise<boolean> {
+    try {
+      await fsPromises.access(filePath);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
   private async deleteFileAtPath(filePath: string): Promise<void> {
     try {
       await fsPromises.unlink(filePath);

src/snyk/common/platform.ts

@@ -5,6 +5,10 @@ export class Platform {
     return os.platform();
   }
 
+  static getArch(): string {
+    return os.arch();
+  }
+
   static getVersion(): string {
     return `${os.release()}-${os.arch}`;
   }

src/snyk/extension.ts

@@ -100,10 +100,6 @@ class SnykExtension extends SnykLib implements IExtension {
     }
   }
 
-  public static getExtensionContext(): ExtensionContext {
-    return extensionContext;
-  }
-
   private configureGitHandlers(): void {
     // Get the Git extension
     const gitExtension = vscode.extensions.getExtension<GitExtension>('vscode.git')?.exports;

src/test/unit/cli/cliExecutable.test.ts

@@ -17,25 +17,29 @@ suite('CliExecutable', () => {
     strictEqual(CliExecutable.getFileName('windows'), 'snyk-win.exe');
   });
 
-  test('Returns correct extension paths', () => {
+  test('Returns correct extension paths', async() => {
     const unixExtensionDir = '/Users/user/.vscode/extensions/snyk-security.snyk-vulnerability-scanner-1.1.0';
 
     const stub = sinon.stub(Platform, 'getCurrent').returns('darwin');
     let expectedCliPath = path.join(unixExtensionDir, 'snyk-macos');
-    strictEqual(CliExecutable.getPath(unixExtensionDir), expectedCliPath);
+    strictEqual(await CliExecutable.getPath(unixExtensionDir), expectedCliPath);
+
+    sinon.stub(Platform, 'getArch').returns('arm64');
+    expectedCliPath = path.join(unixExtensionDir, 'snyk-macos-arm64');
+    strictEqual(await CliExecutable.getPath(unixExtensionDir), expectedCliPath);
 
     stub.returns('linux');
     expectedCliPath = path.join(unixExtensionDir, 'snyk-linux');
-    strictEqual(CliExecutable.getPath(unixExtensionDir), expectedCliPath);
+    strictEqual(await CliExecutable.getPath(unixExtensionDir), expectedCliPath);
 
     const winExtensionDir = `C:\\Users\\user\\.vscode\\extensions`;
     stub.returns('win32');
     expectedCliPath = path.join(winExtensionDir, 'snyk-win.exe');
-    strictEqual(CliExecutable.getPath(winExtensionDir), expectedCliPath);
+    strictEqual(await CliExecutable.getPath(winExtensionDir), expectedCliPath);
   });
 
-  test('Return custom path, if provided', () => {
+  test('Return custom path, if provided', async () => {
     const customPath = '/path/to/cli';
-    strictEqual(CliExecutable.getPath('', customPath), customPath);
+    strictEqual(await CliExecutable.getPath('', customPath), customPath);
   });
 });

src/test/unit/common/configuration.test.ts

@@ -3,7 +3,6 @@
 import { deepStrictEqual, strictEqual } from 'assert';
 import sinon from 'sinon';
 import { Configuration, PreviewFeatures } from '../../../snyk/common/configuration/configuration';
-import { SNYK_TOKEN_KEY } from '../../../snyk/common/constants/general';
 import {
   ADVANCED_CUSTOM_ENDPOINT,
   FEATURES_PREVIEW_SETTING,

src/test/unit/common/languageServer/languageServer.test.ts

@@ -57,9 +57,6 @@ suite('Language Server', () => {
         return Promise.resolve('testToken');
       },
       shouldReportErrors: true,
-      getSnykLanguageServerPath(): string {
-        return path;
-      },
       getAdditionalCliParameters() {
         return '--all-projects -d';
       },
@@ -88,7 +85,7 @@ suite('Language Server', () => {
         return [];
       },
       scanningMode: 'auto',
-    } as unknown as IConfiguration;
+    } as IConfiguration;
 
     extensionContextMock = {
       extensionPath: 'test/path',

src/test/unit/common/languageServer/middleware.test.ts

@@ -32,7 +32,7 @@ suite('Language Server: Middleware', () => {
       organization: 'org',
       getToken: () => Promise.resolve('token'),
       isAutomaticDependencyManagementEnabled: () => true,
-      getCliPath: () => '/path/to/cli',
+      getCliPath: (): Promise<string> => Promise.resolve('/path/to/cli'),
       getInsecure(): boolean {
         return true;
       },
@@ -58,7 +58,7 @@ suite('Language Server: Middleware', () => {
       getFolderConfigs(): FolderConfig[] {
         return [];
       },
-    } as unknown as IConfiguration;
+    } as IConfiguration;
     extensionContextMock = {
       extensionPath: 'test/path',
       getGlobalStateValue: contextGetGlobalStateValue,
@@ -112,7 +112,7 @@ suite('Language Server: Middleware', () => {
     );
     assert.strictEqual(
       serverResult.cliPath,
-      CliExecutable.getPath(extensionContextMock.extensionPath, await configuration.getCliPath()),
+      await CliExecutable.getPath(extensionContextMock.extensionPath, await configuration.getCliPath()),
     );
     assert.strictEqual(serverResult.enableTrustedFoldersFeature, 'true');
     assert.deepStrictEqual(serverResult.trustedFolders, configuration.getTrustedFolders());

src/test/unit/common/services/downloadService.test.ts

@@ -47,9 +47,9 @@ suite('DownloadService', () => {
 
     configuration = {
       isAutomaticDependencyManagementEnabled: () => true,
-      getCustomCliPath: () => undefined,
-      getSnykLanguageServerPath: () => 'ab/c',
-    } as unknown as IConfiguration;
+      getCliReleaseChannel: () => "stable",
+      getCliPath: () => Promise.resolve("path/to/cli"),
+    } as IConfiguration;
 
     downloader = new Downloader(configuration, lsApi, windowMock, logger, context);
   });
@@ -61,9 +61,9 @@ suite('DownloadService', () => {
   test('Tries to download LS if not installed', async () => {
     configuration = {
       isAutomaticDependencyManagementEnabled: () => true,
-      getCustomCliPath: () => undefined,
-      getSnykLanguageServerPath: () => 'abc/d',
-    } as unknown as IConfiguration;
+      getCliReleaseChannel: () => "stable",
+      getCliPath: () => Promise.resolve("path/to/cli"),
+    } as IConfiguration;
     const service = new DownloadService(context, configuration, lsApi, windowMock, logger, downloader);
     const downloadSpy = stub(service, 'download');
     const updateSpy = stub(service, 'update');
@@ -76,9 +76,9 @@ suite('DownloadService', () => {
   test('Tries to update LS if installed', async () => {
     configuration = {
       isAutomaticDependencyManagementEnabled: () => true,
-      getCustomCliPath: () => undefined,
-      getSnykLanguageServerPath: () => 'abc/d',
-    } as unknown as IConfiguration;
+      getCliReleaseChannel: () => "stable",
+      getCliPath: () => Promise.resolve("path/to/cli"),
+    } as IConfiguration;
     const service = new DownloadService(context, configuration, lsApi, windowMock, logger, downloader);
     stub(service, 'isCliInstalled').resolves(true);
     const downloadSpy = stub(service, 'download');
@@ -93,9 +93,9 @@ suite('DownloadService', () => {
   test("Doesn't download LS if automatic dependency management disabled", async () => {
     configuration = {
       isAutomaticDependencyManagementEnabled: () => false,
-      getCustomCliPath: () => undefined,
-      getSnykLanguageServerPath: () => 'abc/d',
-    } as unknown as IConfiguration;
+      getCliReleaseChannel: () => "stable",
+      getCliPath: () => Promise.resolve("path/to/cli"),
+    } as IConfiguration;
     const service = new DownloadService(context, configuration, lsApi, windowMock, logger, downloader);
     stub(service, 'isCliInstalled').resolves(false);
     const downloadSpy = stub(service, 'download');

src/test/unit/download/downloader.test.ts

@@ -25,10 +25,11 @@ suite('LS Downloader (LS)', () => {
     logger = new LoggerMock();
     configuration = {
       isAutomaticDependencyManagementEnabled: () => true,
-      getCliPath(): string {
-        return 'abc/d';
+      getCliReleaseChannel: () => "stable",
+      getCliPath(): Promise<string> {
+        return Promise.resolve('abc/d');
       },
-    } as unknown as IConfiguration;
+    } as IConfiguration;
     extensionContextMock = {
       extensionPath: 'test/path',
       updateGlobalStateValue: sinon.fake(),
@@ -58,8 +59,7 @@ suite('LS Downloader (LS)', () => {
     const unlink = sinon.stub(fs, 'unlink');
 
     await downloader.download();
-    const cliPath = await CliExecutable.getPath((await configuration.getCliPath()) as string);
-
+    const cliPath = await configuration.getCliPath() ?? "";
     strictEqual(unlink.calledOnceWith(cliPath), true);
   });
 

src/test/unit/mocks/workspace.mock.ts

@@ -1,5 +1,3 @@
-import * as os from 'os';
-import path from 'path';
 import { IVSCodeWorkspace } from '../../../snyk/common/vscode/workspace';
 
 export function stubWorkspaceConfiguration<T>(configSetting: string, returnValue: T | undefined): IVSCodeWorkspace {