fix: dont connect if no joinLink, show error (#23549)

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

src/main/kotlin/com/redhat/devtools/gateway/DevSpacesConnection.kt

@@ -11,12 +11,12 @@
  */
 package com.redhat.devtools.gateway
 
-import com.redhat.devtools.gateway.openshift.DevWorkspaces
-import com.redhat.devtools.gateway.openshift.Pods
-import com.redhat.devtools.gateway.server.RemoteIDEServer
 import com.jetbrains.gateway.thinClientLink.LinkedClientManager
 import com.jetbrains.gateway.thinClientLink.ThinClientHandle
 import com.jetbrains.rd.util.lifetime.Lifetime
+import com.redhat.devtools.gateway.openshift.DevWorkspaces
+import com.redhat.devtools.gateway.openshift.Pods
+import com.redhat.devtools.gateway.server.RemoteIDEServer
 import io.kubernetes.client.openapi.ApiException
 import java.io.IOException
 import java.net.URI
@@ -52,12 +52,13 @@ class DevSpacesConnection(private val devSpacesContext: DevSpacesContext) {
 
         val remoteIdeServer = RemoteIDEServer(devSpacesContext)
         val remoteIdeServerStatus = remoteIdeServer.getStatus()
-
+        val joinLink = remoteIdeServerStatus.joinLink
+            ?: throw IOException("Could not connect, remote IDE is not ready. No join link present.")
         val client = LinkedClientManager
             .getInstance()
             .startNewClient(
                 Lifetime.Eternal,
-                URI(remoteIdeServerStatus.joinLink),
+                URI(joinLink),
                 "",
                 onConnected,
                 false

src/main/kotlin/com/redhat/devtools/gateway/DevSpacesConnectionProvider.kt

@@ -12,6 +12,7 @@
 package com.redhat.devtools.gateway
 
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.progress.ProcessCanceledException
@@ -29,6 +30,8 @@ import com.redhat.devtools.gateway.openshift.OpenShiftClientFactory
 import com.redhat.devtools.gateway.openshift.kube.KubeConfigBuilder
 import com.redhat.devtools.gateway.openshift.kube.isNotFound
 import com.redhat.devtools.gateway.openshift.kube.isUnauthorized
+import com.redhat.devtools.gateway.util.messageWithoutPrefix
+import com.redhat.devtools.gateway.view.ui.Dialogs
 import io.kubernetes.client.openapi.ApiException
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
@@ -67,9 +70,9 @@ class DevSpacesConnectionProvider : GatewayConnectionProvider {
                 indicator.setText("Connecting to DevSpace...")
                 indicator.setIndeterminate(true)
 
-                val handle = doConnect(parameters, requestor, indicator) // suspend function assumed
+                val handle = doConnect(parameters, indicator)
 
-                val thinClient = handle?.clientHandle
+                val thinClient = handle.clientHandle
                     ?: throw RuntimeException("Failed to obtain ThinClientHandle")
 
                 indicator.setText("Waiting for remote IDE to start...")
@@ -86,31 +89,32 @@ class DevSpacesConnectionProvider : GatewayConnectionProvider {
                     onClientClosed(readyDeferred, indicator))
 
                 readyDeferred.await()
-            } catch (err: ApiException) {
+            } catch (e: ApiException) {
                 indicator.setText("Connection failed")
-                Timer(2000) {
-                    indicator.close(DialogWrapper.CANCEL_EXIT_CODE)
-                }.start()
-
-                if (handleUnauthorizedError(err) || handleNotFoundError(err)) {
-                    null
-                } else {
-                    throw err
+                delayedClose(indicator)
+                if (!(handleUnauthorizedError(e) || handleNotFoundError(e))) {
+                    Dialogs.error(e.messageWithoutPrefix() ?: "Could not connect to workspace.", "Connection Error")
                 }
+                null
             } catch (e: Exception) {
                 indicator.setText("Unexpected error: ${e.message}")
-                Timer(2000) {
-                    indicator.close(DialogWrapper.CANCEL_EXIT_CODE)
-                }.start()
-                throw e
+                delayedClose(indicator)
+                Dialogs.error(e.messageWithoutPrefix() ?: "Could not connect to workspace.", "Connection Error")
+                null
             } finally {
-                ApplicationManager.getApplication().invokeLater {
+                withContext(Dispatchers.EDT) {
                     if (indicator.isShowing) indicator.close(DialogWrapper.OK_EXIT_CODE)
                 }
             }
         }
     }
 
+    private fun delayedClose(indicator: StartupProgressIndicator) {
+        Timer(2000) {
+            indicator.close(DialogWrapper.CANCEL_EXIT_CODE)
+        }.start()
+    }
+
     private fun onClientPresenceChanged(
         readyDeferred: CompletableDeferred<GatewayConnectionHandle?>,
         indicator: StartupProgressIndicator,
@@ -162,9 +166,8 @@ class DevSpacesConnectionProvider : GatewayConnectionProvider {
     @Throws(IllegalArgumentException::class)
     private fun doConnect(
         parameters: Map<String, String>,
-        requestor: ConnectionRequestor,
         indicator: ProgressIndicator? = null
-    ): GatewayConnectionHandle? {
+    ): GatewayConnectionHandle {
         thisLogger().debug("Launched Dev Spaces connection provider", parameters)
 
         indicator?.text2 = "Preparing connection environment…"
@@ -224,12 +227,10 @@ class DevSpacesConnectionProvider : GatewayConnectionProvider {
             "\n\nYou are using token-based authentication.\nUpdate your token in the kubeconfig file."
         else ""
 
-        withContext(Dispatchers.Main) {
-            Messages.showErrorDialog(
-                "Your session has expired.\nPlease log in again to continue.$tokenNote",
-                "Authentication Required"
-            )
-        }
+        Dialogs.error(
+            "Your session has expired.\nPlease log in again to continue.$tokenNote",
+            "Authentication Required"
+        )
         return true
     }
 
@@ -243,9 +244,7 @@ class DevSpacesConnectionProvider : GatewayConnectionProvider {
             Please verify your Kubernetes context, namespace, and that the DevWorkspace Operator is installed and running.
         """.trimIndent()
 
-        withContext(Dispatchers.Main) {
-            Messages.showErrorDialog(message, "Resource Not Found")
-        }
+        Dialogs.error(message, "Resource Not Found")
         return true
     }
 

src/main/kotlin/com/redhat/devtools/gateway/server/RemoteIDEServerStatus.kt

@@ -13,7 +13,7 @@
 package com.redhat.devtools.gateway.server
 
 data class RemoteIDEServerStatus(
-    val joinLink: String,
+    val joinLink: String?,
     val httpLink: String,
     val gatewayLink: String,
     val appVersion: String,

src/main/kotlin/com/redhat/devtools/gateway/util/ExceptionUtils.kt

@@ -11,12 +11,18 @@
  */
 package com.redhat.devtools.gateway.util
 
+
 fun Throwable.rootMessage(): String {
     var cause: Throwable? = this
     while (cause?.cause != null) {
         cause = cause.cause
     }
     return cause?.message?.trim()
-        ?: this.message?.substringAfter(":")?.trim()
+        ?: messageWithoutPrefix()
         ?: "Unknown error"
 }
+
+fun Throwable.messageWithoutPrefix(): String? {
+    return message?.trim()
+        ?: message?.substringAfter(":")?.trim()
+}

src/main/kotlin/com/redhat/devtools/gateway/view/steps/DevSpacesRemoteServerConnectionStepView.kt

@@ -11,6 +11,7 @@
  */
 package com.redhat.devtools.gateway.view.steps
 
+import com.intellij.notification.Notifications
 import com.redhat.devtools.gateway.DevSpacesBundle
 import com.redhat.devtools.gateway.DevSpacesConnection
 import com.redhat.devtools.gateway.DevSpacesContext
@@ -31,6 +32,13 @@ import com.intellij.ui.dsl.builder.RightGap
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.util.ui.JBFont
 import com.intellij.util.ui.JBUI
+import com.redhat.devtools.gateway.util.messageWithoutPrefix
+import com.redhat.devtools.gateway.view.ui.Dialogs
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import okhttp3.internal.notify
+import org.jetbrains.concurrency.runAsync
 import java.awt.Component
 import java.awt.EventQueue
 import javax.swing.DefaultListModel
@@ -200,7 +208,7 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
             )
         ApplicationManager.getApplication().invokeLaterOnWriteThread { loaderDialog.show() }
 
-        Thread {
+        CoroutineScope(Dispatchers.IO).launch {
             try {
                 DevSpacesConnection(devSpacesContext).connect(
                     {
@@ -231,8 +239,9 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
                 )
                 refreshStopButton()
                 thisLogger().error("Remote server connection failed.", e)
+                Dialogs.error(e.messageWithoutPrefix() ?: "Could not connect to workspace", "Connection Error")
             }
-        }.start()
+        }
     }
 
     private fun waitDevWorkspaceStopped(devWorkspace: DevWorkspace): Boolean {

src/main/kotlin/com/redhat/devtools/gateway/view/ui/Dialogs.kt

@@ -0,0 +1,20 @@
+package com.redhat.devtools.gateway.view.ui
+
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.ui.Messages
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+object Dialogs {
+
+    suspend fun error(message: String, title: String) {
+        withContext(Dispatchers.Main) {
+            Messages.showMessageDialog(
+                message,
+                title,
+                Messages.getErrorIcon(),
+            )
+        }
+    }
+
+}