From defcea41357b46332ac2edca261d431b587d0064 Mon Sep 17 00:00:00 2001
From: msivasubramaniaan <msivasub@redhat.com>
Date: Thu, 13 Aug 2026 16:07:15 +0530
Subject: [PATCH] Fix DevWorkspace watcher handling for forbidden namespaces

Signed-off-by: msivasubramaniaan <msivasub@redhat.com>
---
 .../devworkspace/DevWorkspaceWatcher.kt       | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/main/kotlin/com/redhat/devtools/gateway/devworkspace/DevWorkspaceWatcher.kt b/src/main/kotlin/com/redhat/devtools/gateway/devworkspace/DevWorkspaceWatcher.kt
index d78a08c9..eb534f53 100644
--- a/src/main/kotlin/com/redhat/devtools/gateway/devworkspace/DevWorkspaceWatcher.kt
+++ b/src/main/kotlin/com/redhat/devtools/gateway/devworkspace/DevWorkspaceWatcher.kt
@@ -14,6 +14,7 @@ package com.redhat.devtools.gateway.devworkspace
 import com.intellij.openapi.application.EDT
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.asContextElement
+import io.kubernetes.client.openapi.ApiException
 import io.kubernetes.client.util.Watch
 import kotlinx.coroutines.*
 
@@ -49,30 +50,41 @@ class DevWorkspaceWatcher(
 
     private suspend fun watchLoop(latestResourceVersion: String? = null) {
         while (scope.isActive && !stopped) {
-            val watcher = createWatcher(namespace, latestResourceVersion)
-            var matches = createFilter(namespace)
-
             try {
-                for (event in watcher) {
-                    if (!scope.isActive || stopped) break
+                val watcher = createWatcher(namespace, latestResourceVersion)
+                try {
+                    var matches = createFilter(namespace)
+                    for (event in watcher) {
+                        if (!scope.isActive || stopped) break
 
-                    val dw = DevWorkspace.from(event.`object`)
-                    if (event.type == "ADDED") {
-                        matches = createFilter(namespace)
-                    }
-                    withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
-                        if (stopped) return@withContext
-                        when (event.type) {
-                            "ADDED"    -> if(matches(dw)) listener.onAdded(dw)
-                            "MODIFIED" -> if(matches(dw)) listener.onUpdated(dw) else listener.onDeleted(dw)
-                            "DELETED"  -> listener.onDeleted(dw)
+                        val dw = DevWorkspace.from(event.`object`)
+                        if (event.type == "ADDED") {
+                            matches = createFilter(namespace)
+                        }
+                        withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
+                            if (stopped) return@withContext
+                            when (event.type) {
+                                "ADDED"    -> if(matches(dw)) listener.onAdded(dw)
+                                "MODIFIED" -> if(matches(dw)) listener.onUpdated(dw) else listener.onDeleted(dw)
+                                "DELETED"  -> listener.onDeleted(dw)
+                            }
                         }
                     }
+                    // connection dropped or closed — reconnect
+                } finally {
+                    watcher.close()
                 }
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: ApiException) {
+                if (e.code == 403 || e.code == 404) {
+                    // User cannot watch this namespace/resource.
+                    return
+                }
+
+                // Other Kubernetes API errors — retry.
             } catch (_: Exception) {
-                // connection dropped or closed — reconnect
-            } finally {
-                watcher.close()
+                // Connection dropped or closed — reconnect.
             }
 
             @Suppress("ConvertLongToDuration")