move flag argument out of dvc reader's version

iterative · Mar 9, 2023 · 6440b70 · 6440b70
1 parent b027c46
commit 6440b70
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/extension/src/cli/dvc/reader.ts b/extension/src/cli/dvc/reader.ts
@@ -37,6 +37,7 @@ export const isDvcError = <
 export const autoRegisteredCommands = {
   DATA_STATUS: 'dataStatus',
   EXP_SHOW: 'expShow',
+  GLOBAL_VERSION: 'globalVersion',
   PLOTS_DIFF: 'plotsDiff',
   ROOT: 'root',
   STAGE_LIST: 'listStages',
@@ -106,9 +107,13 @@ export class DvcReader extends DvcCli {
     } catch {}
   }
 
-  public version(cwd: string, isCliGlobal?: true): Promise<string> {
+  public version(cwd: string): Promise<string> {
+    return this.executeDvcProcess(cwd, Flag.VERSION)
+  }
+
+  public globalVersion(cwd: string): Promise<string> {
     const options = getOptions(
-      isCliGlobal ? undefined : this.config.getPythonBinPath(),
+      undefined,
       this.config.getCliPath(),
       cwd,
       Flag.VERSION

diff --git a/extension/src/setup/index.ts b/extension/src/setup/index.ts
@@ -135,10 +135,15 @@ export class Setup
   public async getCliVersion(cwd: string, tryGlobalCli?: true) {
     await this.config.isReady()
     try {
+      if (tryGlobalCli) {
+        return await this.internalCommands.executeCommand(
+          AvailableCommands.GLOBAL_VERSION,
+          cwd
+        )
+      }
       return await this.internalCommands.executeCommand(
         AvailableCommands.VERSION,
-        cwd,
-        tryGlobalCli as unknown as string
+        cwd
       )
     } catch {}
   }

diff --git a/extension/src/test/suite/setup/util.ts b/extension/src/test/suite/setup/util.ts
@@ -44,6 +44,9 @@ export const buildSetup = (
   const mockEmitter = disposer.track(new EventEmitter())
   stub(dvcReader, 'root').resolves(mockDvcRoot)
   const mockVersion = stub(dvcReader, 'version').resolves(MIN_CLI_VERSION)
+  const mockGlobalVersion = stub(dvcReader, 'globalVersion').resolves(
+    MIN_CLI_VERSION
+  )
   const mockGetGitRepositoryRoot = stub(
     gitReader,
     'getGitRepositoryRoot'
@@ -87,6 +90,7 @@ export const buildSetup = (
     messageSpy,
     mockAutoInstallDvc,
     mockGetGitRepositoryRoot,
+    mockGlobalVersion,
     mockInitializeGit,
     mockOpenExperiments,
     mockRunSetup,