Differentiate between worker connection and IDE retrieval

Hopefully this makes it seem less stuck in cases where it takes longer.

See #260.

Author: code-asher

CHANGELOG.md

@@ -4,11 +4,15 @@
 
 ## Unreleased
 
-## 2.5.1 - 2023-07-07
-
 ### Fixed
 - Inability to connect to a workspace after going back to the workspaces view.
 
+### Changed
+- Add a message to distinguish between connecting to the worker and querying for
+  IDEs.
+
+## 2.5.1 - 2023-07-07
+
 ### Fixed
 - Inability to download new editors in older versions of Gateway.
 

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

@@ -165,7 +165,6 @@ class CoderLocateRemoteProjectStepView(private val setNextButtonEnabled: (Boolea
         // Clear contents from the last attempt if any.
         cbIDEComment.foreground = UIUtil.getContextHelpForeground()
         cbIDEComment.text = CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.ide.none.comment")
-        cbIDE.renderer = IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.retrieve-ides"))
         ideComboBoxModel.removeAllElements()
         setNextButtonEnabled(false)
 
@@ -185,14 +184,23 @@ class CoderLocateRemoteProjectStepView(private val setNextButtonEnabled: (Boolea
             try {
                 val ides = suspendingRetryWithExponentialBackOff(
                     action = { attempt ->
-                        logger.info("Retrieving IDEs... (attempt $attempt)")
-                        if (attempt > 1) {
-                            cbIDE.renderer = IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.retrieve.ides.retry", attempt))
-                        }
+                        logger.info("Connecting with SSH and uploading worker if missing... (attempt $attempt)")
+                        cbIDE.renderer =
+                            if (attempt > 1)
+                                IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.connect-ssh.retry", attempt))
+                            else IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.connect-ssh"))
                         val executor = createRemoteExecutor(CoderCLIManager.getHostName(deploymentURL, selectedWorkspace))
+
                         if (ComponentValidator.getInstance(tfProject).isEmpty) {
+                            logger.info("Installing remote path validator...")
                             installRemotePathValidator(executor)
                         }
+
+                        logger.info("Retrieving IDEs... (attempt $attempt)")
+                        cbIDE.renderer =
+                            if (attempt > 1)
+                                IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.retrieve-ides.retry", attempt))
+                            else IDECellRenderer(CoderGatewayBundle.message("gateway.connector.view.coder.retrieve-ides"))
                         retrieveIDEs(executor, selectedWorkspace)
                     },
                     retryIf = {

src/main/resources/messages/CoderGatewayBundle.properties

@@ -29,8 +29,10 @@ gateway.connector.view.workspaces.token.comment=The last used token is shown abo
 gateway.connector.view.workspaces.token.rejected=This token was rejected.
 gateway.connector.view.workspaces.token.injected=This token was pulled from your CLI config.
 gateway.connector.view.workspaces.token.none=No existing token found.
+gateway.connector.view.coder.connect-ssh=Establishing SSH connection to remote worker...
+gateway.connector.view.coder.connect-ssh.retry=Establishing SSH connection to remote worker (attempt {0})...
 gateway.connector.view.coder.retrieve-ides=Retrieving IDEs...
-gateway.connector.view.coder.retrieve.ides.retry=Retrieving IDEs (attempt {0})...
+gateway.connector.view.coder.retrieve-ides.retry=Retrieving IDEs (attempt {0})...
 gateway.connector.view.coder.retrieve-ides.failed=Failed to retrieve IDEs
 gateway.connector.view.coder.retrieve-ides.failed.retry=Failed to retrieve IDEs...retrying {0}
 gateway.connector.view.coder.remoteproject.next.text=Start IDE and connect