github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-23 05:37:13 +00:00
Code Issues Projects Releases Wiki Activity

Modify the status code number to HTTP status semantics

Browse Source 
Signed-off-by: clarklee92 <clarklee1992@hotmail.com>

Kubernetes-commit: f86f5ee14ef3c8adf9855ce16dcc57beca949719
This commit is contained in:
clarklee92 2019-11-06 00:45:35 +08:00 committed by Kubernetes Publisher
parent d7ea50d263
commit d3a5e5f798
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/pkg/client/auth/gcp/gcp_test.go
View File

@ -476,25 +476,25 @@ func Test_cmdTokenSource_roundTrip(t *testing.T) {
}{ }{
{ {
"Unauthorized", "Unauthorized",
http.Response{StatusCode: 401}, http.Response{StatusCode: http.StatusUnauthorized},
make(map[string]string), make(map[string]string),
make(map[string]string), make(map[string]string),
}, },
{ {
"Unauthorized, nonempty defaultCache", "Unauthorized, nonempty defaultCache",
http.Response{StatusCode: 401}, http.Response{StatusCode: http.StatusUnauthorized},
cmdCache, cmdCache,
cmdCache, cmdCache,
}, },
{ {
"Authorized", "Authorized",
http.Response{StatusCode: 200}, http.Response{StatusCode: http.StatusOK},
make(map[string]string), make(map[string]string),
simpleCacheUpdated, simpleCacheUpdated,
}, },
{ {
"Authorized, nonempty defaultCache", "Authorized, nonempty defaultCache",
http.Response{StatusCode: 200}, http.Response{StatusCode: http.StatusOK},
cmdCache, cmdCache,
cmdCacheUpdated, cmdCacheUpdated,
}, },

40
rest/request_test.go
View File

@ -515,17 +515,17 @@ func TestTransformResponse(t *testing.T) {
Error bool Error bool
ErrFn func(err error) bool ErrFn func(err error) bool
}{ }{
{Response: &http.Response{StatusCode: 200}, Data: []byte{}}, {Response: &http.Response{StatusCode: http.StatusOK}, Data: []byte{}},
{Response: &http.Response{StatusCode: 201}, Data: []byte{}, Created: true}, {Response: &http.Response{StatusCode: http.StatusCreated}, Data: []byte{}, Created: true},
{Response: &http.Response{StatusCode: 199}, Error: true}, {Response: &http.Response{StatusCode: 199}, Error: true},
{Response: &http.Response{StatusCode: 500}, Error: true}, {Response: &http.Response{StatusCode: http.StatusInternalServerError}, Error: true},
{Response: &http.Response{StatusCode: 422}, Error: true}, {Response: &http.Response{StatusCode: http.StatusUnprocessableEntity}, Error: true},
{Response: &http.Response{StatusCode: 409}, Error: true}, {Response: &http.Response{StatusCode: http.StatusConflict}, Error: true},
{Response: &http.Response{StatusCode: 404}, Error: true}, {Response: &http.Response{StatusCode: http.StatusNotFound}, Error: true},
{Response: &http.Response{StatusCode: 401}, Error: true}, {Response: &http.Response{StatusCode: http.StatusUnauthorized}, Error: true},
{ {
Response: &http.Response{ Response: &http.Response{
StatusCode: 401, StatusCode: http.StatusUnauthorized,
Header: http.Header{"Content-Type": []string{"application/json"}}, Header: http.Header{"Content-Type": []string{"application/json"}},
Body: ioutil.NopCloser(bytes.NewReader(invalid)), Body: ioutil.NopCloser(bytes.NewReader(invalid)),
}, },
@ -536,7 +536,7 @@ func TestTransformResponse(t *testing.T) {
}, },
{ {
Response: &http.Response{ Response: &http.Response{
StatusCode: 401, StatusCode: http.StatusUnauthorized,
Header: http.Header{"Content-Type": []string{"text/any"}}, Header: http.Header{"Content-Type": []string{"text/any"}},
Body: ioutil.NopCloser(bytes.NewReader(invalid)), Body: ioutil.NopCloser(bytes.NewReader(invalid)),
}, },
@ -545,9 +545,9 @@ func TestTransformResponse(t *testing.T) {
return strings.Contains(err.Error(), "server has asked for the client to provide") && apierrors.IsUnauthorized(err) return strings.Contains(err.Error(), "server has asked for the client to provide") && apierrors.IsUnauthorized(err)
}, },
}, },
{Response: &http.Response{StatusCode: 403}, Error: true}, {Response: &http.Response{StatusCode: http.StatusForbidden}, Error: true},
{Response: &http.Response{StatusCode: 200, Body: ioutil.NopCloser(bytes.NewReader(invalid))}, Data: invalid}, {Response: &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(bytes.NewReader(invalid))}, Data: invalid},
{Response: &http.Response{StatusCode: 200, Body: ioutil.NopCloser(bytes.NewReader(invalid))}, Data: invalid}, {Response: &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(bytes.NewReader(invalid))}, Data: invalid},
} }
for i, test := range testCases { for i, test := range testCases {
r := NewRequest(nil, "", uri, "", defaultContentConfig(), defaultSerializers(t), nil, nil, 0) r := NewRequest(nil, "", uri, "", defaultContentConfig(), defaultSerializers(t), nil, nil, 0)
@ -615,7 +615,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
{ {
ContentType: "application/json", ContentType: "application/json",
Response: &http.Response{ Response: &http.Response{
StatusCode: 401, StatusCode: http.StatusUnauthorized,
Header: http.Header{"Content-Type": []string{"application/json"}}, Header: http.Header{"Content-Type": []string{"application/json"}},
Body: ioutil.NopCloser(bytes.NewReader(invalid)), Body: ioutil.NopCloser(bytes.NewReader(invalid)),
}, },
@ -627,7 +627,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
{ {
ContentType: "application/json", ContentType: "application/json",
Response: &http.Response{ Response: &http.Response{
StatusCode: 401, StatusCode: http.StatusUnauthorized,
Header: http.Header{"Content-Type": []string{"application/protobuf"}}, Header: http.Header{"Content-Type": []string{"application/protobuf"}},
Body: ioutil.NopCloser(bytes.NewReader(invalid)), Body: ioutil.NopCloser(bytes.NewReader(invalid)),
}, },
@ -644,7 +644,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
{ {
ContentType: "application/json", ContentType: "application/json",
Response: &http.Response{ Response: &http.Response{
StatusCode: 500, StatusCode: http.StatusInternalServerError,
Header: http.Header{"Content-Type": []string{"application/,others"}}, Header: http.Header{"Content-Type": []string{"application/,others"}},
}, },
Decoder: scheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), Decoder: scheme.Codecs.LegacyCodec(v1.SchemeGroupVersion),
@ -657,7 +657,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
{ {
// no negotiation when no content type specified // no negotiation when no content type specified
Response: &http.Response{ Response: &http.Response{
StatusCode: 200, StatusCode: http.StatusOK,
Header: http.Header{"Content-Type": []string{"text/any"}}, Header: http.Header{"Content-Type": []string{"text/any"}},
Body: ioutil.NopCloser(bytes.NewReader(invalid)), Body: ioutil.NopCloser(bytes.NewReader(invalid)),
}, },
@ -667,7 +667,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
// no negotiation when no response content type specified // no negotiation when no response content type specified
ContentType: "text/any", ContentType: "text/any",
Response: &http.Response{ Response: &http.Response{
StatusCode: 200, StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(invalid)), Body: ioutil.NopCloser(bytes.NewReader(invalid)),
}, },
Decoder: scheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), Decoder: scheme.Codecs.LegacyCodec(v1.SchemeGroupVersion),
@ -676,7 +676,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
// unrecognized content type is not handled // unrecognized content type is not handled
ContentType: "application/json", ContentType: "application/json",
Response: &http.Response{ Response: &http.Response{
StatusCode: 404, StatusCode: http.StatusNotFound,
Header: http.Header{"Content-Type": []string{"application/unrecognized"}}, Header: http.Header{"Content-Type": []string{"application/unrecognized"}},
Body: ioutil.NopCloser(bytes.NewReader(invalid)), Body: ioutil.NopCloser(bytes.NewReader(invalid)),
}, },
@ -1178,7 +1178,7 @@ func (f *fakeUpgradeRoundTripper) RoundTrip(req *http.Request) (*http.Response,
b := []byte{} b := []byte{}
body := ioutil.NopCloser(bytes.NewReader(b)) body := ioutil.NopCloser(bytes.NewReader(b))
resp := &http.Response{ resp := &http.Response{
StatusCode: 101, StatusCode: http.StatusSwitchingProtocols,
Body: body, Body: body,
} }
return resp, nil return resp, nil
@ -1367,7 +1367,7 @@ func TestConnectionResetByPeerIsRetried(t *testing.T) {
count++ count++
if count >= 3 { if count >= 3 {
return &http.Response{ return &http.Response{
StatusCode: 200, StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader([]byte{})), Body: ioutil.NopCloser(bytes.NewReader([]byte{})),
}, nil }, nil
} }

6
scale/client_test.go
View File

@ -180,7 +180,7 @@ func fakeScaleClient(t *testing.T) (ScalesGetter, []schema.GroupResource) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &http.Response{StatusCode: 200, Header: defaultHeaders(), Body: bytesBody(res)}, nil return &http.Response{StatusCode: http.StatusOK, Header: defaultHeaders(), Body: bytesBody(res)}, nil
case "PUT": case "PUT":
decoder := codecs.UniversalDeserializer() decoder := codecs.UniversalDeserializer()
body, err := ioutil.ReadAll(req.Body) body, err := ioutil.ReadAll(req.Body)
@ -198,7 +198,7 @@ func fakeScaleClient(t *testing.T) (ScalesGetter, []schema.GroupResource) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &http.Response{StatusCode: 200, Header: defaultHeaders(), Body: bytesBody(res)}, nil return &http.Response{StatusCode: http.StatusOK, Header: defaultHeaders(), Body: bytesBody(res)}, nil
case "PATCH": case "PATCH":
body, err := ioutil.ReadAll(req.Body) body, err := ioutil.ReadAll(req.Body)
if err != nil { if err != nil {
@ -229,7 +229,7 @@ func fakeScaleClient(t *testing.T) (ScalesGetter, []schema.GroupResource) {
default: default:
return nil, fmt.Errorf("invalid patch type") return nil, fmt.Errorf("invalid patch type")
} }
return &http.Response{StatusCode: 200, Header: defaultHeaders(), Body: bytesBody(res)}, nil return &http.Response{StatusCode: http.StatusOK, Header: defaultHeaders(), Body: bytesBody(res)}, nil
default: default:
return nil, fmt.Errorf("unexpected request for URL %q with method %q", req.URL.String(), req.Method) return nil, fmt.Errorf("unexpected request for URL %q with method %q", req.URL.String(), req.Method)
} }