fixup! fixup! Add integration tests for Secrets commands

cmoog · cmoog · commit f014a2e1e806 · 2020-07-30T12:38:18.000-05:00
diff --git a/internal/entclient/error.go b/internal/entclient/error.go
@@ -1,6 +1,7 @@
 package entclient
 
 import (
+	"encoding/json"
 	"net/http"
 	"net/http/httputil"
 
@@ -10,10 +11,22 @@ import (
 // ErrNotFound describes an error case in which the requested resource could not be found
 var ErrNotFound = xerrors.Errorf("resource not found")
 
+type apiError struct {
+	Err struct {
+		Msg string `json:"msg,required"`
+	} `json:"error"`
+}
+
 func bodyError(resp *http.Response) error {
 	byt, err := httputil.DumpResponse(resp, false)
 	if err != nil {
 		return xerrors.Errorf("dump response: %w", err)
 	}
-	return xerrors.Errorf("%s\n%s", resp.Request.URL, byt)
+
+	var msg apiError
+	err = json.NewDecoder(resp.Body).Decode(&msg)
+	if err != nil || msg.Err.Msg == "" {
+		return xerrors.Errorf("%s\n%s", resp.Request.URL, byt)
+	}
+	return xerrors.Errorf("%s\n%s%s", resp.Request.URL, byt, msg.Err.Msg)
 }
diff --git a/internal/entclient/request.go b/internal/entclient/request.go
@@ -39,7 +39,7 @@ func (c Client) requestBody(
 	}
 	defer resp.Body.Close()
 
-	if resp.StatusCode != 200 {
+	if resp.StatusCode > 299 {
 		return bodyError(resp)
 	}
 
diff --git a/internal/entclient/secrets.go b/internal/entclient/secrets.go
@@ -59,7 +59,8 @@ type InsertSecretReq struct {
 
 // InsertSecret adds a new secret for the authed user
 func (c *Client) InsertSecret(req InsertSecretReq) error {
-	_, err := c.request(http.MethodPost, "/api/users/me/secrets", req)
+	var resp interface{}
+	err := c.requestBody(http.MethodPost, "/api/users/me/secrets", req, &resp)
 	return err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func (c Client) requestBody(`
`39`	`39`	`}`
`40`	`40`	`defer resp.Body.Close()`
`41`	`41`
`42`		`- if resp.StatusCode != 200 {`
	`42`	`+ if resp.StatusCode > 299 {`
`43`	`43`	`return bodyError(resp)`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ type InsertSecretReq struct {`
`59`	`59`
`60`	`60`	`// InsertSecret adds a new secret for the authed user`
`61`	`61`	`func (c *Client) InsertSecret(req InsertSecretReq) error {`
`62`		`- _, err := c.request(http.MethodPost, "/api/users/me/secrets", req)`
	`62`	`+ var resp interface{}`
	`63`	`+ err := c.requestBody(http.MethodPost, "/api/users/me/secrets", req, &resp)`
`63`	`64`	`return err`
`64`	`65`	`}`
`65`	`66`