many: switch to use http numeric statuses as agreed (#3486)

- replace http.Status* with well-known numeric values in tests - store: replace http.Status* with well-known numeric values and dont' convert 401 into please buy, atm is just confusing - replace http.Status* with well-known numeric values in retry checks - replace http.Status* with well-known numeric values in fake services - run-check static check - replace http.Status* with well-known numeric values in client and daemon
canonical · Jun 15, 2017 · 1383502 · 1383502
1 parent cd8b523
commit 1383502
Show file tree

Hide file tree

Showing 24 changed files with 206 additions and 191 deletions.
diff --git a/client/asserts.go b/client/asserts.go
@@ -23,7 +23,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"net/http"
 	"net/url"
 	"strconv"
 
@@ -59,7 +58,7 @@ func (client *Client) Known(assertTypeName string, headers map[string]string) ([
 		return nil, fmt.Errorf("failed to query assertions: %v", err)
 	}
 	defer response.Body.Close()
-	if response.StatusCode != http.StatusOK {
+	if response.StatusCode != 200 {
 		return nil, parseError(response)
 	}
 

diff --git a/client/asserts_test.go b/client/asserts_test.go
@@ -72,7 +72,7 @@ func (cs *clientSuite) TestClientAssertsHttpError(c *C) {
 }
 
 func (cs *clientSuite) TestClientAssertsJSONError(c *C) {
-	cs.status = http.StatusBadRequest
+	cs.status = 400
 	cs.header = http.Header{}
 	cs.header.Add("Content-type", "application/json")
 	cs.rsp = `{
@@ -129,7 +129,7 @@ func (cs *clientSuite) TestClientAssertsNoAssertions(c *C) {
 	cs.header = http.Header{}
 	cs.header.Add("X-Ubuntu-Assertions-Count", "0")
 	cs.rsp = ""
-	cs.status = http.StatusOK
+	cs.status = 200
 	a, err := cs.cli.Known("snap-revision", nil)
 	c.Assert(err, IsNil)
 	c.Check(a, HasLen, 0)
@@ -139,7 +139,7 @@ func (cs *clientSuite) TestClientAssertsMissingAssertions(c *C) {
 	cs.header = http.Header{}
 	cs.header.Add("X-Ubuntu-Assertions-Count", "4")
 	cs.rsp = ""
-	cs.status = http.StatusOK
+	cs.status = 200
 	_, err := cs.cli.Known("snap-build", nil)
 	c.Assert(err, ErrorMatches, "response did not have the expected number of assertions")
 }
diff --git a/client/client.go b/client/client.go
@@ -276,7 +276,7 @@ func (client *Client) doAsync(method, path string, query url.Values, headers map
 	if rsp.Type != "async" {
 		return "", fmt.Errorf("expected async response for %q on %q, got %q", method, path, rsp.Type)
 	}
-	if rsp.StatusCode != http.StatusAccepted {
+	if rsp.StatusCode != 202 {
 		return "", fmt.Errorf("operation not accepted")
 	}
 	if rsp.Change == "" {

diff --git a/client/client_test.go b/client/client_test.go
@@ -66,7 +66,7 @@ func (cs *clientSuite) SetUpTest(c *C) {
 	cs.rsps = nil
 	cs.req = nil
 	cs.header = nil
-	cs.status = http.StatusOK
+	cs.status = 200
 	cs.doCalls = 0
 
 	dirs.SetRootDir(c.MkDir())

diff --git a/client/icons.go b/client/icons.go
@@ -22,7 +22,6 @@ package client
 import (
 	"fmt"
 	"io/ioutil"
-	"net/http"
 	"regexp"
 )
 
@@ -42,7 +41,7 @@ func (c *Client) Icon(pkgID string) (*Icon, error) {
 	}
 	defer response.Body.Close()
 
-	if response.StatusCode != http.StatusOK {
+	if response.StatusCode != 200 {
 		return nil, fmt.Errorf("%s: Not Found", errPrefix)
 	}
 

diff --git a/client/icons_test.go b/client/icons_test.go
@@ -44,7 +44,7 @@ func (cs *clientSuite) TestClientIconHttpError(c *C) {
 }
 
 func (cs *clientSuite) TestClientIconResponseNotFound(c *C) {
-	cs.status = http.StatusNotFound
+	cs.status = 404
 	_, err := cs.cli.Icon(pkgID)
 	c.Assert(err, ErrorMatches, `.*Not Found`)
 }

diff --git a/cmd/snap/cmd_snap_op_test.go b/cmd/snap/cmd_snap_op_test.go
@@ -53,7 +53,7 @@ func (t *snapOpTestServer) handle(w http.ResponseWriter, r *http.Request) {
 	case 0:
 		t.checker(r)
 		t.c.Check(r.Method, check.Equals, "POST")
-		w.WriteHeader(http.StatusAccepted)
+		w.WriteHeader(202)
 		fmt.Fprintln(w, `{"type":"async", "change": "42", "status-code": 202}`)
 	case 1:
 		t.c.Check(r.Method, check.Equals, "GET")
@@ -768,7 +768,7 @@ func (s *SnapOpSuite) TestTryClassic(c *check.C) {
 func (s *SnapOpSuite) TestTryNoSnapDirErrors(c *check.C) {
 	s.RedirectClientToTestServer(func(w http.ResponseWriter, r *http.Request) {
 		c.Check(r.Method, check.Equals, "POST")
-		w.WriteHeader(http.StatusAccepted)
+		w.WriteHeader(202)
 		fmt.Fprintln(w, `
 {
   "type": "error",
@@ -895,7 +895,7 @@ func (s *SnapOpSuite) TestRemoveMany(c *check.C) {
 			})
 
 			c.Check(r.Method, check.Equals, "POST")
-			w.WriteHeader(http.StatusAccepted)
+			w.WriteHeader(202)
 			fmt.Fprintln(w, `{"type":"async", "change": "42", "status-code": 202}`)
 		case 1:
 			c.Check(r.Method, check.Equals, "GET")
@@ -947,7 +947,7 @@ func (s *SnapOpSuite) TestInstallMany(c *check.C) {
 			})
 
 			c.Check(r.Method, check.Equals, "POST")
-			w.WriteHeader(http.StatusAccepted)
+			w.WriteHeader(202)
 			fmt.Fprintln(w, `{"type":"async", "change": "42", "status-code": 202}`)
 		case 1:
 			c.Check(r.Method, check.Equals, "GET")

diff --git a/daemon/api.go b/daemon/api.go
@@ -316,7 +316,7 @@ func loginUser(c *Command, r *http.Request, user *auth.UserState) Response {
 				Kind:    errorKindInvalidAuthData,
 				Value:   map[string][]string{"email": {"invalid"}},
 			},
-			Status: http.StatusBadRequest,
+			Status: 400,
 		}, nil)
 	}
 
@@ -329,7 +329,7 @@ func loginUser(c *Command, r *http.Request, user *auth.UserState) Response {
 				Kind:    errorKindTwoFactorRequired,
 				Message: err.Error(),
 			},
-			Status: http.StatusUnauthorized,
+			Status: 401,
 		}, nil)
 	case store.Err2faFailed:
 		return SyncResponse(&resp{
@@ -338,7 +338,7 @@ func loginUser(c *Command, r *http.Request, user *auth.UserState) Response {
 				Kind:    errorKindTwoFactorFailed,
 				Message: err.Error(),
 			},
-			Status: http.StatusUnauthorized,
+			Status: 401,
 		}, nil)
 	default:
 		switch err := err.(type) {
@@ -350,7 +350,7 @@ func loginUser(c *Command, r *http.Request, user *auth.UserState) Response {
 					Kind:    errorKindInvalidAuthData,
 					Value:   err,
 				},
-				Status: http.StatusBadRequest,
+				Status: 400,
 			}, nil)
 		case store.PasswordPolicyError:
 			return SyncResponse(&resp{
@@ -360,7 +360,7 @@ func loginUser(c *Command, r *http.Request, user *auth.UserState) Response {
 					Kind:    errorKindPasswordPolicy,
 					Value:   err,
 				},
-				Status: http.StatusUnauthorized,
+				Status: 401,
 			}, nil)
 		}
 		return Unauthorized(err.Error())
@@ -1126,7 +1126,7 @@ func (inst *snapInstruction) errToResponse(err error) Response {
 	return SyncResponse(&resp{
 		Type:   ResponseTypeError,
 		Result: &errorResult{Message: err.Error(), Kind: kind},
-		Status: http.StatusBadRequest,
+		Status: 400,
 	}, nil)
 }
 
@@ -1208,7 +1208,7 @@ func trySnap(c *Command, r *http.Request, user *auth.UserState, trydir string, f
 				Message: err.Error(),
 				Kind:    errorKindNotSnap,
 			},
-			Status: http.StatusBadRequest,
+			Status: 400,
 		}, nil)
 	}
 	if err != nil {
@@ -1722,7 +1722,7 @@ func doAssert(c *Command, r *http.Request, user *auth.UserState) Response {
 	// TODO: what more info do we want to return on success?
 	return &resp{
 		Type:   ResponseTypeSync,
-		Status: http.StatusOK,
+		Status: 200,
 	}
 }
 
@@ -2212,7 +2212,7 @@ func convertBuyError(err error) Response {
 				Message: err.Error(),
 				Kind:    errorKindLoginRequired,
 			},
-			Status: http.StatusBadRequest,
+			Status: 400,
 		}, nil)
 	case store.ErrTOSNotAccepted:
 		return SyncResponse(&resp{
@@ -2221,7 +2221,7 @@ func convertBuyError(err error) Response {
 				Message: err.Error(),
 				Kind:    errorKindTermsNotAccepted,
 			},
-			Status: http.StatusBadRequest,
+			Status: 400,
 		}, nil)
 	case store.ErrNoPaymentMethods:
 		return SyncResponse(&resp{
@@ -2230,7 +2230,7 @@ func convertBuyError(err error) Response {
 				Message: err.Error(),
 				Kind:    errorKindNoPaymentMethods,
 			},
-			Status: http.StatusBadRequest,
+			Status: 400,
 		}, nil)
 	case store.ErrPaymentDeclined:
 		return SyncResponse(&resp{
@@ -2239,7 +2239,7 @@ func convertBuyError(err error) Response {
 				Message: err.Error(),
 				Kind:    errorKindPaymentDeclined,
 			},
-			Status: http.StatusBadRequest,
+			Status: 400,
 		}, nil)
 	default:
 		return InternalError("%v", err)