Make CLI destination dir required

Author: code-asher

src/main/kotlin/com/coder/gateway/CoderSettingsConfigurable.kt

@@ -25,7 +25,7 @@ class CoderSettingsConfigurable : BoundConfigurable("Coder") {
                     .comment(
                         CoderGatewayBundle.message(
                             "gateway.connector.settings.binary-source.comment",
-                            CoderCLIManager(URL("http://localhost")).remoteBinaryURL.path,
+                            CoderCLIManager(URL("http://localhost"), CoderCLIManager.getDataDir()).remoteBinaryURL.path,
                         )
                     )
             }

src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt

@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.adapters.HexBinaryAdapter
  */
 class CoderCLIManager @JvmOverloads constructor(
     private val deploymentURL: URL,
-    destinationDir: Path? = null,
+    destinationDir: Path,
     remoteBinaryURLOverride: String? = null,
     private val sshConfigPath: Path = Path.of(System.getProperty("user.home")).resolve(".ssh/config"),
 ) {
@@ -49,11 +49,10 @@ class CoderCLIManager @JvmOverloads constructor(
                 remoteBinaryURL.withPath(remoteBinaryURLOverride)
             }
         }
-        val dir = destinationDir ?: getDataDir()
         val host = getSafeHost(deploymentURL)
         val subdir = if (deploymentURL.port > 0) "${host}-${deploymentURL.port}" else host
-        localBinaryPath = dir.resolve(subdir).resolve(binaryName).toAbsolutePath()
-        coderConfigPath = dir.resolve(subdir).resolve("config").toAbsolutePath()
+        localBinaryPath = destinationDir.resolve(subdir).resolve(binaryName).toAbsolutePath()
+        coderConfigPath = destinationDir.resolve(subdir).resolve("config").toAbsolutePath()
     }
 
     /**

src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt

@@ -467,7 +467,8 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod
                 this.indicator.text = "Downloading Coder CLI..."
                 val cliManager = CoderCLIManager(
                     deploymentURL,
-                    if (settings.binaryDestination.isNotBlank()) Path.of(settings.binaryDestination) else null,
+                    if (settings.binaryDestination.isNotBlank()) Path.of(settings.binaryDestination)
+                    else CoderCLIManager.getDataDir(),
                     settings.binarySource,
                 )
                 cliManager.downloadCLI()
@@ -722,7 +723,8 @@ class CoderWorkspacesStepView(val setNextButtonEnabled: (Boolean) -> Unit) : Cod
             logger.info("Configuring Coder CLI...")
             val cliManager = CoderCLIManager(
                 wizardModel.coderURL.toURL(),
-                if (settings.binaryDestination.isNotBlank()) Path.of(settings.binaryDestination) else null,
+                if (settings.binaryDestination.isNotBlank()) Path.of(settings.binaryDestination)
+                else CoderCLIManager.getDataDir(),
                 settings.binarySource,
             )
             cliManager.configSsh(listTableModelOfWorkspaces.items)

src/test/groovy/CoderCLIManagerTest.groovy

@@ -84,28 +84,28 @@ class CoderCLIManagerTest extends Specification {
         tmpdir.toFile().deleteDir()
     }
 
-    def "defaults to a sub-directory in the data directory"() {
+    def "uses a sub-directory"() {
         given:
-        def ccm = new CoderCLIManager(new URL("https://test.coder.invalid"))
+        def ccm = new CoderCLIManager(new URL("https://test.coder.invalid"), tmpdir)
 
         expect:
-        ccm.localBinaryPath.getParent() == CoderCLIManager.getDataDir().resolve("test.coder.invalid")
+        ccm.localBinaryPath.getParent() == tmpdir.resolve("test.coder.invalid")
     }
 
     def "includes port in sub-directory if included"() {
         given:
-        def ccm = new CoderCLIManager(new URL("https://test.coder.invalid:3000"))
+        def ccm = new CoderCLIManager(new URL("https://test.coder.invalid:3000"), tmpdir)
 
         expect:
-        ccm.localBinaryPath.getParent() == CoderCLIManager.getDataDir().resolve("test.coder.invalid-3000")
+        ccm.localBinaryPath.getParent() == tmpdir.resolve("test.coder.invalid-3000")
     }
 
     def "encodes IDN with punycode"() {
         given:
-        def ccm = new CoderCLIManager(new URL("https://test.😉.invalid"))
+        def ccm = new CoderCLIManager(new URL("https://test.😉.invalid"), tmpdir)
 
         expect:
-        ccm.localBinaryPath.getParent() == CoderCLIManager.getDataDir().resolve("test.xn--n28h.invalid")
+        ccm.localBinaryPath.getParent() == tmpdir.resolve("test.xn--n28h.invalid")
     }
 
     def "fails to download"() {