From 654ceb6e5a3a42d50d3dbceb2236ad8973c9a225 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 8 Oct 2015 20:29:35 -0700 Subject: [PATCH] run grep-sed --- cmd/integration/integration.go | 4 ++-- pkg/apiserver/api_installer.go | 2 +- pkg/apiserver/index.go | 2 +- pkg/apiserver/resthandler.go | 6 +++--- pkg/apiserver/resthandler_test.go | 2 +- pkg/client/unversioned/fake/fake.go | 2 +- pkg/client/unversioned/restclient.go | 2 +- pkg/kubectl/interfaces.go | 2 +- pkg/kubectl/resource/helper.go | 2 +- pkg/kubectl/resource/interfaces.go | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index fbe982f4860..8d286e73692 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -667,7 +667,7 @@ func runPatchTest(c *client.Client) { glog.Fatalf("Failed creating patchservice: %v", err) } - patchBodies := map[string]map[api.PatchType]struct { + patchBodies := map[string]map[unversioned.PatchType]struct { AddLabelBody []byte RemoveLabelBody []byte RemoveAllLabelsBody []byte @@ -693,7 +693,7 @@ func runPatchTest(c *client.Client) { pb := patchBodies[c.APIVersion()] - execPatch := func(pt api.PatchType, body []byte) error { + execPatch := func(pt unversioned.PatchType, body []byte) error { return c.Patch(pt). Resource(resource). Namespace(api.NamespaceDefault). diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go index 23eb8b49da9..23d7b066022 100644 --- a/pkg/apiserver/api_installer.go +++ b/pkg/apiserver/api_installer.go @@ -481,7 +481,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag Operation("patch"+namespaced+kind+strings.Title(subresource)). Produces(append(storageMeta.ProducesMIMETypes(action.Verb), "application/json")...). Returns(http.StatusOK, "OK", versionedObject). - Reads(api.Patch{}). + Reads(unversioned.Patch{}). Writes(versionedObject) addParams(route, action.Params) ws.Route(route) diff --git a/pkg/apiserver/index.go b/pkg/apiserver/index.go index 480deb6e1ac..eb4c4a9ab79 100644 --- a/pkg/apiserver/index.go +++ b/pkg/apiserver/index.go @@ -41,6 +41,6 @@ func IndexHandler(container *restful.Container, muxHelper *MuxHelper) func(http. // Extract the paths handled using mux handler. handledPaths = append(handledPaths, muxHelper.RegisteredPaths...) sort.Strings(handledPaths) - writeRawJSON(status, api.RootPaths{Paths: handledPaths}, w) + writeRawJSON(status, unversioned.RootPaths{Paths: handledPaths}, w) } } diff --git a/pkg/apiserver/resthandler.go b/pkg/apiserver/resthandler.go index 200150e4cc2..c13f65f59bb 100644 --- a/pkg/apiserver/resthandler.go +++ b/pkg/apiserver/resthandler.go @@ -407,7 +407,7 @@ func PatchResource(r rest.Patcher, scope RequestScope, typer runtime.ObjectTyper if idx := strings.Index(contentType, ";"); idx > 0 { contentType = contentType[:idx] } - patchType := api.PatchType(contentType) + patchType := unversioned.PatchType(contentType) patchJS, err := readBody(req.Request) if err != nil { @@ -432,7 +432,7 @@ func PatchResource(r rest.Patcher, scope RequestScope, typer runtime.ObjectTyper } // patchResource divides PatchResource for easier unit testing -func patchResource(ctx api.Context, timeout time.Duration, versionedObj runtime.Object, patcher rest.Patcher, name string, patchType api.PatchType, patchJS []byte, namer ScopeNamer, codec runtime.Codec) (runtime.Object, error) { +func patchResource(ctx api.Context, timeout time.Duration, versionedObj runtime.Object, patcher rest.Patcher, name string, patchType unversioned.PatchType, patchJS []byte, namer ScopeNamer, codec runtime.Codec) (runtime.Object, error) { namespace := api.NamespaceValue(ctx) original, err := patcher.Get(ctx, name) @@ -806,7 +806,7 @@ func setListSelfLink(obj runtime.Object, req *restful.Request, namer ScopeNamer) } -func getPatchedJS(patchType api.PatchType, originalJS, patchJS []byte, obj runtime.Object) ([]byte, error) { +func getPatchedJS(patchType unversioned.PatchType, originalJS, patchJS []byte, obj runtime.Object) ([]byte, error) { switch patchType { case api.JSONPatchType: patchObj, err := jsonpatch.DecodePatch(patchJS) diff --git a/pkg/apiserver/resthandler_test.go b/pkg/apiserver/resthandler_test.go index 18fdddd933a..0bd423703b8 100644 --- a/pkg/apiserver/resthandler_test.go +++ b/pkg/apiserver/resthandler_test.go @@ -169,7 +169,7 @@ func (tc *patchTestCase) Run(t *testing.T) { return } - for _, patchType := range []api.PatchType{api.JSONPatchType, api.MergePatchType, api.StrategicMergePatchType} { + for _, patchType := range []unversioned.PatchType{api.JSONPatchType, api.MergePatchType, api.StrategicMergePatchType} { // TODO SUPPORT THIS! if patchType == api.JSONPatchType { continue diff --git a/pkg/client/unversioned/fake/fake.go b/pkg/client/unversioned/fake/fake.go index 8e77910a649..189df3f8d4b 100644 --- a/pkg/client/unversioned/fake/fake.go +++ b/pkg/client/unversioned/fake/fake.go @@ -51,7 +51,7 @@ func (c *RESTClient) Put() *unversioned.Request { return unversioned.NewRequest(c, "PUT", &url.URL{Host: "localhost"}, testapi.Default.Version(), c.Codec) } -func (c *RESTClient) Patch(_ api.PatchType) *unversioned.Request { +func (c *RESTClient) Patch(_ unversioned.PatchType) *unversioned.Request { return unversioned.NewRequest(c, "PATCH", &url.URL{Host: "localhost"}, testapi.Default.Version(), c.Codec) } diff --git a/pkg/client/unversioned/restclient.go b/pkg/client/unversioned/restclient.go index db7ab1ee2b5..a0f1d5e07a2 100644 --- a/pkg/client/unversioned/restclient.go +++ b/pkg/client/unversioned/restclient.go @@ -105,7 +105,7 @@ func (c *RESTClient) Put() *Request { } // Patch begins a PATCH request. Short for c.Verb("Patch"). -func (c *RESTClient) Patch(pt api.PatchType) *Request { +func (c *RESTClient) Patch(pt unversioned.PatchType) *Request { return c.Verb("PATCH").SetHeader("Content-Type", string(pt)) } diff --git a/pkg/kubectl/interfaces.go b/pkg/kubectl/interfaces.go index 890947b5c6c..6b75885d874 100644 --- a/pkg/kubectl/interfaces.go +++ b/pkg/kubectl/interfaces.go @@ -26,7 +26,7 @@ import ( type RESTClient interface { Get() *client.Request Post() *client.Request - Patch(api.PatchType) *client.Request + Patch(unversioned.PatchType) *client.Request Delete() *client.Request Put() *client.Request } diff --git a/pkg/kubectl/resource/helper.go b/pkg/kubectl/resource/helper.go index 4af6c8272f4..59b5cebfb65 100644 --- a/pkg/kubectl/resource/helper.go +++ b/pkg/kubectl/resource/helper.go @@ -131,7 +131,7 @@ func (m *Helper) Create(namespace string, modify bool, data []byte) (runtime.Obj func (m *Helper) createResource(c RESTClient, resource, namespace string, data []byte) (runtime.Object, error) { return c.Post().NamespaceIfScoped(namespace, m.NamespaceScoped).Resource(resource).Body(data).Do().Get() } -func (m *Helper) Patch(namespace, name string, pt api.PatchType, data []byte) (runtime.Object, error) { +func (m *Helper) Patch(namespace, name string, pt unversioned.PatchType, data []byte) (runtime.Object, error) { return m.RESTClient.Patch(pt). NamespaceIfScoped(namespace, m.NamespaceScoped). Resource(m.Resource). diff --git a/pkg/kubectl/resource/interfaces.go b/pkg/kubectl/resource/interfaces.go index 3d64609984a..45b11164485 100644 --- a/pkg/kubectl/resource/interfaces.go +++ b/pkg/kubectl/resource/interfaces.go @@ -27,7 +27,7 @@ import ( type RESTClient interface { Get() *client.Request Post() *client.Request - Patch(api.PatchType) *client.Request + Patch(unversioned.PatchType) *client.Request Delete() *client.Request Put() *client.Request }