Don't swallow duplicate key error (cli#4807)

despreston · web-flow · commit bdd95e11ab49 · 2021-11-25T13:22:42.000+01:00
diff --git a/pkg/cmd/ssh-key/add/http.go b/pkg/cmd/ssh-key/add/http.go
@@ -3,7 +3,6 @@ package add
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -42,12 +41,7 @@ func SSHKeyUpload(httpClient *http.Client, hostname string, keyFile io.Reader, t
 	defer resp.Body.Close()
 
 	if resp.StatusCode > 299 {
-		var httpError api.HTTPError
-		err := api.HandleHTTPError(resp)
-		if errors.As(err, &httpError) && isDuplicateError(&httpError) {
-			return nil
-		}
-		return err
+		return api.HandleHTTPError(resp)
 	}
 
 	_, err = io.Copy(ioutil.Discard, resp.Body)
@@ -57,8 +51,3 @@ func SSHKeyUpload(httpClient *http.Client, hostname string, keyFile io.Reader, t
 
 	return nil
 }
-
-func isDuplicateError(err *api.HTTPError) bool {
-	return err.StatusCode == 422 && len(err.Errors) == 1 &&
-		err.Errors[0].Field == "key" && err.Errors[0].Message == "key is already in use"
-}
