feat(provider/kubernetes): Show more in the error message

spinnaker · Oct 17, 2017 · e4c852b · e4c852b
1 parent bb69674
commit e4c852b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...oovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiException.java b/...oovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiException.java
@@ -17,8 +17,14 @@
 
 package com.netflix.spinnaker.clouddriver.kubernetes.v2.security;
 
+import io.kubernetes.client.ApiException;
+
 public class KubernetesApiException extends RuntimeException {
   public KubernetesApiException(String operation, Throwable e) {
-    super(operation + " failed: " + e.getMessage(), e);
+    super(String.format("%s failed: %s", operation, e.getMessage()), e);
+  }
+
+  public KubernetesApiException(String operation, ApiException e) {
+    super(String.format("%s failed (%d %s): %s", operation, e.getCode(), e.getMessage(), e.getResponseBody()), e);
   }
 }
diff --git a/...ovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2Credentials.java b/...ovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2Credentials.java
@@ -584,11 +584,12 @@ public V1Service readService(String namespace, String name) {
   private <T> T runAndRecordMetrics(String methodName, String namespace, Supplier<T> op) {
     T result = null;
     Throwable failure = null;
+    KubernetesApiException apiException = null;
     long startTime = clock.monotonicTime();
     try {
       result = op.get();
     } catch (KubernetesApiException e) {
-      failure = e.getCause();
+      apiException = e;
     } catch (Exception e) {
       failure = e;
     } finally {
@@ -608,6 +609,8 @@ private <T> T runAndRecordMetrics(String methodName, String namespace, Supplier<
 
       if (failure != null) {
         throw new KubernetesApiException(methodName, failure);
+      } else if (apiException != null) {
+        throw apiException;
       } else {
         return result;
       }