From 3febdb7f710c16df0fcc74eeec1a6a8fc979aad0 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Thu, 27 Oct 2016 10:48:01 -0700 Subject: [PATCH] Remove petset from 1.4 generated client to pass import-boss verification --- .../typed/apps/v1alpha1/apps_client.go | 5 - .../apps/v1alpha1/fake/fake_apps_client.go | 5 - .../typed/apps/v1alpha1/fake/fake_petset.go | 127 ----- .../release_1_4/typed/apps/v1alpha1/petset.go | 165 ------ pkg/client/unversioned/apps.go | 55 -- pkg/client/unversioned/pet_sets.go | 100 ---- pkg/client/unversioned/pet_sets_test.go | 165 ------ pkg/client/unversioned/testclient/BUILD | 34 -- .../unversioned/testclient/fake_petsets.go | 83 --- .../unversioned/testclient/testclient.go | 533 ------------------ 10 files changed, 1272 deletions(-) delete mode 100644 pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/fake/fake_petset.go delete mode 100644 pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/petset.go delete mode 100644 pkg/client/unversioned/apps.go delete mode 100644 pkg/client/unversioned/pet_sets.go delete mode 100644 pkg/client/unversioned/pet_sets_test.go delete mode 100644 pkg/client/unversioned/testclient/BUILD delete mode 100644 pkg/client/unversioned/testclient/fake_petsets.go delete mode 100644 pkg/client/unversioned/testclient/testclient.go diff --git a/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/apps_client.go b/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/apps_client.go index 949599b3e7d..aebd4425909 100644 --- a/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/apps_client.go +++ b/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/apps_client.go @@ -25,7 +25,6 @@ import ( type AppsInterface interface { GetRESTClient() *restclient.RESTClient - PetSetsGetter } // AppsClient is used to interact with features provided by the Apps group. @@ -33,10 +32,6 @@ type AppsClient struct { *restclient.RESTClient } -func (c *AppsClient) PetSets(namespace string) PetSetInterface { - return newPetSets(c, namespace) -} - // NewForConfig creates a new AppsClient for the given config. func NewForConfig(c *restclient.Config) (*AppsClient, error) { config := *c diff --git a/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/fake/fake_apps_client.go b/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/fake/fake_apps_client.go index 12b0eca18e9..2f36a64905d 100644 --- a/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/fake/fake_apps_client.go +++ b/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/fake/fake_apps_client.go @@ -17,7 +17,6 @@ limitations under the License. package fake import ( - v1alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,10 +25,6 @@ type FakeApps struct { *core.Fake } -func (c *FakeApps) PetSets(namespace string) v1alpha1.PetSetInterface { - return &FakePetSets{c, namespace} -} - // GetRESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. func (c *FakeApps) GetRESTClient() *restclient.RESTClient { diff --git a/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/fake/fake_petset.go b/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/fake/fake_petset.go deleted file mode 100644 index 95bb17fa2b4..00000000000 --- a/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/fake/fake_petset.go +++ /dev/null @@ -1,127 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package fake - -import ( - api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" - v1alpha1 "k8s.io/kubernetes/pkg/apis/apps/v1alpha1" - core "k8s.io/kubernetes/pkg/client/testing/core" - labels "k8s.io/kubernetes/pkg/labels" - watch "k8s.io/kubernetes/pkg/watch" -) - -// FakePetSets implements PetSetInterface -type FakePetSets struct { - Fake *FakeApps - ns string -} - -var petsetsResource = unversioned.GroupVersionResource{Group: "apps", Version: "v1alpha1", Resource: "petsets"} - -func (c *FakePetSets) Create(petSet *v1alpha1.PetSet) (result *v1alpha1.PetSet, err error) { - obj, err := c.Fake. - Invokes(core.NewCreateAction(petsetsResource, c.ns, petSet), &v1alpha1.PetSet{}) - - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PetSet), err -} - -func (c *FakePetSets) Update(petSet *v1alpha1.PetSet) (result *v1alpha1.PetSet, err error) { - obj, err := c.Fake. - Invokes(core.NewUpdateAction(petsetsResource, c.ns, petSet), &v1alpha1.PetSet{}) - - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PetSet), err -} - -func (c *FakePetSets) UpdateStatus(petSet *v1alpha1.PetSet) (*v1alpha1.PetSet, error) { - obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(petsetsResource, "status", c.ns, petSet), &v1alpha1.PetSet{}) - - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PetSet), err -} - -func (c *FakePetSets) Delete(name string, options *api.DeleteOptions) error { - _, err := c.Fake. - Invokes(core.NewDeleteAction(petsetsResource, c.ns, name), &v1alpha1.PetSet{}) - - return err -} - -func (c *FakePetSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { - action := core.NewDeleteCollectionAction(petsetsResource, c.ns, listOptions) - - _, err := c.Fake.Invokes(action, &v1alpha1.PetSetList{}) - return err -} - -func (c *FakePetSets) Get(name string) (result *v1alpha1.PetSet, err error) { - obj, err := c.Fake. - Invokes(core.NewGetAction(petsetsResource, c.ns, name), &v1alpha1.PetSet{}) - - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PetSet), err -} - -func (c *FakePetSets) List(opts api.ListOptions) (result *v1alpha1.PetSetList, err error) { - obj, err := c.Fake. - Invokes(core.NewListAction(petsetsResource, c.ns, opts), &v1alpha1.PetSetList{}) - - if obj == nil { - return nil, err - } - - label := opts.LabelSelector - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.PetSetList{} - for _, item := range obj.(*v1alpha1.PetSetList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested petSets. -func (c *FakePetSets) Watch(opts api.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(core.NewWatchAction(petsetsResource, c.ns, opts)) - -} - -// Patch applies the patch and returns the patched petSet. -func (c *FakePetSets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1alpha1.PetSet, err error) { - obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(petsetsResource, c.ns, name, data, subresources...), &v1alpha1.PetSet{}) - - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PetSet), err -} diff --git a/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/petset.go b/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/petset.go deleted file mode 100644 index daa322e0f4a..00000000000 --- a/pkg/client/clientset_generated/release_1_4/typed/apps/v1alpha1/petset.go +++ /dev/null @@ -1,165 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - api "k8s.io/kubernetes/pkg/api" - v1alpha1 "k8s.io/kubernetes/pkg/apis/apps/v1alpha1" - watch "k8s.io/kubernetes/pkg/watch" -) - -// PetSetsGetter has a method to return a PetSetInterface. -// A group's client should implement this interface. -type PetSetsGetter interface { - PetSets(namespace string) PetSetInterface -} - -// PetSetInterface has methods to work with PetSet resources. -type PetSetInterface interface { - Create(*v1alpha1.PetSet) (*v1alpha1.PetSet, error) - Update(*v1alpha1.PetSet) (*v1alpha1.PetSet, error) - UpdateStatus(*v1alpha1.PetSet) (*v1alpha1.PetSet, error) - Delete(name string, options *api.DeleteOptions) error - DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error - Get(name string) (*v1alpha1.PetSet, error) - List(opts api.ListOptions) (*v1alpha1.PetSetList, error) - Watch(opts api.ListOptions) (watch.Interface, error) - Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1alpha1.PetSet, err error) - PetSetExpansion -} - -// petSets implements PetSetInterface -type petSets struct { - client *AppsClient - ns string -} - -// newPetSets returns a PetSets -func newPetSets(c *AppsClient, namespace string) *petSets { - return &petSets{ - client: c, - ns: namespace, - } -} - -// Create takes the representation of a petSet and creates it. Returns the server's representation of the petSet, and an error, if there is any. -func (c *petSets) Create(petSet *v1alpha1.PetSet) (result *v1alpha1.PetSet, err error) { - result = &v1alpha1.PetSet{} - err = c.client.Post(). - Namespace(c.ns). - Resource("petsets"). - Body(petSet). - Do(). - Into(result) - return -} - -// Update takes the representation of a petSet and updates it. Returns the server's representation of the petSet, and an error, if there is any. -func (c *petSets) Update(petSet *v1alpha1.PetSet) (result *v1alpha1.PetSet, err error) { - result = &v1alpha1.PetSet{} - err = c.client.Put(). - Namespace(c.ns). - Resource("petsets"). - Name(petSet.Name). - Body(petSet). - Do(). - Into(result) - return -} - -func (c *petSets) UpdateStatus(petSet *v1alpha1.PetSet) (result *v1alpha1.PetSet, err error) { - result = &v1alpha1.PetSet{} - err = c.client.Put(). - Namespace(c.ns). - Resource("petsets"). - Name(petSet.Name). - SubResource("status"). - Body(petSet). - Do(). - Into(result) - return -} - -// Delete takes name of the petSet and deletes it. Returns an error if one occurs. -func (c *petSets) Delete(name string, options *api.DeleteOptions) error { - return c.client.Delete(). - Namespace(c.ns). - Resource("petsets"). - Name(name). - Body(options). - Do(). - Error() -} - -// DeleteCollection deletes a collection of objects. -func (c *petSets) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { - return c.client.Delete(). - Namespace(c.ns). - Resource("petsets"). - VersionedParams(&listOptions, api.ParameterCodec). - Body(options). - Do(). - Error() -} - -// Get takes name of the petSet, and returns the corresponding petSet object, and an error if there is any. -func (c *petSets) Get(name string) (result *v1alpha1.PetSet, err error) { - result = &v1alpha1.PetSet{} - err = c.client.Get(). - Namespace(c.ns). - Resource("petsets"). - Name(name). - Do(). - Into(result) - return -} - -// List takes label and field selectors, and returns the list of PetSets that match those selectors. -func (c *petSets) List(opts api.ListOptions) (result *v1alpha1.PetSetList, err error) { - result = &v1alpha1.PetSetList{} - err = c.client.Get(). - Namespace(c.ns). - Resource("petsets"). - VersionedParams(&opts, api.ParameterCodec). - Do(). - Into(result) - return -} - -// Watch returns a watch.Interface that watches the requested petSets. -func (c *petSets) Watch(opts api.ListOptions) (watch.Interface, error) { - return c.client.Get(). - Prefix("watch"). - Namespace(c.ns). - Resource("petsets"). - VersionedParams(&opts, api.ParameterCodec). - Watch() -} - -// Patch applies the patch and returns the patched petSet. -func (c *petSets) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v1alpha1.PetSet, err error) { - result = &v1alpha1.PetSet{} - err = c.client.Patch(pt). - Namespace(c.ns). - Resource("petsets"). - SubResource(subresources...). - Name(name). - Body(data). - Do(). - Into(result) - return -} diff --git a/pkg/client/unversioned/apps.go b/pkg/client/unversioned/apps.go deleted file mode 100644 index ee51a63cc48..00000000000 --- a/pkg/client/unversioned/apps.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package unversioned - -import ( - "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/client/restclient" -) - -type AppsInterface interface { - StatefulSetNamespacer -} - -// AppsClient is used to interact with Kubernetes batch features. -type AppsClient struct { - *restclient.RESTClient -} - -func (c *AppsClient) StatefulSets(namespace string) StatefulSetInterface { - return newStatefulSet(c, namespace) -} - -func NewApps(c *restclient.Config) (*AppsClient, error) { - config := *c - if err := setGroupDefaults(apps.GroupName, &config); err != nil { - return nil, err - } - client, err := restclient.RESTClientFor(&config) - if err != nil { - return nil, err - } - return &AppsClient{client}, nil -} - -func NewAppsOrDie(c *restclient.Config) *AppsClient { - client, err := NewApps(c) - if err != nil { - panic(err) - } - return client -} diff --git a/pkg/client/unversioned/pet_sets.go b/pkg/client/unversioned/pet_sets.go deleted file mode 100644 index 5cd225625ed..00000000000 --- a/pkg/client/unversioned/pet_sets.go +++ /dev/null @@ -1,100 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package unversioned - -import ( - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/watch" -) - -// StatefulSetNamespacer has methods to work with StatefulSet resources in a namespace -type StatefulSetNamespacer interface { - StatefulSets(namespace string) StatefulSetInterface -} - -// StatefulSetInterface exposes methods to work on StatefulSet resources. -type StatefulSetInterface interface { - List(opts api.ListOptions) (*apps.StatefulSetList, error) - Get(name string) (*apps.StatefulSet, error) - Create(statefulSet *apps.StatefulSet) (*apps.StatefulSet, error) - Update(statefulSet *apps.StatefulSet) (*apps.StatefulSet, error) - Delete(name string, options *api.DeleteOptions) error - Watch(opts api.ListOptions) (watch.Interface, error) - UpdateStatus(statefulSet *apps.StatefulSet) (*apps.StatefulSet, error) -} - -// statefulSet implements StatefulSetNamespacer interface -type statefulSet struct { - r *AppsClient - ns string -} - -// newStatefulSet returns a statefulSet -func newStatefulSet(c *AppsClient, namespace string) *statefulSet { - return &statefulSet{c, namespace} -} - -// List returns a list of statefulSet that match the label and field selectors. -func (c *statefulSet) List(opts api.ListOptions) (result *apps.StatefulSetList, err error) { - result = &apps.StatefulSetList{} - err = c.r.Get().Namespace(c.ns).Resource("statefulsets").VersionedParams(&opts, api.ParameterCodec).Do().Into(result) - return -} - -// Get returns information about a particular statefulSet. -func (c *statefulSet) Get(name string) (result *apps.StatefulSet, err error) { - result = &apps.StatefulSet{} - err = c.r.Get().Namespace(c.ns).Resource("statefulsets").Name(name).Do().Into(result) - return -} - -// Create creates a new statefulSet. -func (c *statefulSet) Create(statefulSet *apps.StatefulSet) (result *apps.StatefulSet, err error) { - result = &apps.StatefulSet{} - err = c.r.Post().Namespace(c.ns).Resource("statefulsets").Body(statefulSet).Do().Into(result) - return -} - -// Update updates an existing statefulSet. -func (c *statefulSet) Update(statefulSet *apps.StatefulSet) (result *apps.StatefulSet, err error) { - result = &apps.StatefulSet{} - err = c.r.Put().Namespace(c.ns).Resource("statefulsets").Name(statefulSet.Name).Body(statefulSet).Do().Into(result) - return -} - -// Delete deletes a statefulSet, returns error if one occurs. -func (c *statefulSet) Delete(name string, options *api.DeleteOptions) (err error) { - return c.r.Delete().Namespace(c.ns).Resource("statefulsets").Name(name).Body(options).Do().Error() -} - -// Watch returns a watch.Interface that watches the requested statefulSet. -func (c *statefulSet) Watch(opts api.ListOptions) (watch.Interface, error) { - return c.r.Get(). - Prefix("watch"). - Namespace(c.ns). - Resource("statefulsets"). - VersionedParams(&opts, api.ParameterCodec). - Watch() -} - -// UpdateStatus takes the name of the statefulSet and the new status. Returns the server's representation of the statefulSet, and an error, if it occurs. -func (c *statefulSet) UpdateStatus(statefulSet *apps.StatefulSet) (result *apps.StatefulSet, err error) { - result = &apps.StatefulSet{} - err = c.r.Put().Namespace(c.ns).Resource("statefulsets").Name(statefulSet.Name).SubResource("status").Body(statefulSet).Do().Into(result) - return -} diff --git a/pkg/client/unversioned/pet_sets_test.go b/pkg/client/unversioned/pet_sets_test.go deleted file mode 100644 index 6a03f3a75ee..00000000000 --- a/pkg/client/unversioned/pet_sets_test.go +++ /dev/null @@ -1,165 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package unversioned_test - -import ( - "testing" - - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/client/unversioned/testclient/simple" -) - -func getStatefulSetResourceName() string { - return "statefulsets" -} - -func TestListStatefulSets(t *testing.T) { - ns := api.NamespaceAll - c := &simple.Client{ - Request: simple.Request{ - Method: "GET", - Path: testapi.Apps.ResourcePath(getStatefulSetResourceName(), ns, ""), - }, - Response: simple.Response{StatusCode: 200, - Body: &apps.StatefulSetList{ - Items: []apps.StatefulSet{ - { - ObjectMeta: api.ObjectMeta{ - Name: "foo", - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - Spec: apps.StatefulSetSpec{ - Replicas: 2, - Template: api.PodTemplateSpec{}, - }, - }, - }, - }, - }, - } - receivedRSList, err := c.Setup(t).Apps().StatefulSets(ns).List(api.ListOptions{}) - c.Validate(t, receivedRSList, err) -} - -func TestGetStatefulSet(t *testing.T) { - ns := api.NamespaceDefault - c := &simple.Client{ - Request: simple.Request{Method: "GET", Path: testapi.Apps.ResourcePath(getStatefulSetResourceName(), ns, "foo"), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{ - StatusCode: 200, - Body: &apps.StatefulSet{ - ObjectMeta: api.ObjectMeta{ - Name: "foo", - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - Spec: apps.StatefulSetSpec{ - Replicas: 2, - Template: api.PodTemplateSpec{}, - }, - }, - }, - } - receivedRS, err := c.Setup(t).Apps().StatefulSets(ns).Get("foo") - c.Validate(t, receivedRS, err) -} - -func TestGetStatefulSetWithNoName(t *testing.T) { - ns := api.NamespaceDefault - c := &simple.Client{Error: true} - receivedPod, err := c.Setup(t).Apps().StatefulSets(ns).Get("") - if (err != nil) && (err.Error() != simple.NameRequiredError) { - t.Errorf("Expected error: %v, but got %v", simple.NameRequiredError, err) - } - - c.Validate(t, receivedPod, err) -} - -func TestUpdateStatefulSet(t *testing.T) { - ns := api.NamespaceDefault - requestRS := &apps.StatefulSet{ - ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"}, - } - c := &simple.Client{ - Request: simple.Request{Method: "PUT", Path: testapi.Apps.ResourcePath(getStatefulSetResourceName(), ns, "foo"), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{ - StatusCode: 200, - Body: &apps.StatefulSet{ - ObjectMeta: api.ObjectMeta{ - Name: "foo", - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - Spec: apps.StatefulSetSpec{ - Replicas: 2, - Template: api.PodTemplateSpec{}, - }, - }, - }, - } - receivedRS, err := c.Setup(t).Apps().StatefulSets(ns).Update(requestRS) - c.Validate(t, receivedRS, err) -} - -func TestDeleteStatefulSet(t *testing.T) { - ns := api.NamespaceDefault - c := &simple.Client{ - Request: simple.Request{Method: "DELETE", Path: testapi.Apps.ResourcePath(getStatefulSetResourceName(), ns, "foo"), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{StatusCode: 200}, - } - err := c.Setup(t).Apps().StatefulSets(ns).Delete("foo", nil) - c.Validate(t, nil, err) -} - -func TestCreateStatefulSet(t *testing.T) { - ns := api.NamespaceDefault - requestRS := &apps.StatefulSet{ - ObjectMeta: api.ObjectMeta{Name: "foo"}, - } - c := &simple.Client{ - Request: simple.Request{Method: "POST", Path: testapi.Apps.ResourcePath(getStatefulSetResourceName(), ns, ""), Body: requestRS, Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{ - StatusCode: 200, - Body: &apps.StatefulSet{ - ObjectMeta: api.ObjectMeta{ - Name: "foo", - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - Spec: apps.StatefulSetSpec{ - Replicas: 2, - Template: api.PodTemplateSpec{}, - }, - }, - }, - } - receivedRS, err := c.Setup(t).Apps().StatefulSets(ns).Create(requestRS) - c.Validate(t, receivedRS, err) -} - -// TODO: Test Status actions. diff --git a/pkg/client/unversioned/testclient/BUILD b/pkg/client/unversioned/testclient/BUILD deleted file mode 100644 index 694337d6585..00000000000 --- a/pkg/client/unversioned/testclient/BUILD +++ /dev/null @@ -1,34 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_binary", - "go_library", - "go_test", - "cgo_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "fake_petsets.go", - "testclient.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", - "//pkg/api/v1:go_default_library", - "//pkg/apimachinery/registered:go_default_library", - "//pkg/apis/apps:go_default_library", - "//pkg/client/restclient:go_default_library", - "//pkg/client/typed/discovery:go_default_library", - "//pkg/client/unversioned:go_default_library", - "//pkg/runtime:go_default_library", - "//pkg/version:go_default_library", - "//pkg/watch:go_default_library", - "//vendor:github.com/emicklei/go-restful/swagger", - ], -) diff --git a/pkg/client/unversioned/testclient/fake_petsets.go b/pkg/client/unversioned/testclient/fake_petsets.go deleted file mode 100644 index f11eaa84b53..00000000000 --- a/pkg/client/unversioned/testclient/fake_petsets.go +++ /dev/null @@ -1,83 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package testclient - -import ( - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/watch" -) - -// FakeStatefulSets implements StatefulSetsInterface. Meant to be embedded into a struct to get a default -// implementation. This makes faking out just the method you want to test easier. -type FakeStatefulSets struct { - Fake *FakeApps - Namespace string -} - -func (c *FakeStatefulSets) Get(name string) (*apps.StatefulSet, error) { - obj, err := c.Fake.Invokes(NewGetAction("statefulsets", c.Namespace, name), &apps.StatefulSet{}) - if obj == nil { - return nil, err - } - - return obj.(*apps.StatefulSet), err -} - -func (c *FakeStatefulSets) List(opts api.ListOptions) (*apps.StatefulSetList, error) { - obj, err := c.Fake.Invokes(NewListAction("statefulsets", c.Namespace, opts), &apps.StatefulSetList{}) - if obj == nil { - return nil, err - } - return obj.(*apps.StatefulSetList), err -} - -func (c *FakeStatefulSets) Create(rs *apps.StatefulSet) (*apps.StatefulSet, error) { - obj, err := c.Fake.Invokes(NewCreateAction("statefulsets", c.Namespace, rs), rs) - if obj == nil { - return nil, err - } - - return obj.(*apps.StatefulSet), err -} - -func (c *FakeStatefulSets) Update(rs *apps.StatefulSet) (*apps.StatefulSet, error) { - obj, err := c.Fake.Invokes(NewUpdateAction("statefulsets", c.Namespace, rs), rs) - if obj == nil { - return nil, err - } - - return obj.(*apps.StatefulSet), err -} - -func (c *FakeStatefulSets) Delete(name string, options *api.DeleteOptions) error { - _, err := c.Fake.Invokes(NewDeleteAction("statefulsets", c.Namespace, name), &apps.StatefulSet{}) - return err -} - -func (c *FakeStatefulSets) Watch(opts api.ListOptions) (watch.Interface, error) { - return c.Fake.InvokesWatch(NewWatchAction("statefulsets", c.Namespace, opts)) -} - -func (c *FakeStatefulSets) UpdateStatus(rs *apps.StatefulSet) (result *apps.StatefulSet, err error) { - obj, err := c.Fake.Invokes(NewUpdateSubresourceAction("statefulsets", "status", c.Namespace, rs), rs) - if obj == nil { - return nil, err - } - - return obj.(*apps.StatefulSet), err -} diff --git a/pkg/client/unversioned/testclient/testclient.go b/pkg/client/unversioned/testclient/testclient.go deleted file mode 100644 index 32fd131e6f0..00000000000 --- a/pkg/client/unversioned/testclient/testclient.go +++ /dev/null @@ -1,533 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package testclient - -import ( - "fmt" - "sync" - - "github.com/emicklei/go-restful/swagger" - - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/apimachinery/registered" - "k8s.io/kubernetes/pkg/client/restclient" - "k8s.io/kubernetes/pkg/client/typed/discovery" - client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/runtime" - "k8s.io/kubernetes/pkg/version" - "k8s.io/kubernetes/pkg/watch" -) - -// NewSimpleFake returns a client that will respond with the provided objects -func NewSimpleFake(objects ...runtime.Object) *Fake { - o := NewObjects(api.Scheme, api.Codecs.UniversalDecoder()) - for _, obj := range objects { - if err := o.Add(obj); err != nil { - panic(err) - } - } - - fakeClient := &Fake{} - fakeClient.AddReactor("*", "*", ObjectReaction(o, registered.RESTMapper())) - - fakeClient.AddWatchReactor("*", DefaultWatchReactor(watch.NewFake(), nil)) - - return fakeClient -} - -// Fake implements client.Interface. Meant to be embedded into a struct to get a default -// implementation. This makes faking out just the method you want to test easier. -type Fake struct { - sync.RWMutex - actions []Action // these may be castable to other types, but "Action" is the minimum - - // ReactionChain is the list of reactors that will be attempted for every request in the order they are tried - ReactionChain []Reactor - // WatchReactionChain is the list of watch reactors that will be attempted for every request in the order they are tried - WatchReactionChain []WatchReactor - // ProxyReactionChain is the list of proxy reactors that will be attempted for every request in the order they are tried - ProxyReactionChain []ProxyReactor - - Resources map[string]*unversioned.APIResourceList -} - -// Reactor is an interface to allow the composition of reaction functions. -type Reactor interface { - // Handles indicates whether or not this Reactor deals with a given action - Handles(action Action) bool - // React handles the action and returns results. It may choose to delegate by indicated handled=false - React(action Action) (handled bool, ret runtime.Object, err error) -} - -// WatchReactor is an interface to allow the composition of watch functions. -type WatchReactor interface { - // Handles indicates whether or not this Reactor deals with a given action - Handles(action Action) bool - // React handles a watch action and returns results. It may choose to delegate by indicated handled=false - React(action Action) (handled bool, ret watch.Interface, err error) -} - -// ProxyReactor is an interface to allow the composition of proxy get functions. -type ProxyReactor interface { - // Handles indicates whether or not this Reactor deals with a given action - Handles(action Action) bool - // React handles a watch action and returns results. It may choose to delegate by indicated handled=false - React(action Action) (handled bool, ret restclient.ResponseWrapper, err error) -} - -// ReactionFunc is a function that returns an object or error for a given Action. If "handled" is false, -// then the test client will continue ignore the results and continue to the next ReactionFunc -type ReactionFunc func(action Action) (handled bool, ret runtime.Object, err error) - -// WatchReactionFunc is a function that returns a watch interface. If "handled" is false, -// then the test client will continue ignore the results and continue to the next ReactionFunc -type WatchReactionFunc func(action Action) (handled bool, ret watch.Interface, err error) - -// ProxyReactionFunc is a function that returns a ResponseWrapper interface for a given Action. If "handled" is false, -// then the test client will continue ignore the results and continue to the next ProxyReactionFunc -type ProxyReactionFunc func(action Action) (handled bool, ret restclient.ResponseWrapper, err error) - -// AddReactor appends a reactor to the end of the chain -func (c *Fake) AddReactor(verb, resource string, reaction ReactionFunc) { - c.ReactionChain = append(c.ReactionChain, &SimpleReactor{verb, resource, reaction}) -} - -// PrependReactor adds a reactor to the beginning of the chain -func (c *Fake) PrependReactor(verb, resource string, reaction ReactionFunc) { - c.ReactionChain = append([]Reactor{&SimpleReactor{verb, resource, reaction}}, c.ReactionChain...) -} - -// AddWatchReactor appends a reactor to the end of the chain -func (c *Fake) AddWatchReactor(resource string, reaction WatchReactionFunc) { - c.WatchReactionChain = append(c.WatchReactionChain, &SimpleWatchReactor{resource, reaction}) -} - -// PrependWatchReactor adds a reactor to the beginning of the chain -func (c *Fake) PrependWatchReactor(resource string, reaction WatchReactionFunc) { - c.WatchReactionChain = append([]WatchReactor{&SimpleWatchReactor{resource, reaction}}, c.WatchReactionChain...) -} - -// AddProxyReactor appends a reactor to the end of the chain -func (c *Fake) AddProxyReactor(resource string, reaction ProxyReactionFunc) { - c.ProxyReactionChain = append(c.ProxyReactionChain, &SimpleProxyReactor{resource, reaction}) -} - -// PrependProxyReactor adds a reactor to the beginning of the chain -func (c *Fake) PrependProxyReactor(resource string, reaction ProxyReactionFunc) { - c.ProxyReactionChain = append([]ProxyReactor{&SimpleProxyReactor{resource, reaction}}, c.ProxyReactionChain...) -} - -// Invokes records the provided Action and then invokes the ReactFn (if provided). -// defaultReturnObj is expected to be of the same type a normal call would return. -func (c *Fake) Invokes(action Action, defaultReturnObj runtime.Object) (runtime.Object, error) { - c.Lock() - defer c.Unlock() - - c.actions = append(c.actions, action) - for _, reactor := range c.ReactionChain { - if !reactor.Handles(action) { - continue - } - - handled, ret, err := reactor.React(action) - if !handled { - continue - } - - return ret, err - } - - return defaultReturnObj, nil -} - -// InvokesWatch records the provided Action and then invokes the ReactFn (if provided). -func (c *Fake) InvokesWatch(action Action) (watch.Interface, error) { - c.Lock() - defer c.Unlock() - - c.actions = append(c.actions, action) - for _, reactor := range c.WatchReactionChain { - if !reactor.Handles(action) { - continue - } - - handled, ret, err := reactor.React(action) - if !handled { - continue - } - - return ret, err - } - - return nil, fmt.Errorf("unhandled watch: %#v", action) -} - -// InvokesProxy records the provided Action and then invokes the ReactFn (if provided). -func (c *Fake) InvokesProxy(action Action) restclient.ResponseWrapper { - c.Lock() - defer c.Unlock() - - c.actions = append(c.actions, action) - for _, reactor := range c.ProxyReactionChain { - if !reactor.Handles(action) { - continue - } - - handled, ret, err := reactor.React(action) - if !handled || err != nil { - continue - } - - return ret - } - - return nil -} - -// ClearActions clears the history of actions called on the fake client -func (c *Fake) ClearActions() { - c.Lock() - defer c.Unlock() - - c.actions = make([]Action, 0) -} - -// Actions returns a chronologically ordered slice fake actions called on the fake client -func (c *Fake) Actions() []Action { - c.RLock() - defer c.RUnlock() - fa := make([]Action, len(c.actions)) - copy(fa, c.actions) - return fa -} - -func (c *Fake) LimitRanges(namespace string) client.LimitRangeInterface { - return &FakeLimitRanges{Fake: c, Namespace: namespace} -} - -func (c *Fake) ResourceQuotas(namespace string) client.ResourceQuotaInterface { - return &FakeResourceQuotas{Fake: c, Namespace: namespace} -} - -func (c *Fake) ReplicationControllers(namespace string) client.ReplicationControllerInterface { - return &FakeReplicationControllers{Fake: c, Namespace: namespace} -} - -func (c *Fake) Nodes() client.NodeInterface { - return &FakeNodes{Fake: c} -} - -func (c *Fake) PodSecurityPolicies() client.PodSecurityPolicyInterface { - return &FakePodSecurityPolicy{Fake: c} -} - -func (c *Fake) Events(namespace string) client.EventInterface { - return &FakeEvents{Fake: c, Namespace: namespace} -} - -func (c *Fake) Endpoints(namespace string) client.EndpointsInterface { - return &FakeEndpoints{Fake: c, Namespace: namespace} -} - -func (c *Fake) PersistentVolumes() client.PersistentVolumeInterface { - return &FakePersistentVolumes{Fake: c} -} - -func (c *Fake) PersistentVolumeClaims(namespace string) client.PersistentVolumeClaimInterface { - return &FakePersistentVolumeClaims{Fake: c, Namespace: namespace} -} - -func (c *Fake) Pods(namespace string) client.PodInterface { - return &FakePods{Fake: c, Namespace: namespace} -} - -func (c *Fake) PodTemplates(namespace string) client.PodTemplateInterface { - return &FakePodTemplates{Fake: c, Namespace: namespace} -} - -func (c *Fake) Services(namespace string) client.ServiceInterface { - return &FakeServices{Fake: c, Namespace: namespace} -} - -func (c *Fake) ServiceAccounts(namespace string) client.ServiceAccountsInterface { - return &FakeServiceAccounts{Fake: c, Namespace: namespace} -} - -func (c *Fake) Secrets(namespace string) client.SecretsInterface { - return &FakeSecrets{Fake: c, Namespace: namespace} -} - -func (c *Fake) Namespaces() client.NamespaceInterface { - return &FakeNamespaces{Fake: c} -} - -func (c *Fake) Apps() client.AppsInterface { - return &FakeApps{c} -} - -func (c *Fake) Authorization() client.AuthorizationInterface { - return &FakeAuthorization{c} -} - -func (c *Fake) Autoscaling() client.AutoscalingInterface { - return &FakeAutoscaling{c} -} - -func (c *Fake) Batch() client.BatchInterface { - return &FakeBatch{c} -} - -func (c *Fake) Certificates() client.CertificatesInterface { - return &FakeCertificates{c} -} - -func (c *Fake) Extensions() client.ExtensionsInterface { - return &FakeExperimental{c} -} - -func (c *Fake) Discovery() discovery.DiscoveryInterface { - return &FakeDiscovery{c} -} - -func (c *Fake) ComponentStatuses() client.ComponentStatusInterface { - return &FakeComponentStatuses{Fake: c} -} - -func (c *Fake) ConfigMaps(namespace string) client.ConfigMapsInterface { - return &FakeConfigMaps{Fake: c, Namespace: namespace} -} - -func (c *Fake) Rbac() client.RbacInterface { - return &FakeRbac{Fake: c} -} - -func (c *Fake) Storage() client.StorageInterface { - return &FakeStorage{Fake: c} -} - -func (c *Fake) Authentication() client.AuthenticationInterface { - return &FakeAuthentication{Fake: c} -} - -// SwaggerSchema returns an empty swagger.ApiDeclaration for testing -func (c *Fake) SwaggerSchema(version unversioned.GroupVersion) (*swagger.ApiDeclaration, error) { - action := ActionImpl{} - action.Verb = "get" - if version == v1.SchemeGroupVersion { - action.Resource = "/swaggerapi/api/" + version.Version - } else { - action.Resource = "/swaggerapi/apis/" + version.Group + "/" + version.Version - } - - c.Invokes(action, nil) - return &swagger.ApiDeclaration{}, nil -} - -// NewSimpleFakeApps returns a client that will respond with the provided objects -func NewSimpleFakeApps(objects ...runtime.Object) *FakeApps { - return &FakeApps{Fake: NewSimpleFake(objects...)} -} - -type FakeApps struct { - *Fake -} - -func (c *FakeApps) StatefulSets(namespace string) client.StatefulSetInterface { - return &FakeStatefulSets{Fake: c, Namespace: namespace} -} - -// NewSimpleFakeAuthorization returns a client that will respond with the provided objects -func NewSimpleFakeAuthorization(objects ...runtime.Object) *FakeAuthorization { - return &FakeAuthorization{Fake: NewSimpleFake(objects...)} -} - -type FakeAuthorization struct { - *Fake -} - -func (c *FakeAuthorization) SubjectAccessReviews() client.SubjectAccessReviewInterface { - return &FakeSubjectAccessReviews{Fake: c} -} - -// NewSimpleFakeAutoscaling returns a client that will respond with the provided objects -func NewSimpleFakeAutoscaling(objects ...runtime.Object) *FakeAutoscaling { - return &FakeAutoscaling{Fake: NewSimpleFake(objects...)} -} - -type FakeAutoscaling struct { - *Fake -} - -func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) client.HorizontalPodAutoscalerInterface { - return &FakeHorizontalPodAutoscalers{Fake: c, Namespace: namespace} -} - -func NewSimpleFakeAuthentication(objects ...runtime.Object) *FakeAuthentication { - return &FakeAuthentication{Fake: NewSimpleFake(objects...)} -} - -type FakeAuthentication struct { - *Fake -} - -func (c *FakeAuthentication) TokenReviews() client.TokenReviewInterface { - return &FakeTokenReviews{Fake: c} -} - -// NewSimpleFakeBatch returns a client that will respond with the provided objects -func NewSimpleFakeBatch(objects ...runtime.Object) *FakeBatch { - return &FakeBatch{Fake: NewSimpleFake(objects...)} -} - -type FakeBatch struct { - *Fake -} - -func (c *FakeBatch) Jobs(namespace string) client.JobInterface { - return &FakeJobsV1{Fake: c, Namespace: namespace} -} - -func (c *FakeBatch) ScheduledJobs(namespace string) client.ScheduledJobInterface { - return &FakeScheduledJobs{Fake: c, Namespace: namespace} -} - -// NewSimpleFakeExp returns a client that will respond with the provided objects -func NewSimpleFakeExp(objects ...runtime.Object) *FakeExperimental { - return &FakeExperimental{Fake: NewSimpleFake(objects...)} -} - -type FakeExperimental struct { - *Fake -} - -func (c *FakeExperimental) DaemonSets(namespace string) client.DaemonSetInterface { - return &FakeDaemonSets{Fake: c, Namespace: namespace} -} - -func (c *FakeExperimental) Deployments(namespace string) client.DeploymentInterface { - return &FakeDeployments{Fake: c, Namespace: namespace} -} - -func (c *FakeExperimental) Scales(namespace string) client.ScaleInterface { - return &FakeScales{Fake: c, Namespace: namespace} -} - -func (c *FakeExperimental) Jobs(namespace string) client.JobInterface { - return &FakeJobs{Fake: c, Namespace: namespace} -} - -func (c *FakeExperimental) Ingress(namespace string) client.IngressInterface { - return &FakeIngress{Fake: c, Namespace: namespace} -} - -func (c *FakeExperimental) ThirdPartyResources() client.ThirdPartyResourceInterface { - return &FakeThirdPartyResources{Fake: c} -} - -func (c *FakeExperimental) ReplicaSets(namespace string) client.ReplicaSetInterface { - return &FakeReplicaSets{Fake: c, Namespace: namespace} -} - -func (c *FakeExperimental) NetworkPolicies(namespace string) client.NetworkPolicyInterface { - return &FakeNetworkPolicies{Fake: c, Namespace: namespace} -} - -func NewSimpleFakeRbac(objects ...runtime.Object) *FakeRbac { - return &FakeRbac{Fake: NewSimpleFake(objects...)} -} - -type FakeRbac struct { - *Fake -} - -func (c *FakeRbac) Roles(namespace string) client.RoleInterface { - return &FakeRoles{Fake: c, Namespace: namespace} -} - -func (c *FakeRbac) RoleBindings(namespace string) client.RoleBindingInterface { - return &FakeRoleBindings{Fake: c, Namespace: namespace} -} - -func (c *FakeRbac) ClusterRoles() client.ClusterRoleInterface { - return &FakeClusterRoles{Fake: c} -} - -func (c *FakeRbac) ClusterRoleBindings() client.ClusterRoleBindingInterface { - return &FakeClusterRoleBindings{Fake: c} -} - -func NewSimpleFakeStorage(objects ...runtime.Object) *FakeStorage { - return &FakeStorage{Fake: NewSimpleFake(objects...)} -} - -type FakeStorage struct { - *Fake -} - -func (c *FakeStorage) StorageClasses() client.StorageClassInterface { - return &FakeStorageClasses{Fake: c} -} - -type FakeDiscovery struct { - *Fake -} - -func (c *FakeDiscovery) ServerPreferredResources() ([]unversioned.GroupVersionResource, error) { - return nil, nil -} - -func (c *FakeDiscovery) ServerPreferredNamespacedResources() ([]unversioned.GroupVersionResource, error) { - return nil, nil -} - -func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { - action := ActionImpl{ - Verb: "get", - Resource: "resource", - } - c.Invokes(action, nil) - return c.Resources[groupVersion], nil -} - -func (c *FakeDiscovery) ServerResources() (map[string]*unversioned.APIResourceList, error) { - action := ActionImpl{ - Verb: "get", - Resource: "resource", - } - c.Invokes(action, nil) - return c.Resources, nil -} - -func (c *FakeDiscovery) ServerGroups() (*unversioned.APIGroupList, error) { - return nil, nil -} - -func (c *FakeDiscovery) ServerVersion() (*version.Info, error) { - action := ActionImpl{} - action.Verb = "get" - action.Resource = "version" - - c.Invokes(action, nil) - versionInfo := version.Get() - return &versionInfo, nil -} - -func (c *FakeDiscovery) RESTClient() restclient.Interface { - return nil -}