Fix DVC setup showing false info on incompatible global DVC (#3961)

* Fix DVC setup showing false info on global DVC * keeps section (and extension status) showing accurate information when extension auto selects a global version of DVC * Apply solution that involves less confusion
iterative · May 23, 2023 · c82b555 · c82b555
1 parent 247f9e7
commit c82b555
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/extension/src/cli/dvc/discovery.ts b/extension/src/cli/dvc/discovery.ts
@@ -127,10 +127,16 @@ const tryGlobalFallbackVersion = async (
   const tryGlobal = await getVersionDetails(setup, cwd, true)
   const { cliCompatible, isAvailable, isCompatible, version } = tryGlobal
 
-  if (isCompatible) {
-    setup.unsetPythonBinPath()
+  if (!isCompatible) {
+    return {
+      isAvailable,
+      isCompatible,
+      version
+    }
   }
 
+  setup.unsetPythonBinPath()
+
   return processVersionDetails(
     setup,
     cliCompatible,
@@ -152,7 +158,11 @@ const extensionCanAutoRunCli = async (
   } = await getVersionDetails(setup, cwd)
 
   if (pythonCliCompatible === CliCompatible.NO_NOT_FOUND) {
-    return tryGlobalFallbackVersion(setup, cwd)
+    const globalResults = await tryGlobalFallbackVersion(setup, cwd)
+
+    if (globalResults.isCompatible) {
+      return globalResults
+    }
   }
 
   return processVersionDetails(

diff --git a/extension/src/setup/runner.test.ts b/extension/src/setup/runner.test.ts
@@ -485,8 +485,9 @@ describe('run', () => {
     await flushPromises()
     expect(mockedWarnWithOptions).toHaveBeenCalledTimes(1)
     expect(mockedWarnWithOptions).toHaveBeenCalledWith(
-      'The extension cannot initialize because the DVC CLI version is incompatible.',
-      Response.SHOW_SETUP
+      'An error was thrown when trying to access the CLI.',
+      Response.SHOW_SETUP,
+      Response.NEVER
     )
     expect(mockedGetCliVersion).toHaveBeenCalledTimes(2)
     expect(mockedResetMembers).toHaveBeenCalledTimes(1)