Use the statusMessage only if there's a failure to get the actual message.

When there's an error, the status message is generated by the http server,
and has a form like "400 Bad Request". If we fail to read the actual message
from the response.body, only then do we actually display the status message.

It's also displayed for unexpected error codes (not 400, 401, or 500), because
there's nothing from the command-server to display.

Signed-off-by: Eric Promislow <[email protected]>

Author: ericpromislow

src/go/rdctl/cmd/root.go

@@ -117,7 +117,8 @@ func doRestOfRequest(req *http.Request) ([]byte, error) {
 	if response.StatusCode < 200 || response.StatusCode >= 300 {
 		switch response.StatusCode {
 		case 400:
-			// Use the error message in the body written by the command-server, not the one from the http server.
+      statusMessage = response.Status
+			// Prefer the error message in the body written by the command-server, not the one from the http server.
 			break
 		case 401:
 			return nil, fmt.Errorf("user/password not accepted")
@@ -137,7 +138,7 @@ func doRestOfRequest(req *http.Request) ([]byte, error) {
 		}
 		return nil, err
 	} else if statusMessage != "" {
-		return nil, fmt.Errorf("%s: %s", statusMessage, string(body))
+		return nil, fmt.Errorf("%s", string(body))
 	}
 
 	return body, nil