Refactors kube client error status handling

zalando-incubator · May 5, 2022 · f6c9c81 · f6c9c81
1 parent 23211fc
commit f6c9c81
Showing 1 changed file with 19 additions and 23 deletions.
diff --git a/kubernetes/client.go b/kubernetes/client.go
@@ -115,11 +115,7 @@ func (c *simpleClient) get(resource string) (io.ReadCloser, error) {
 	if resp.StatusCode == http.StatusForbidden {
 		return nil, ErrNoPermissionToAccessResource
 	}
-	b, err := io.ReadAll(resp.Body)
-	if err == nil {
-		err = fmt.Errorf("unexpected status code (%s) for GET %q: %s", http.StatusText(resp.StatusCode), resource, b)
-	}
-	return nil, err
+	return unexpectedStatusError(req, resp)
 }
 
 func (c *simpleClient) patch(resource string, payload []byte) (io.ReadCloser, error) {
@@ -132,17 +128,13 @@ func (c *simpleClient) patch(resource string, payload []byte) (io.ReadCloser, er
 	if err != nil {
 		return nil, err
 	}
-	if resp.StatusCode != http.StatusOK {
-		var err error
-		b, err := io.ReadAll(resp.Body)
-		if err == nil {
-			err = fmt.Errorf("unexpected status code (%s) for PATCH %q: %s", http.StatusText(resp.StatusCode), resource, b)
-		}
 
-		resp.Body.Close()
-		return io.NopCloser(bytes.NewBuffer(b)), err
+	if resp.StatusCode == http.StatusOK {
+		return resp.Body, nil
 	}
-	return resp.Body, nil
+	defer resp.Body.Close()
+
+	return unexpectedStatusError(req, resp)
 }
 
 func (c *simpleClient) post(resource string, payload []byte) (io.ReadCloser, error) {
@@ -155,17 +147,13 @@ func (c *simpleClient) post(resource string, payload []byte) (io.ReadCloser, err
 	if err != nil {
 		return nil, err
 	}
-	if resp.StatusCode != http.StatusCreated {
-		var err error
-		b, err := io.ReadAll(resp.Body)
-		if err == nil {
-			err = fmt.Errorf("unexpected status code (%s) for POST %q: %s", http.StatusText(resp.StatusCode), resource, b)
-		}
 
-		resp.Body.Close()
-		return io.NopCloser(bytes.NewBuffer(b)), err
+	if resp.StatusCode == http.StatusCreated {
+		return resp.Body, nil
 	}
-	return resp.Body, nil
+	defer resp.Body.Close()
+
+	return unexpectedStatusError(req, resp)
 }
 
 func (c *simpleClient) createRequest(method, resource string, body io.Reader) (*http.Request, error) {
@@ -227,3 +215,11 @@ func (a *Adapter) NewInclusterConfigClientset(ctx context.Context) error {
 	a.clientset, err = kubernetes.NewForConfig(cfg)
 	return err
 }
+
+func unexpectedStatusError(req *http.Request, resp *http.Response) (io.ReadCloser, error) {
+	b, err := io.ReadAll(resp.Body)
+	if err == nil {
+		err = fmt.Errorf("unexpected status code (%s) for %s %q: %s", http.StatusText(resp.StatusCode), req.Method, req.URL.Path, b)
+	}
+	return io.NopCloser(bytes.NewBuffer(b)), err
+}