Munge error at point of display

code-asher · code-asher · commit aa27ca1724db · 2023-05-01T15:20:43.000-08:00
diff --git a/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt b/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt
@@ -3,6 +3,7 @@
 package com.coder.gateway
 
 import com.coder.gateway.sdk.humanizeDuration
+import com.coder.gateway.sdk.isWorkerTimeout
 import com.coder.gateway.sdk.suspendingRetryWithExponentialBackOff
 import com.coder.gateway.services.CoderRecentWorkspaceConnectionsService
 import com.intellij.openapi.application.ApplicationManager
@@ -47,13 +48,16 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
                             || e is SSHException || e is DeployException
                 },
                 update = { _, e, remainingMs ->
+                    val message =
+                        if (isWorkerTimeout(e)) "Failed to upload worker binary...it may have timed out"
+                        else e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
                     if (remainingMs != null) {
-                        indicator.text2 = e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
+                        indicator.text = message
                         indicator.text = CoderGatewayBundle.message("gateway.connector.coder.connection.retry-error.text", humanizeDuration(remainingMs))
                     } else {
                         ApplicationManager.getApplication().invokeAndWait {
                             Messages.showMessageDialog(
-                                e.message ?: CoderGatewayBundle.message("gateway.connector.no-details"),
+                                message,
                                 CoderGatewayBundle.message("gateway.connector.coder.connection.error.text"),
                                 Messages.getErrorIcon())
                         }
diff --git a/src/main/kotlin/com/coder/gateway/sdk/Retry.kt b/src/main/kotlin/com/coder/gateway/sdk/Retry.kt
@@ -67,15 +67,7 @@ suspend fun <T> suspendingRetryWithExponentialBackOff(
           logger.error("Failed to $label (attempt $attempt; will retry in $delayMs ms)", originalEx)
           var remainingMs = delayMs
           while (remainingMs > 0) {
-              // When the worker upload times out Gateway just says it failed.
-              // Even the root cause (IllegalStateException) is useless.  The
-              // error also includes a very long useless tmp path.  With all
-              // that in mind, provide a better error.
-              val mungedEx =
-                  if (unwrappedEx is DeployException && unwrappedEx.message.contains("Worker binary deploy failed"))
-                      DeployException("Failed to upload worker binary...it may have timed out", unwrappedEx)
-                  else unwrappedEx
-              update(attempt, mungedEx, remainingMs)
+              update(attempt, unwrappedEx, remainingMs)
               val next = min(remainingMs, TimeUnit.SECONDS.toMillis(1))
               remainingMs -= next
               delay(next)
@@ -97,3 +89,12 @@ fun humanizeDuration(durationMs: Long): String {
     val seconds = TimeUnit.MILLISECONDS.toSeconds(durationMs)
     return if (seconds < 1) "now" else "in $seconds second${if (seconds > 1) "s" else ""}"
 }
+
+/**
+ * When the worker upload times out Gateway just says it failed. Even the root
+ * cause (IllegalStateException) is useless.  The error also includes a very
+ * long useless tmp path.  Return true if the error looks like this timeout.
+ */
+fun isWorkerTimeout(e: Throwable): Boolean {
+    return e is DeployException && e.message.contains("Worker binary deploy failed")
+}
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -9,6 +9,7 @@ import com.coder.gateway.sdk.CoderCLIManager
 import com.coder.gateway.sdk.CoderRestClientService
 import com.coder.gateway.sdk.OS
 import com.coder.gateway.sdk.humanizeDuration
+import com.coder.gateway.sdk.isWorkerTimeout
 import com.coder.gateway.sdk.suspendingRetryWithExponentialBackOff
 import com.coder.gateway.sdk.toURL
 import com.coder.gateway.sdk.withPath
@@ -200,7 +201,9 @@ class CoderLocateRemoteProjectStepView(private val setNextButtonEnabled: (Boolea
                 },
                 update = { _, e, remainingMs ->
                     cbIDEComment.foreground = UIUtil.getErrorForeground()
-                    cbIDEComment.text = e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
+                    cbIDEComment.text =
+                        if (isWorkerTimeout(e)) "Failed to upload worker binary...it may have timed out.  Check the command log for more details."
+                        else e.message ?: CoderGatewayBundle.message("gateway.connector.no-details")
                     cbIDE.renderer =
                         if (remainingMs != null) IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.retry-error.text", humanizeDuration(remainingMs)))
                         else IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.error.text"), UIUtil.getBalloonErrorIcon())
