impl: report cli name and version

Alongside the content size downloaded

Author: fioan89

src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt

@@ -82,7 +82,7 @@ fun ensureCLI(
         context.logger.info(DOWNLOADING_CODER_CLI)
         showTextProgress(DOWNLOADING_CODER_CLI)
         try {
-            cli.download(showTextProgress)
+            cli.download(buildVersion, showTextProgress)
             return cli
         } catch (e: java.nio.file.AccessDeniedException) {
             // Might be able to fall back to the data directory.
@@ -104,7 +104,7 @@ fun ensureCLI(
     if (settings.enableDownloads) {
         context.logger.info(DOWNLOADING_CODER_CLI)
         showTextProgress(DOWNLOADING_CODER_CLI)
-        dataCLI.download(showTextProgress)
+        dataCLI.download(buildVersion, showTextProgress)
         return dataCLI
     }
 
@@ -142,7 +142,7 @@ class CoderCLIManager(
     /**
      * Download the CLI from the deployment if necessary.
      */
-    fun download(showTextProgress: (String) -> Unit): Boolean {
+    fun download(buildVersion: String, showTextProgress: (String) -> Unit): Boolean {
         val eTag = getBinaryETag()
         val conn = remoteBinaryURL.openConnection() as HttpURLConnection
         if (!settings.headerCommand.isNullOrBlank()) {
@@ -185,7 +185,7 @@ class CoderCLIManager(
                             while (source.read(buffer).also { bytesRead = it } != -1) {
                                 sink.write(buffer, 0, bytesRead)
                                 totalRead += bytesRead
-                                showTextProgress("Downloaded ${totalRead.toHumanReadableSize()}...")
+                                showTextProgress("${settings.defaultCliBinaryNameByOsAndArch} $buildVersion - ${totalRead.toHumanReadableSize()} downloaded")
                             }
                         }
                     }

src/test/kotlin/com/coder/toolbox/cli/CoderCLIManagerTest.kt

@@ -62,6 +62,7 @@ import kotlin.test.assertFalse
 import kotlin.test.assertNotEquals
 import kotlin.test.assertTrue
 
+private const val VERSION_FOR_PROGRESS_REPORTING = "v2.23.1-devel+de07351b8"
 private val noOpTextProgress: (String) -> Unit = { _ -> }
 
 internal class CoderCLIManagerTest {
@@ -147,7 +148,7 @@ internal class CoderCLIManagerTest {
         val ex =
             assertFailsWith(
                 exceptionClass = ResponseException::class,
-                block = { ccm.download(noOpTextProgress) },
+                block = { ccm.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress) },
             )
         assertEquals(HttpURLConnection.HTTP_INTERNAL_ERROR, ex.code)
 
@@ -202,7 +203,7 @@ internal class CoderCLIManagerTest {
 
         assertFailsWith(
             exceptionClass = AccessDeniedException::class,
-            block = { ccm.download(noOpTextProgress) },
+            block = { ccm.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress) },
         )
 
         srv.stop(0)
@@ -231,11 +232,11 @@ internal class CoderCLIManagerTest {
             ).readOnly(),
         )
 
-        assertTrue(ccm.download(noOpTextProgress))
+        assertTrue(ccm.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress))
         assertDoesNotThrow { ccm.version() }
 
         // It should skip the second attempt.
-        assertFalse(ccm.download(noOpTextProgress))
+        assertFalse(ccm.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress))
 
         // Make sure login failures propagate.
         assertFailsWith(
@@ -260,11 +261,11 @@ internal class CoderCLIManagerTest {
             ).readOnly(),
         )
 
-        assertEquals(true, ccm.download(noOpTextProgress))
+        assertEquals(true, ccm.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress))
         assertEquals(SemVer(url.port.toLong(), 0, 0), ccm.version())
 
         // It should skip the second attempt.
-        assertEquals(false, ccm.download(noOpTextProgress))
+        assertEquals(false, ccm.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress))
 
         // Should use the source override.
         ccm = CoderCLIManager(
@@ -280,7 +281,7 @@ internal class CoderCLIManagerTest {
             ).readOnly(),
         )
 
-        assertEquals(true, ccm.download(noOpTextProgress))
+        assertEquals(true, ccm.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress))
         assertContains(ccm.localBinaryPath.toFile().readText(), "0.0.0")
 
         srv.stop(0)
@@ -328,7 +329,7 @@ internal class CoderCLIManagerTest {
         assertEquals("cli", ccm.localBinaryPath.toFile().readText())
         assertEquals(0, ccm.localBinaryPath.toFile().lastModified())
 
-        assertTrue(ccm.download(noOpTextProgress))
+        assertTrue(ccm.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress))
 
         assertNotEquals("cli", ccm.localBinaryPath.toFile().readText())
         assertNotEquals(0, ccm.localBinaryPath.toFile().lastModified())
@@ -353,8 +354,8 @@ internal class CoderCLIManagerTest {
         val ccm1 = CoderCLIManager(url1, context.logger, settings)
         val ccm2 = CoderCLIManager(url2, context.logger, settings)
 
-        assertTrue(ccm1.download(noOpTextProgress))
-        assertTrue(ccm2.download(noOpTextProgress))
+        assertTrue(ccm1.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress))
+        assertTrue(ccm2.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress))
 
         srv1.stop(0)
         srv2.stop(0)
@@ -957,7 +958,7 @@ internal class CoderCLIManagerTest {
                     context.logger,
                 ).readOnly(),
             )
-            assertEquals(true, ccm.download(noOpTextProgress))
+            assertEquals(true, ccm.download(VERSION_FOR_PROGRESS_REPORTING, noOpTextProgress))
             assertEquals(it.second, ccm.features, "version: ${it.first}")
 
             srv.stop(0)