Skip to content

Commit 0fcfa81

Browse files
committed
fix: properly work if listing ns is denied (redhat-developer#717)
Signed-off-by: Andre Dietisheim <[email protected]>
1 parent eff7074 commit 0fcfa81

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

Diff for: src/main/kotlin/com/redhat/devtools/intellij/kubernetes/tree/KubernetesDescriptors.kt

+15-7
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
package com.redhat.devtools.intellij.kubernetes.tree
1212

1313
import com.intellij.ide.util.treeView.NodeDescriptor
14+
import com.intellij.openapi.diagnostic.logger
1415
import com.intellij.openapi.project.Project
1516
import com.intellij.openapi.util.IconLoader
1617
import com.redhat.devtools.intellij.kubernetes.model.IResourceModel
1718
import com.redhat.devtools.intellij.kubernetes.model.context.KubernetesContext
1819
import com.redhat.devtools.intellij.kubernetes.model.resource.ResourceKind
1920
import com.redhat.devtools.intellij.kubernetes.model.util.getHighestPriorityVersion
21+
import com.redhat.devtools.intellij.kubernetes.model.util.toMessage
22+
import com.redhat.devtools.intellij.kubernetes.model.util.trimWithEllipsis
2023
import com.redhat.devtools.intellij.kubernetes.tree.AbstractTreeStructureContribution.DescriptorFactory
2124
import com.redhat.devtools.intellij.kubernetes.tree.KubernetesStructure.NamespacesFolder
2225
import com.redhat.devtools.intellij.kubernetes.tree.TreeStructure.ContextDescriptor
@@ -123,14 +126,19 @@ object KubernetesDescriptors {
123126
project
124127
) {
125128
override fun getSubLabel(element: Folder): String {
126-
val current = model.getCurrentNamespace()
127-
return "current: ${
128-
if (current.isNullOrEmpty()) {
129-
"<none>"
130-
} else {
131-
current
129+
val current = try {
130+
model.getCurrentNamespace()
131+
} catch (e: Exception) {
132+
logger<KubernetesDescriptors>().warn("Could not get current namespace", e)
133+
"<none> (error retrieving all namespaces)"
132134
}
133-
}"
135+
return "current: ${
136+
if (current.isNullOrEmpty()) {
137+
"<none>"
138+
} else {
139+
current
140+
}
141+
}"
134142
}
135143
}
136144

0 commit comments

Comments
 (0)