terminal: show last error description on timeout

gardener · Apr 12, 2024 · 6029cb5 · 6029cb5
1 parent a51eaf9
commit 6029cb5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/backend/lib/services/terminals/index.js b/backend/lib/services/terminals/index.js
@@ -551,9 +551,16 @@ async function readTerminalUntilReady ({ user, namespace, name }) {
     const podName = _.get(terminal, 'status.podName')
     const attachServiceAccountName = _.get(terminal, 'status.attachServiceAccountName')
 
-    return {
-      ok: podName && attachServiceAccountName
+    const isReady = podName && attachServiceAccountName
+    if (!isReady) {
+      const lastErrorDescription = _.get(terminal, 'status.lastError.description')
+      return {
+        ok: false,
+        reason: lastErrorDescription
+      }
     }
+
+    return { ok: true }
   }
   const asyncIterable = await client['dashboard.gardener.cloud'].terminals.watch(namespace, name)
   return asyncIterable.until(isTerminalReady, { timeout: 60 * 1000 })

diff --git a/frontend/src/components/GTerminal.vue b/frontend/src/components/GTerminal.vue
@@ -684,9 +684,6 @@ export default {
         await terminalSession.open()
       } catch (err) {
         let message = get(err, 'response.data.message', err.message)
-        if (isGatewayTimeout(err)) {
-          message = 'Opening the terminal session timed out'
-        }
         this.showErrorSnackbarBottom(message)
         terminalSession.setDisconnectedState()
       }