Include additional options in install command (#44)

To be able to bypass the SSL exception during bsp server installation we
need to be able to
pass on additional flags to coursier launch command.

Here we are adding option to add additional flags for install command.

Additionally cleaned up the code and removed ununsed declarations and
imports


**Test**
- Unit Test 
- Tested regular installation on local no issues

Author: shuklahy

src/server/install.ts

@@ -186,14 +186,22 @@ export class BazelBSPInstaller {
       ['--bazel-binary', bazelPath],
       ['--targets', '//your/targets/here/...'],
     ])
+
     const flagsString = Array.from(installFlags.entries())
       .map(([key, value]) => `${key} "${value}"`)
       .join(' ')
+    const additionalInstallFlags = getExtensionSetting(
+      SettingName.ADDITIONAL_INSTALL_FLAGS
+    )
+    const additionalInstallFlagsString = additionalInstallFlags
+      ? additionalInstallFlags.join(' ')
+      : ''
 
     const javaVersion =
       os.platform() === 'darwin' ? TEMURIN_JAVA_17 : OPEN_JDK_JAVA_17
     this.outputChannel.appendLine(`Using Java version: ${javaVersion}`)
-    const installCommand = `"${coursierPath}" launch --jvm ${javaVersion} ${MAVEN_PACKAGE}:${config.serverVersion} -M ${INSTALL_METHOD} -- ${flagsString}`
+    const installCommand = `"${coursierPath}" launch --jvm ${javaVersion} ${MAVEN_PACKAGE}:${config.serverVersion} -M ${INSTALL_METHOD} ${additionalInstallFlagsString} -- ${flagsString}`
+    this.outputChannel.appendLine(`Running command: ${installCommand}`)
 
     // Report progress in output channel.
     const installProcess = cp.spawn(installCommand, {cwd: root, shell: true})

src/test/suite/install.test.ts

@@ -3,33 +3,23 @@ import * as vscode from 'vscode'
 import {Test} from '@nestjs/testing'
 import {beforeEach, afterEach} from 'mocha'
 import * as sinon from 'sinon'
-import {MessageConnection} from 'vscode-jsonrpc'
-import * as bsp from '../../bsp/bsp'
 import * as axios from 'axios'
 import fs from 'fs/promises'
 import cp from 'child_process'
 import * as zlib from 'zlib'
 const proxyquire = require('proxyquire')
 
-import {BazelBSPBuildClient} from '../../test-explorer/client'
 import {
   contextProviderFactory,
   outputChannelProvider,
 } from '../../custom-providers'
-import {BuildServerManager} from '../../server/server-manager'
 import {Utils} from '../../utils/utils'
-import {createSampleMessageConnection} from './test-utils'
 import {BazelBSPInstaller} from '../../server/install'
 import * as settings from '../../utils/settings'
-import {TestItemFactory} from '../../test-info/test-item-factory'
-import {TestCaseStore} from '../../test-explorer/store'
 
 suite('BSP Installer', () => {
   let ctx: vscode.ExtensionContext
   let bazelBSPInstaller: BazelBSPInstaller
-  let buildServerStub: sinon.SinonStubbedInstance<BuildServerManager>
-  let sampleConn: MessageConnection
-  let clientOutputChannel: vscode.LogOutputChannel
   let spawnStub: sinon.SinonStub
   let osMock: any
 
@@ -40,6 +30,7 @@ suite('BSP Installer', () => {
     arch: string
     isGzipped: boolean
     javaVersion: string
+    additionalInstallFlags?: string[]
   }
 
   const setupInstallTest = (config: InstallTestConfig) => {
@@ -61,6 +52,8 @@ suite('BSP Installer', () => {
       .returns('2.0.0')
       .withArgs(settings.SettingName.SERVER_INSTALL_MODE)
       .returns('Prompt')
+      .withArgs(settings.SettingName.ADDITIONAL_INSTALL_FLAGS)
+      .returns(config.additionalInstallFlags || [])
 
     sandbox.stub(fs, 'readFile').resolves(
       `#if( $pythonEnabled == "true" && $bazel8OrAbove == "true" )
@@ -250,4 +243,24 @@ load("//aspects:utils/utils.bzl", "create_struct", "file_location", "to_file_loc
     const actualInstallResult = await bazelBSPInstaller.install()
     assert.ok(!actualInstallResult)
   })
+
+  test('additional install flags', async () => {
+    const config = {
+      ...testConfigs.macArm64,
+      additionalInstallFlags: [
+        '-J-Djavax.net.ssl.trustStore=/path/to/ca/cacerts',
+        '-J-Djavax.net.ssl.trustStorePassword=xxxx',
+      ],
+    }
+    setupInstallTest(config)
+
+    await bazelBSPInstaller.install()
+
+    assert.equal(spawnStub.callCount, 1)
+    const spawnCall = spawnStub.getCalls()[0]
+    const commandString = spawnCall.args[0]
+    config.additionalInstallFlags.forEach(flag => {
+      assert.ok(commandString.includes(flag))
+    })
+  })
 })

src/utils/settings.ts

@@ -13,6 +13,7 @@ export enum SettingName {
   DEBUG_BAZEL_FLAGS = 'debug.bazelFlags',
   LAUNCH_CONFIG_NAME = 'debug.launchConfigName',
   DEBUG_READY_PATTERN = 'debug.readyPattern',
+  ADDITIONAL_INSTALL_FLAGS = 'additionalInstallFlags',
 }
 
 export interface SettingTypes {
@@ -26,6 +27,7 @@ export interface SettingTypes {
   [SettingName.DEBUG_BAZEL_FLAGS]: string[]
   [SettingName.LAUNCH_CONFIG_NAME]: string
   [SettingName.DEBUG_READY_PATTERN]: string
+  [SettingName.ADDITIONAL_INSTALL_FLAGS]: string[]
 }
 
 export function getExtensionSetting<T extends keyof SettingTypes>(