improving k8s.py error messaging

Signed-off-by: Michael Haigh <mhaigh@netapp.com>
NetApp · Apr 17, 2024 · 5348330 · 5348330
1 parent 9a7664b
commit 5348330
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/astraSDK/common.py b/astraSDK/common.py
@@ -323,6 +323,15 @@ def notInstalled(self, path):
         )
         raise SystemExit()
 
+    def printKubeError(self, e):
+        if hasattr(e, "body"):
+            e.text = e.body
+            self.printError(e)
+        elif hasattr(e, "reason"):
+            self.printError(e.reason)
+        else:
+            self.printError(e)
+
     class WriteVerbose:
         def __init__(self):
             self.content = []

diff --git a/astraSDK/k8s.py b/astraSDK/k8s.py
@@ -94,7 +94,7 @@ def main(
             sys.stdout = sys.__stdout__
             if hasattr(e, "status") and e.status == 404 and e.reason == "Not Found":
                 self.notInstalled(f"/apis/{group}/{version}/namespaces/{namespace}/{plural}")
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
     def formatPrint(self, resp, plural, quiet=None, output=None, verbose=None):
         if quiet is None:
@@ -148,7 +148,7 @@ def getTableInfo(self, plural, headers=False):
                     "status",
                 ]
             return [
-                "status.observedSpec.natsSyncClient.cloudBridgeURL",
+                "spec.natsSyncClient.cloudBridgeURL",
                 "status.natsSyncClient.registered",
                 "status.natsSyncClient.astraClusterID",
                 "status.natsSyncClient.astraConnectorID",
@@ -336,11 +336,11 @@ def main(
             sys.stdout = sys.__stdout__
             if hasattr(e, "status") and e.status == 404 and e.reason == "Not Found":
                 self.notInstalled(f"/apis/{group}/{version}/{plural}")
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
 
 class createResource(KubeCommon):
-    """Creates a cluster scoped Custom Resource"""
+    """Creates a namespace scoped Custom Resource"""
 
     def __init__(
         self, quiet=True, dry_run=False, verbose=False, config_context=None, skip_tls_verify=False
@@ -397,11 +397,11 @@ def main(
             sys.stdout = sys.__stdout__
             if hasattr(e, "status") and e.status == 404 and e.reason == "Not Found":
                 self.notInstalled(f"/apis/{group}/{version}/namespaces/{namespace}/{plural}")
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
 
 class destroyResource(KubeCommon):
-    """Destroys a cluster scoped Custom Resource"""
+    """Destroys a namespace scoped Custom Resource"""
 
     def __init__(
         self, quiet=True, dry_run=False, verbose=False, config_context=None, skip_tls_verify=False
@@ -458,7 +458,7 @@ def main(
             sys.stdout = sys.__stdout__
             if hasattr(e, "status") and e.status == 404 and e.reason == "Not Found":
                 self.notInstalled(f"/apis/{group}/{version}/namespaces/{namespace}/{plural}")
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
 
 class updateClusterResource(KubeCommon):
@@ -512,7 +512,7 @@ def main(
             sys.stdout = sys.__stdout__
             if hasattr(e, "status") and e.status == 404 and e.reason == "Not Found":
                 self.notInstalled(f"/apis/{group}/{version}/{plural}")
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
 
 class getNamespaces(KubeCommon):
@@ -603,7 +603,7 @@ def main(self, systemNS=None, nameFilter=None, unassociated=False, minuteFilter=
 
         except (kubernetes.client.rest.ApiException, urllib3.exceptions.MaxRetryError) as e:
             sys.stdout = sys.__stdout__
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
 
 class getSecrets(KubeCommon):
@@ -659,7 +659,7 @@ def main(self, namespace="astra-connector"):
 
         except (kubernetes.client.rest.ApiException, urllib3.exceptions.MaxRetryError) as e:
             sys.stdout = sys.__stdout__
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
 
 class destroySecret(KubeCommon):
@@ -708,7 +708,7 @@ def main(self, name, namespace="astra-connector"):
 
         except (kubernetes.client.rest.ApiException, urllib3.exceptions.MaxRetryError) as e:
             sys.stdout = sys.__stdout__
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
 
 class getStorageClasses(KubeCommon):
@@ -754,7 +754,7 @@ def main(self):
 
         except (kubernetes.client.rest.ApiException, urllib3.exceptions.MaxRetryError) as e:
             sys.stdout = sys.__stdout__
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
 
 class createV1Secret(KubeCommon):
@@ -802,7 +802,7 @@ def main(self, v1SecretObj, namespace="astra-connector"):
             return resp
         except (kubernetes.client.rest.ApiException, urllib3.exceptions.MaxRetryError) as e:
             sys.stdout = sys.__stdout__
-            self.printError(e.reason) if hasattr(e, "reason") else self.printError(e)
+            self.printKubeError(e)
 
 
 class createRegCred(KubeCommon, SDKCommon):