Encapsulate process execution in CLI manager

code-asher · code-asher · commit 848b1d07ff97 · 2023-04-03T13:02:21.000-08:00
We will need to create a new function for config-ssh anyway since we
will be doing our own thing rather than spawning the CLI in order to
support multiple deployments so this preemptively encapsulates that
logic.
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt
@@ -1,6 +1,7 @@
 package com.coder.gateway.sdk
 
 import com.intellij.openapi.diagnostic.Logger
+import org.zeroturnaround.exec.ProcessExecutor
 import java.io.InputStream
 import java.net.URL
 import java.nio.file.Files
@@ -111,6 +112,45 @@ class CoderCLIManager(deployment: URL, buildVersion: String) {
         }
     }
 
+    /**
+     * Use the provided credentials to authenticate the CLI.
+     */
+    fun login(url: String, token: String): String {
+        return exec("login", url, "--token", token)
+    }
+
+    /**
+     * Configure SSH to use this binary.
+     *
+     * TODO: Support multiple deployments; currently they will clobber each
+     *       other.
+     */
+    fun configSsh(): String {
+        return exec("config-ssh", "--yes", "--use-previous-options")
+    }
+
+    /**
+     * Return the binary version.
+     */
+    fun version(): String {
+        return exec("version")
+    }
+
+    /**
+     * Execute the binary with the provided arguments.
+     *
+     * @return The command's output.
+     */
+    private fun exec(vararg args: String): String {
+        val stdout = ProcessExecutor()
+            .command(localBinaryPath.toString(), *args)
+            .readOutput(true)
+            .execute()
+            .outputUTF8()
+        logger.info("`${localBinaryPath} ${listOf(*args).joinToString(" ")}`: $stdout")
+        return stdout
+    }
+
     companion object {
         val logger = Logger.getInstance(CoderCLIManager::class.java.simpleName)
     }
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -59,7 +59,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.zeroturnaround.exec.ProcessExecutor
 import java.awt.Component
 import java.awt.Dimension
 import java.awt.event.MouseEvent
@@ -491,18 +490,19 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod
                 return@launchUnderBackgroundProgress
             }
             this.indicator.apply {
-                text = "Configuring Coder CLI..."
+                text = "Logging in..."
                 fraction = 0.5
             }
+            cliManager.login(localWizardModel.coderURL, localWizardModel.token)
 
-            val loginOutput = ProcessExecutor().command(localWizardModel.localCliPath, "login", localWizardModel.coderURL, "--token", localWizardModel.token).readOutput(true).execute().outputUTF8()
-            logger.info("coder-cli login output: $loginOutput")
-            this.indicator.fraction = 0.8
-            val sshConfigOutput = ProcessExecutor().command(localWizardModel.localCliPath, "config-ssh", "--yes", "--use-previous-options").readOutput(true).execute().outputUTF8()
-            logger.info("Result of `${localWizardModel.localCliPath} config-ssh --yes --use-previous-options`: $sshConfigOutput")
+            this.indicator.apply {
+                text = "Configuring SSH..."
+                fraction = 0.7
+            }
+            cliManager.configSsh()
 
             this.indicator.apply {
-                text = "Remove old Coder CLI versions..."
+                text = "Removing old Coder CLI versions..."
                 fraction = 0.9
             }
             cliManager.removeOldCli()
diff --git a/src/test/groovy/CoderCLIManagerTest.groovy b/src/test/groovy/CoderCLIManagerTest.groovy
@@ -1,6 +1,5 @@
 package com.coder.gateway.sdk
 
-import org.zeroturnaround.exec.ProcessExecutor
 import spock.lang.Unroll
 
 import java.nio.file.Files
@@ -55,7 +54,7 @@ class CoderCLIManagerTest extends spock.lang.Specification {
         downloaded
         ccm.localBinaryPath.getParent() == dir
         ccm.localBinaryPath.toFile().exists()
-        new ProcessExecutor().command(ccm.localBinaryPath.toString(), "version").readOutput(true).execute().outputUTF8().contains("Coder")
+        ccm.version().contains("Coder")
     }
 
     def "skips cli download if it already exists"() {
