From 50a2c4c6438f80e12e8302edf6d0bd0d7f83770f Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 8 Oct 2015 18:30:38 -0700 Subject: [PATCH] grep-sed --- pkg/apiserver/apiserver.go | 2 +- pkg/client/cache/listwatch_test.go | 4 ++-- pkg/client/unversioned/client.go | 6 +++--- pkg/client/unversioned/client_test.go | 8 ++++---- pkg/client/unversioned/events_test.go | 4 ++-- pkg/client/unversioned/experimental.go | 4 ++-- pkg/client/unversioned/helper_blackbox_test.go | 4 ++-- pkg/client/unversioned/nodes_test.go | 2 +- pkg/client/unversioned/pods_test.go | 2 +- pkg/client/unversioned/request.go | 4 ++-- pkg/client/unversioned/request_test.go | 4 ++-- pkg/client/unversioned/services_test.go | 2 +- pkg/client/unversioned/testclient/testclient.go | 4 ++-- pkg/kubectl/cmd/apiversions.go | 2 +- pkg/kubectl/cmd/delete_test.go | 4 ++-- pkg/kubectl/cmd/get_test.go | 4 ++-- pkg/kubectl/resource/builder_test.go | 6 +++--- pkg/kubectl/resource/helper_test.go | 2 +- test/e2e/kubectl.go | 4 ++-- 19 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 4314e0d1320..fa0b612bf10 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -307,7 +307,7 @@ func handleVersion(req *restful.Request, resp *restful.Response) { func APIVersionHandler(versions ...string) restful.RouteFunction { return func(req *restful.Request, resp *restful.Response) { // TODO: use restful's Response methods - writeRawJSON(http.StatusOK, api.APIVersions{Versions: versions}, resp.ResponseWriter) + writeRawJSON(http.StatusOK, unversioned.APIVersions{Versions: versions}, resp.ResponseWriter) } } diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index 4b31bce981d..c24fe2613c7 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/pkg/client/cache/listwatch_test.go @@ -54,7 +54,7 @@ func buildLocation(resourcePath string, query url.Values) string { } func TestListWatchesCanList(t *testing.T) { - fieldSelectorQueryParamName := api.FieldSelectorQueryParam(testapi.Default.Version()) + fieldSelectorQueryParamName := unversioned.FieldSelectorQueryParam(testapi.Default.Version()) table := []struct { location string resource string @@ -104,7 +104,7 @@ func TestListWatchesCanList(t *testing.T) { } func TestListWatchesCanWatch(t *testing.T) { - fieldSelectorQueryParamName := api.FieldSelectorQueryParam(testapi.Default.Version()) + fieldSelectorQueryParamName := unversioned.FieldSelectorQueryParam(testapi.Default.Version()) table := []struct { rv string location string diff --git a/pkg/client/unversioned/client.go b/pkg/client/unversioned/client.go index c1b7139513f..71d82550f33 100644 --- a/pkg/client/unversioned/client.go +++ b/pkg/client/unversioned/client.go @@ -116,7 +116,7 @@ func (c *Client) ComponentStatuses() ComponentStatusInterface { // VersionInterface has a method to retrieve the server version. type VersionInterface interface { ServerVersion() (*version.Info, error) - ServerAPIVersions() (*api.APIVersions, error) + ServerAPIVersions() (*unversioned.APIVersions, error) } // APIStatus is exposed by errors that can be converted to an api.Status object @@ -146,12 +146,12 @@ func (c *Client) ServerVersion() (*version.Info, error) { } // ServerAPIVersions retrieves and parses the list of API versions the server supports. -func (c *Client) ServerAPIVersions() (*api.APIVersions, error) { +func (c *Client) ServerAPIVersions() (*unversioned.APIVersions, error) { body, err := c.Get().UnversionedPath("").Do().Raw() if err != nil { return nil, err } - var v api.APIVersions + var v unversioned.APIVersions err = json.Unmarshal(body, &v) if err != nil { return nil, fmt.Errorf("got '%s': %v", string(body), err) diff --git a/pkg/client/unversioned/client_test.go b/pkg/client/unversioned/client_test.go index 5eec4ffca8a..8c6d97d056a 100644 --- a/pkg/client/unversioned/client_test.go +++ b/pkg/client/unversioned/client_test.go @@ -149,9 +149,9 @@ func (c *testClient) ValidateCommon(t *testing.T, err error) { validator, ok := c.QueryValidator[key] if !ok { switch key { - case api.LabelSelectorQueryParam(testapi.Default.Version()): + case unversioned.LabelSelectorQueryParam(testapi.Default.Version()): validator = validateLabels - case api.FieldSelectorQueryParam(testapi.Default.Version()): + case unversioned.FieldSelectorQueryParam(testapi.Default.Version()): validator = validateFields default: validator = func(a, b string) bool { return a == b } @@ -272,7 +272,7 @@ func TestGetServerVersion(t *testing.T) { func TestGetServerAPIVersions(t *testing.T) { versions := []string{"v1", "v2", "v3"} - expect := api.APIVersions{Versions: versions} + expect := unversioned.APIVersions{Versions: versions} server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { output, err := json.Marshal(expect) if err != nil { @@ -300,7 +300,7 @@ func swaggerSchemaFakeServer() (*httptest.Server, error) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { var resp interface{} if request == 1 { - resp = api.APIVersions{Versions: []string{"v1", "v2", "v3"}} + resp = unversioned.APIVersions{Versions: []string{"v1", "v2", "v3"}} request++ } else { resp = swagger.ApiDeclaration{} diff --git a/pkg/client/unversioned/events_test.go b/pkg/client/unversioned/events_test.go index 33171e04db4..40ec6996374 100644 --- a/pkg/client/unversioned/events_test.go +++ b/pkg/client/unversioned/events_test.go @@ -34,12 +34,12 @@ func TestEventSearch(t *testing.T) { Method: "GET", Path: testapi.Default.ResourcePath("events", "baz", ""), Query: url.Values{ - api.FieldSelectorQueryParam(testapi.Default.Version()): []string{ + unversioned.FieldSelectorQueryParam(testapi.Default.Version()): []string{ getInvolvedObjectNameFieldLabel(testapi.Default.Version()) + "=foo,", "involvedObject.namespace=baz,", "involvedObject.kind=Pod", }, - api.LabelSelectorQueryParam(testapi.Default.Version()): []string{}, + unversioned.LabelSelectorQueryParam(testapi.Default.Version()): []string{}, }, }, Response: Response{StatusCode: 200, Body: &api.EventList{}}, diff --git a/pkg/client/unversioned/experimental.go b/pkg/client/unversioned/experimental.go index 03d90d033a2..13b0bf76a48 100644 --- a/pkg/client/unversioned/experimental.go +++ b/pkg/client/unversioned/experimental.go @@ -63,12 +63,12 @@ func (c *ExperimentalClient) ServerVersion() (*version.Info, error) { // ServerAPIVersions retrieves and parses the list of experimental API versions the // server supports. -func (c *ExperimentalClient) ServerAPIVersions() (*api.APIVersions, error) { +func (c *ExperimentalClient) ServerAPIVersions() (*unversioned.APIVersions, error) { body, err := c.Get().UnversionedPath("").Do().Raw() if err != nil { return nil, err } - var v api.APIVersions + var v unversioned.APIVersions err = json.Unmarshal(body, &v) if err != nil { return nil, fmt.Errorf("got '%s': %v", string(body), err) diff --git a/pkg/client/unversioned/helper_blackbox_test.go b/pkg/client/unversioned/helper_blackbox_test.go index 5a1309e869a..9c0bc63cdbe 100644 --- a/pkg/client/unversioned/helper_blackbox_test.go +++ b/pkg/client/unversioned/helper_blackbox_test.go @@ -90,10 +90,10 @@ func TestNegotiateVersion(t *testing.T) { Codec: codec, Resp: &http.Response{ StatusCode: 200, - Body: objBody(&api.APIVersions{Versions: test.serverVersions}), + Body: objBody(&unversioned.APIVersions{Versions: test.serverVersions}), }, Client: fake.HTTPClientFunc(func(req *http.Request) (*http.Response, error) { - return &http.Response{StatusCode: 200, Body: objBody(&api.APIVersions{Versions: test.serverVersions})}, nil + return &http.Response{StatusCode: 200, Body: objBody(&unversioned.APIVersions{Versions: test.serverVersions})}, nil }), } c := unversioned.NewOrDie(test.config) diff --git a/pkg/client/unversioned/nodes_test.go b/pkg/client/unversioned/nodes_test.go index 81124cdfe12..96d67d64174 100644 --- a/pkg/client/unversioned/nodes_test.go +++ b/pkg/client/unversioned/nodes_test.go @@ -45,7 +45,7 @@ func TestListNodes(t *testing.T) { } func TestListNodesLabels(t *testing.T) { - labelSelectorQueryParamName := api.LabelSelectorQueryParam(testapi.Default.Version()) + labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) c := &testClient{ Request: testRequest{ Method: "GET", diff --git a/pkg/client/unversioned/pods_test.go b/pkg/client/unversioned/pods_test.go index ad28e089ddb..967282f0dcb 100644 --- a/pkg/client/unversioned/pods_test.go +++ b/pkg/client/unversioned/pods_test.go @@ -64,7 +64,7 @@ func TestListPods(t *testing.T) { func TestListPodsLabels(t *testing.T) { ns := api.NamespaceDefault - labelSelectorQueryParamName := api.LabelSelectorQueryParam(testapi.Default.Version()) + labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) c := &testClient{ Request: testRequest{ Method: "GET", diff --git a/pkg/client/unversioned/request.go b/pkg/client/unversioned/request.go index 67df03ca8ac..b8514be0603 100644 --- a/pkg/client/unversioned/request.go +++ b/pkg/client/unversioned/request.go @@ -372,7 +372,7 @@ func (r *Request) FieldsSelectorParam(s fields.Selector) *Request { r.err = err return r } - return r.setParam(api.FieldSelectorQueryParam(r.apiVersion), s2.String()) + return r.setParam(unversioned.FieldSelectorQueryParam(r.apiVersion), s2.String()) } // LabelsSelectorParam adds the given selector as a query parameter @@ -386,7 +386,7 @@ func (r *Request) LabelsSelectorParam(s labels.Selector) *Request { if s.Empty() { return r } - return r.setParam(api.LabelSelectorQueryParam(r.apiVersion), s.String()) + return r.setParam(unversioned.LabelSelectorQueryParam(r.apiVersion), s.String()) } // UintParam creates a query parameter with the given value. diff --git a/pkg/client/unversioned/request_test.go b/pkg/client/unversioned/request_test.go index c73c5123307..ce55d36c435 100644 --- a/pkg/client/unversioned/request_test.go +++ b/pkg/client/unversioned/request_test.go @@ -777,7 +777,7 @@ func TestDoRequestNewWayReader(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePathWithPrefix("foo", "bar", "", "baz") - requestURL += "?" + api.LabelSelectorQueryParam(testapi.Default.Version()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) if fakeHandler.RequestReceived.Header["Authorization"] == nil { t.Errorf("Request is missing authorization header: %#v", *fakeHandler.RequestReceived) @@ -819,7 +819,7 @@ func TestDoRequestNewWayObj(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePath("foo", "", "bar/baz") - requestURL += "?" + api.LabelSelectorQueryParam(testapi.Default.Version()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) if fakeHandler.RequestReceived.Header["Authorization"] == nil { t.Errorf("Request is missing authorization header: %#v", *fakeHandler.RequestReceived) diff --git a/pkg/client/unversioned/services_test.go b/pkg/client/unversioned/services_test.go index fb1e638f056..c203e2e2c39 100644 --- a/pkg/client/unversioned/services_test.go +++ b/pkg/client/unversioned/services_test.go @@ -60,7 +60,7 @@ func TestListServices(t *testing.T) { func TestListServicesLabels(t *testing.T) { ns := api.NamespaceDefault - labelSelectorQueryParamName := api.LabelSelectorQueryParam(testapi.Default.Version()) + labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) c := &testClient{ Request: testRequest{ Method: "GET", diff --git a/pkg/client/unversioned/testclient/testclient.go b/pkg/client/unversioned/testclient/testclient.go index e12ac26dacb..f123d54a86f 100644 --- a/pkg/client/unversioned/testclient/testclient.go +++ b/pkg/client/unversioned/testclient/testclient.go @@ -281,13 +281,13 @@ func (c *Fake) ServerVersion() (*version.Info, error) { return &versionInfo, nil } -func (c *Fake) ServerAPIVersions() (*api.APIVersions, error) { +func (c *Fake) ServerAPIVersions() (*unversioned.APIVersions, error) { action := ActionImpl{} action.Verb = "get" action.Resource = "apiversions" c.Invokes(action, nil) - return &api.APIVersions{Versions: registered.RegisteredVersions}, nil + return &unversioned.APIVersions{Versions: registered.RegisteredVersions}, nil } func (c *Fake) ComponentStatuses() client.ComponentStatusInterface { diff --git a/pkg/kubectl/cmd/apiversions.go b/pkg/kubectl/cmd/apiversions.go index 617142501a0..0126ff9579a 100644 --- a/pkg/kubectl/cmd/apiversions.go +++ b/pkg/kubectl/cmd/apiversions.go @@ -57,7 +57,7 @@ func RunApiVersions(f *cmdutil.Factory, w io.Writer) error { os.Exit(1) } - var expAPIVersions *api.APIVersions + var expAPIVersions *unversioned.APIVersions expAPIVersions, err = client.Experimental().ServerAPIVersions() fmt.Fprintf(w, "Available Server Api Versions: %#v\n", *apiVersions) diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete_test.go index 4995bce2ef7..0a71017106b 100644 --- a/pkg/kubectl/cmd/delete_test.go +++ b/pkg/kubectl/cmd/delete_test.go @@ -416,12 +416,12 @@ func TestDeleteMultipleSelector(t *testing.T) { Client: fake.HTTPClientFunc(func(req *http.Request) (*http.Response, error) { switch p, m := req.URL.Path, req.Method; { case p == "/namespaces/test/pods" && m == "GET": - if req.URL.Query().Get(api.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } return &http.Response{StatusCode: 200, Body: objBody(codec, pods)}, nil case p == "/namespaces/test/services" && m == "GET": - if req.URL.Query().Get(api.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } return &http.Response{StatusCode: 200, Body: objBody(codec, svc)}, nil diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index de21ba41118..e5f07480da1 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -507,7 +507,7 @@ func TestGetMultipleTypeObjectsWithSelector(t *testing.T) { tf.Client = &fake.RESTClient{ Codec: codec, Client: fake.HTTPClientFunc(func(req *http.Request) (*http.Response, error) { - if req.URL.Query().Get(api.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } switch req.URL.Path { @@ -633,7 +633,7 @@ func TestWatchSelector(t *testing.T) { tf.Client = &fake.RESTClient{ Codec: codec, Client: fake.HTTPClientFunc(func(req *http.Request) (*http.Response, error) { - if req.URL.Query().Get(api.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } switch req.URL.Path { diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index f4f665d7603..a930aafe642 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -504,7 +504,7 @@ func TestResourceByNameAndEmptySelector(t *testing.T) { func TestSelector(t *testing.T) { pods, svc := testData() - labelKey := api.LabelSelectorQueryParam(testapi.Default.Version()) + labelKey := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), "/namespaces/test/services?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), svc), @@ -905,7 +905,7 @@ func TestSingularRootScopedObject(t *testing.T) { func TestListObject(t *testing.T) { pods, _ := testData() - labelKey := api.LabelSelectorQueryParam(testapi.Default.Version()) + labelKey := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), })). @@ -938,7 +938,7 @@ func TestListObject(t *testing.T) { func TestListObjectWithDifferentVersions(t *testing.T) { pods, svc := testData() - labelKey := api.LabelSelectorQueryParam(testapi.Default.Version()) + labelKey := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) obj, err := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), "/namespaces/test/services?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), svc), diff --git a/pkg/kubectl/resource/helper_test.go b/pkg/kubectl/resource/helper_test.go index 75c9f847a47..8566f3c6882 100644 --- a/pkg/kubectl/resource/helper_test.go +++ b/pkg/kubectl/resource/helper_test.go @@ -328,7 +328,7 @@ func TestHelperList(t *testing.T) { t.Errorf("url doesn't contain name: %#v", req.URL) return false } - if req.URL.Query().Get(api.LabelSelectorQueryParam(testapi.Default.Version())) != labels.SelectorFromSet(labels.Set{"foo": "baz"}).String() { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != labels.SelectorFromSet(labels.Set{"foo": "baz"}).String() { t.Errorf("url doesn't contain query parameters: %#v", req.URL) return false } diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 88729a403aa..af9344491aa 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -723,12 +723,12 @@ func checkOutput(output string, required [][]string) { } } -func getAPIVersions(apiEndpoint string) (*api.APIVersions, error) { +func getAPIVersions(apiEndpoint string) (*unversioned.APIVersions, error) { body, err := curl(apiEndpoint) if err != nil { return nil, fmt.Errorf("Failed http.Get of %s: %v", apiEndpoint, err) } - var apiVersions api.APIVersions + var apiVersions unversioned.APIVersions if err := json.Unmarshal([]byte(body), &apiVersions); err != nil { return nil, fmt.Errorf("Failed to parse /api output %s: %v", body, err) }