Skip to content

use const for Common HTTP methods and HTTP status codes #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 26, 2017
Merged

use const for Common HTTP methods and HTTP status codes #58

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8564b86
use const for Common HTTP methods and HTTP status codes
chemidy Dec 26, 2017
c48145c
fix format verbs %q to %d
chemidy Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"encoding/pem"
"errors"
"fmt"
"net/http"
"strings"

"firebase.google.com/go/internal"
Expand Down Expand Up @@ -131,7 +132,7 @@ func NewClient(ctx context.Context, c *internal.AuthConfig) (*Client, error) {
func (c *Client) makeHTTPCall(ctx context.Context, serviceName string, payload interface{}, result interface{}) error {
versionHeader := internal.WithHeader("X-Client-Version", c.version)
request := &internal.Request{
Method: "POST",
Method: http.MethodPost,
URL: c.url + serviceName,
Body: internal.NewJSONEntity(payload),
Opts: []internal.HTTPOption{versionHeader},
Expand All @@ -140,7 +141,7 @@ func (c *Client) makeHTTPCall(ctx context.Context, serviceName string, payload i
if err != nil {
return err
}
return resp.Unmarshal(200, result)
return resp.Unmarshal(http.StatusOK, result)
}

// CustomToken creates a signed custom authentication token with the specified user ID. The resulting
Expand Down
2 changes: 1 addition & 1 deletion auth/crypto_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func newTestHTTPClient(data []byte) (*http.Client, *mockReadCloser) {
Transport: &mockHTTPResponse{
Response: http.Response{
Status: "200 OK",
StatusCode: 200,
StatusCode: http.StatusOK,
Header: http.Header{
"Cache-Control": {"public, max-age=100"},
},
Expand Down
2 changes: 1 addition & 1 deletion auth/user_mgt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ func TestMakeExportedUser(t *testing.T) {
func TestHTTPError(t *testing.T) {
s := echoServer([]byte(`{"error":"test"}`), t)
defer s.Close()
s.Status = 500
s.Status = http.StatusInternalServerError

u, err := s.Client.GetUser(context.Background(), "some uid")
if u != nil || err == nil {
Expand Down
8 changes: 4 additions & 4 deletions firebase_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ func TestClientOptions(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if resp.StatusCode != 200 {
t.Errorf("Status: %d; want: 200", resp.StatusCode)
if resp.StatusCode != http.StatusOK {
t.Errorf("Status: %d; want: %q", resp.StatusCode, http.StatusOK)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

want: %d

}
if bearer != "Bearer mock-token" {
t.Errorf("Bearer token: %q; want: %q", bearer, "Bearer mock-token")
Expand Down Expand Up @@ -318,8 +318,8 @@ func TestCustomTokenSource(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if resp.StatusCode != 200 {
t.Errorf("Status: %d; want: 200", resp.StatusCode)
if resp.StatusCode != http.StatusOK {
t.Errorf("Status: %d; want: %d", resp.StatusCode, http.StatusOK)
}
if bearer != "Bearer "+ts.AccessToken {
t.Errorf("Bearer token: %q; want: %q", bearer, "Bearer "+ts.AccessToken)
Expand Down
18 changes: 9 additions & 9 deletions iid/iid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ import (
const iidEndpoint = "https://console.firebase.google.com/v1"

var errorCodes = map[int]string{
400: "malformed instance id argument",
401: "request not authorized",
403: "project does not match instance ID or the client does not have sufficient privileges",
404: "failed to find the instance id",
409: "already deleted",
429: "request throttled out by the backend server",
500: "internal server error",
503: "backend servers are over capacity",
http.StatusBadRequest: "malformed instance id argument",
http.StatusUnauthorized: "request not authorized",
http.StatusForbidden: "project does not match instance ID or the client does not have sufficient privileges",
http.StatusNotFound: "failed to find the instance id",
http.StatusConflict: "already deleted",
http.StatusTooManyRequests: "request throttled out by the backend server",
http.StatusInternalServerError: "internal server error",
http.StatusServiceUnavailable: "backend servers are over capacity",
}

// Client is the interface for the Firebase Instance ID service.
Expand Down Expand Up @@ -79,7 +79,7 @@ func (c *Client) DeleteInstanceID(ctx context.Context, iid string) error {
}

url := fmt.Sprintf("%s/project/%s/instanceId/%s", c.endpoint, c.project, iid)
resp, err := c.client.Do(ctx, &internal.Request{Method: "DELETE", URL: url})
resp, err := c.client.Do(ctx, &internal.Request{Method: http.MethodDelete, URL: url})
if err != nil {
return err
}
Expand Down
14 changes: 7 additions & 7 deletions iid/iid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ func TestDeleteInstanceID(t *testing.T) {
if tr == nil {
t.Fatalf("Request = nil; want non-nil")
}
if tr.Method != "DELETE" {
t.Errorf("Method = %q; want = %q", tr.Method, "DELETE")
if tr.Method != http.MethodDelete {
t.Errorf("Method = %q; want = %q", tr.Method, http.MethodDelete)
}
if tr.URL.Path != "/project/test-project/instanceId/test-iid" {
t.Errorf("Path = %q; want = %q", tr.URL.Path, "/project/test-project/instanceId/test-iid")
Expand All @@ -87,7 +87,7 @@ func TestDeleteInstanceID(t *testing.T) {
}

func TestDeleteInstanceIDError(t *testing.T) {
status := 200
status := http.StatusOK
var tr *http.Request
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
tr = r
Expand Down Expand Up @@ -119,8 +119,8 @@ func TestDeleteInstanceIDError(t *testing.T) {
if tr == nil {
t.Fatalf("Request = nil; want non-nil")
}
if tr.Method != "DELETE" {
t.Errorf("Method = %q; want = %q", tr.Method, "DELETE")
if tr.Method != http.MethodDelete {
t.Errorf("Method = %q; want = %q", tr.Method, http.MethodDelete)
}
if tr.URL.Path != "/project/test-project/instanceId/test-iid" {
t.Errorf("Path = %q; want = %q", tr.URL.Path, "/project/test-project/instanceId/test-iid")
Expand Down Expand Up @@ -162,8 +162,8 @@ func TestDeleteInstanceIDUnexpectedError(t *testing.T) {
if tr == nil {
t.Fatalf("Request = nil; want non-nil")
}
if tr.Method != "DELETE" {
t.Errorf("Method = %q; want = %q", tr.Method, "DELETE")
if tr.Method != http.MethodDelete {
t.Errorf("Method = %q; want = %q", tr.Method, http.MethodDelete)
}
if tr.URL.Path != "/project/test-project/instanceId/test-iid" {
t.Errorf("Path = %q; want = %q", tr.URL.Path, "/project/test-project/instanceId/test-iid")
Expand Down
2 changes: 1 addition & 1 deletion integration/auth/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func postRequest(url string, req []byte) ([]byte, error) {
}

defer resp.Body.Close()
if resp.StatusCode != 200 {
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("unexpected http status code: %d", resp.StatusCode)
}
return ioutil.ReadAll(resp.Body)
Expand Down
30 changes: 15 additions & 15 deletions internal/http_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,61 +33,61 @@ var cases = []struct {
}{
{
req: &Request{
Method: "GET",
Method: http.MethodGet,
},
method: "GET",
method: http.MethodGet,
},
{
req: &Request{
Method: "GET",
Method: http.MethodGet,
Opts: []HTTPOption{
WithHeader("Test-Header", "value1"),
WithQueryParam("testParam", "value2"),
},
},
method: "GET",
method: http.MethodGet,
headers: map[string]string{"Test-Header": "value1"},
query: map[string]string{"testParam": "value2"},
},
{
req: &Request{
Method: "POST",
Method: http.MethodPost,
Body: NewJSONEntity(map[string]string{"foo": "bar"}),
Opts: []HTTPOption{
WithHeader("Test-Header", "value1"),
WithQueryParam("testParam1", "value2"),
WithQueryParam("testParam2", "value3"),
},
},
method: "POST",
method: http.MethodPost,
body: "{\"foo\":\"bar\"}",
headers: map[string]string{"Test-Header": "value1"},
query: map[string]string{"testParam1": "value2", "testParam2": "value3"},
},
{
req: &Request{
Method: "POST",
Method: http.MethodPost,
Body: NewJSONEntity("body"),
Opts: []HTTPOption{
WithHeader("Test-Header", "value1"),
WithQueryParams(map[string]string{"testParam1": "value2", "testParam2": "value3"}),
},
},
method: "POST",
method: http.MethodPost,
body: "\"body\"",
headers: map[string]string{"Test-Header": "value1"},
query: map[string]string{"testParam1": "value2", "testParam2": "value3"},
},
{
req: &Request{
Method: "PUT",
Method: http.MethodPut,
Body: NewJSONEntity(nil),
Opts: []HTTPOption{
WithHeader("Test-Header", "value1"),
WithQueryParams(map[string]string{"testParam1": "value2", "testParam2": "value3"}),
},
},
method: "PUT",
method: http.MethodPut,
body: "null",
headers: map[string]string{"Test-Header": "value1"},
query: map[string]string{"testParam1": "value2", "testParam2": "value3"},
Expand Down Expand Up @@ -184,7 +184,7 @@ func TestContext(t *testing.T) {
client := &HTTPClient{Client: http.DefaultClient}
ctx, cancel := context.WithCancel(context.Background())
resp, err := client.Do(ctx, &Request{
Method: "GET",
Method: http.MethodGet,
URL: server.URL,
})
if err != nil {
Expand All @@ -196,7 +196,7 @@ func TestContext(t *testing.T) {

cancel()
resp, err = client.Do(ctx, &Request{
Method: "GET",
Method: http.MethodGet,
URL: server.URL,
})
if resp != nil || err == nil {
Expand Down Expand Up @@ -234,7 +234,7 @@ func TestErrorParser(t *testing.T) {
Client: http.DefaultClient,
ErrParser: ep,
}
req := &Request{Method: "GET", URL: server.URL}
req := &Request{Method: http.MethodGet, URL: server.URL}
resp, err := client.Do(context.Background(), req)
if err != nil {
t.Fatal(err)
Expand All @@ -255,7 +255,7 @@ func TestErrorParser(t *testing.T) {

func TestInvalidURL(t *testing.T) {
req := &Request{
Method: "GET",
Method: http.MethodGet,
URL: "http://localhost:250/mock.url",
}
client := &HTTPClient{Client: http.DefaultClient}
Expand All @@ -281,7 +281,7 @@ func TestUnmarshalError(t *testing.T) {
server := httptest.NewServer(handler)
defer server.Close()

req := &Request{Method: "GET", URL: server.URL}
req := &Request{Method: http.MethodGet, URL: server.URL}
client := &HTTPClient{Client: http.DefaultClient}
resp, err := client.Do(context.Background(), req)
if err != nil {
Expand Down