From d0ef60cd8e72f6e633e0b03036e5a294ad1a8b8b Mon Sep 17 00:00:00 2001 From: Xudong Liu Date: Mon, 29 Jan 2024 12:06:04 +0800 Subject: [PATCH] remove unused wrapper Signed-off-by: Xudong Liu --- go.mod | 6 +- go.sum | 16 +-- .../vsphereparavirtual/instances_test.go | 18 +--- .../vsphereparavirtual/loadbalancer_test.go | 22 ++--- .../vmservice/vmservice_test.go | 25 ++--- .../vsphereparavirtual/zone_test.go | 15 +-- pkg/util/fake_vm_client_wrapper.go | 97 ------------------- pkg/util/fake_vm_service_client_wrapper.go | 97 ------------------- 8 files changed, 31 insertions(+), 265 deletions(-) delete mode 100644 pkg/util/fake_vm_client_wrapper.go delete mode 100644 pkg/util/fake_vm_service_client_wrapper.go diff --git a/go.mod b/go.mod index 72eb11eaa..fbd0fec06 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( k8s.io/code-generator v0.29.0 k8s.io/component-base v0.29.0 k8s.io/klog/v2 v2.110.1 - sigs.k8s.io/controller-runtime v0.16.0 + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 sigs.k8s.io/yaml v1.4.0 ) @@ -46,7 +46,6 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.6.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/gibson042/canonicaljson-go v1.0.3 // indirect github.com/go-logr/logr v1.3.0 // indirect @@ -114,7 +113,6 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.29.0 // indirect k8s.io/apiserver v0.29.0 // indirect k8s.io/component-helpers v0.29.0 // indirect k8s.io/controller-manager v0.29.0 // indirect @@ -123,6 +121,6 @@ require ( k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect + sigs.k8s.io/controller-runtime v0.14.5 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/go.sum b/go.sum index 37708b562..25299cfff 100644 --- a/go.sum +++ b/go.sum @@ -54,8 +54,6 @@ github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= -github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -71,8 +69,8 @@ github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= -github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= +github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= +github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= @@ -144,7 +142,6 @@ github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -194,7 +191,6 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -363,8 +359,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= -gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= @@ -405,8 +399,6 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA= k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A= k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA= -k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0= -k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc= k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= @@ -441,8 +433,8 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y= -sigs.k8s.io/controller-runtime v0.16.0 h1:5koYaaRVBHDr0LZAJjO5dWzUjMsh6cwa7q1Mmusrdvk= -sigs.k8s.io/controller-runtime v0.16.0/go.mod h1:77DnuwA8+J7AO0njzv3wbNlMOnGuLrwFr8JPNwx3J7g= +sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s= +sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= diff --git a/pkg/cloudprovider/vsphereparavirtual/instances_test.go b/pkg/cloudprovider/vsphereparavirtual/instances_test.go index f0333b53f..b32af288a 100644 --- a/pkg/cloudprovider/vsphereparavirtual/instances_test.go +++ b/pkg/cloudprovider/vsphereparavirtual/instances_test.go @@ -27,10 +27,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/rest" clientgotesting "k8s.io/client-go/testing" cloudprovider "k8s.io/cloud-provider" fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake" - "sigs.k8s.io/controller-runtime/pkg/envtest" ) var ( @@ -68,29 +68,21 @@ func createTestVMWithVMIPAndHost(name, namespace, biosUUID string) *vmopv1alpha1 func TestNewInstances(t *testing.T) { testCases := []struct { name string - testEnv *envtest.Environment + config *rest.Config expectedErr error }{ { - name: "NewInstance: when everything is ok", - // The above code is declaring a test environment variable of type `envtest.Environment` and - // initializing it with an empty instance of `envtest.Environment`. - testEnv: &envtest.Environment{}, + name: "NewInstance: when everything is ok", + config: &rest.Config{}, expectedErr: nil, }, } for _, testCase := range testCases { t.Run(testCase.name, func(t *testing.T) { - cfg, err := testCase.testEnv.Start() - assert.NoError(t, err) - - _, err = NewInstances(testClusterNameSpace, cfg) + _, err := NewInstances(testClusterNameSpace, testCase.config) assert.NoError(t, err) assert.Equal(t, testCase.expectedErr, err) - - err = testCase.testEnv.Stop() - assert.NoError(t, err) }) } } diff --git a/pkg/cloudprovider/vsphereparavirtual/loadbalancer_test.go b/pkg/cloudprovider/vsphereparavirtual/loadbalancer_test.go index 4608cfb95..32fa77c04 100644 --- a/pkg/cloudprovider/vsphereparavirtual/loadbalancer_test.go +++ b/pkg/cloudprovider/vsphereparavirtual/loadbalancer_test.go @@ -27,10 +27,10 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/rest" clientgotesting "k8s.io/client-go/testing" cloudprovider "k8s.io/cloud-provider" fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake" - "sigs.k8s.io/controller-runtime/pkg/envtest" "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmservice" @@ -61,27 +61,21 @@ func newTestLoadBalancer() (cloudprovider.LoadBalancer, *fakevmclient.Clientset) func TestNewLoadBalancer(t *testing.T) { testCases := []struct { - name string - testEnv *envtest.Environment - err error + name string + config *rest.Config + err error }{ { - name: "NewLoadBalancer: when everything is ok", - testEnv: &envtest.Environment{}, - err: nil, + name: "NewLoadBalancer: when everything is ok", + config: &rest.Config{}, + err: nil, }, } for _, testCase := range testCases { t.Run(testCase.name, func(t *testing.T) { - cfg, err := testCase.testEnv.Start() - assert.NoError(t, err) - - _, err = NewLoadBalancer(testClusterNameSpace, cfg, &testOwnerReference) + _, err := NewLoadBalancer(testClusterNameSpace, testCase.config, &testOwnerReference) assert.Equal(t, testCase.err, err) - - err = testCase.testEnv.Stop() - assert.NoError(t, err) }) } } diff --git a/pkg/cloudprovider/vsphereparavirtual/vmservice/vmservice_test.go b/pkg/cloudprovider/vsphereparavirtual/vmservice/vmservice_test.go index 80556f146..335c3d4b6 100644 --- a/pkg/cloudprovider/vsphereparavirtual/vmservice/vmservice_test.go +++ b/pkg/cloudprovider/vsphereparavirtual/vmservice/vmservice_test.go @@ -30,11 +30,11 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" + rest "k8s.io/client-go/rest" clientgotesting "k8s.io/client-go/testing" "k8s.io/apimachinery/pkg/util/intstr" fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake" - "sigs.k8s.io/controller-runtime/pkg/envtest" ) var ( @@ -50,9 +50,6 @@ var ( } vms VMService fakeLBIP = "1.1.1.1" - - // FakeClientWrapper allows functions to be replaced for fault injection - fc *fakevmclient.Clientset ) func initTest() (*v1.Service, VMService, *fakevmclient.Clientset) { @@ -84,31 +81,25 @@ func initTest() (*v1.Service, VMService, *fakevmclient.Clientset) { func TestNewVMService(t *testing.T) { testCases := []struct { - name string - testEnv *envtest.Environment - err error + name string + config *rest.Config + err error }{ { - name: "NewVMService: when everything is ok", - testEnv: &envtest.Environment{}, - err: nil, + name: "NewVMService: when everything is ok", + config: &rest.Config{}, + err: nil, }, } for _, testCase := range testCases { t.Run(testCase.name, func(t *testing.T) { - cfg, err := testCase.testEnv.Start() - assert.NoError(t, err) - - client, err := GetVmopClient(cfg) + client, err := GetVmopClient(testCase.config) assert.NoError(t, err) assert.NotEqual(t, client, nil) realVms := NewVMService(client, testClusterNameSpace, &testOwnerReference) assert.NotEqual(t, realVms, nil) - - err = testCase.testEnv.Stop() - assert.NoError(t, err) }) } } diff --git a/pkg/cloudprovider/vsphereparavirtual/zone_test.go b/pkg/cloudprovider/vsphereparavirtual/zone_test.go index b58f0afff..610f629d6 100644 --- a/pkg/cloudprovider/vsphereparavirtual/zone_test.go +++ b/pkg/cloudprovider/vsphereparavirtual/zone_test.go @@ -8,9 +8,9 @@ import ( vmopv1alpha1 "github.com/vmware-tanzu/vm-operator-api/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/rest" cloudprovider "k8s.io/cloud-provider" fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake" - "sigs.k8s.io/controller-runtime/pkg/envtest" ) var ( @@ -23,13 +23,13 @@ var ( func TestNewZones(t *testing.T) { testCases := []struct { name string - testEnv *envtest.Environment + config *rest.Config expectedErr error testVM *vmopv1alpha1.VirtualMachine }{ { name: "NewZone: when everything is ok", - testEnv: &envtest.Environment{}, + config: &rest.Config{}, testVM: createTestVMWithZone(string(vmName), testClusterNameSpace), expectedErr: nil, }, @@ -37,15 +37,10 @@ func TestNewZones(t *testing.T) { for _, testCase := range testCases { t.Run(testCase.name, func(t *testing.T) { - cfg, err := testCase.testEnv.Start() - assert.NoError(t, err) //initVMopClient(testCase.testVM) - _, err = NewZones(testClusterNameSpace, cfg) + _, err := NewZones(testClusterNameSpace, testCase.config) assert.NoError(t, err) assert.Equal(t, testCase.expectedErr, err) - - err = testCase.testEnv.Stop() - assert.NoError(t, err) }) } } @@ -53,7 +48,6 @@ func TestNewZones(t *testing.T) { func TestZonesByProviderID(t *testing.T) { testCases := []struct { name string - testEnv *envtest.Environment expectedResult string expectedErr error testVM *vmopv1alpha1.VirtualMachine @@ -94,7 +88,6 @@ func TestZonesByProviderID(t *testing.T) { func TestZonesByNodeName(t *testing.T) { testCases := []struct { name string - testEnv *envtest.Environment expectedResult string expectedErr error testVM *vmopv1alpha1.VirtualMachine diff --git a/pkg/util/fake_vm_client_wrapper.go b/pkg/util/fake_vm_client_wrapper.go deleted file mode 100644 index 9140994b2..000000000 --- a/pkg/util/fake_vm_client_wrapper.go +++ /dev/null @@ -1,97 +0,0 @@ -/* -Copyright 2021 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 util - -import ( - "context" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/discovery" - - vmopv1alpha1 "github.com/vmware-tanzu/vm-operator-api/api/v1alpha1" - vmopclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned" - fake "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake" - vmoperatorv1alpha1 "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/typed/vmop/v1alpha1" -) - -// FakeClientWrapper allows functions to be replaced for fault injection -type FakeVMClientWrapper struct { - fakeClient vmopclient.Interface - // Set these functions if you want to override the default fakeClient behavior - GetFunc func(ctx context.Context, namespace, name string, opts metav1.GetOptions) (result *vmopv1alpha1.VirtualMachine, err error) - ListFunc func(ctx context.Context, namespace string, opts metav1.ListOptions) (result *vmopv1alpha1.VirtualMachineList, err error) - CreateFunc func(ctx context.Context, vm *vmopv1alpha1.VirtualMachine, opts metav1.CreateOptions) (result *vmopv1alpha1.VirtualMachine, err error) - UpdateFunc func(ctx context.Context, vm *vmopv1alpha1.VirtualMachine, opts metav1.UpdateOptions) (result *vmopv1alpha1.VirtualMachine, err error) - DeleteFunc func(ctx context.Context, namespace, name string, opts metav1.DeleteOptions) error -} - -// NewFakeVMClientWrapper creates a FakeClientWrapper -func NewFakeVMClientWrapper(fakeClient *fake.Clientset) *FakeVMClientWrapper { - fcw := FakeVMClientWrapper{} - fcw.fakeClient = fakeClient - return &fcw -} - -// Get retrieves an obj for the given object key from the Kubernetes Cluster. -func (w *FakeVMClientWrapper) Get(ctx context.Context, namespace, name string, opts metav1.GetOptions) (result *vmopv1alpha1.VirtualMachine, err error) { - if w.GetFunc != nil { - return w.GetFunc(ctx, namespace, name, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachines(namespace).Get(ctx, name, opts) -} - -// List retrieves list of objects for a given namespace and list options. -func (w *FakeVMClientWrapper) List(ctx context.Context, namespace string, opts metav1.ListOptions) (result *vmopv1alpha1.VirtualMachineList, err error) { - if w.ListFunc != nil { - return w.ListFunc(ctx, namespace, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachines(namespace).List(ctx, opts) -} - -// Create saves the object obj in the Kubernetes cluster. -func (w *FakeVMClientWrapper) Create(ctx context.Context, vm *vmopv1alpha1.VirtualMachine, opts metav1.CreateOptions) (result *vmopv1alpha1.VirtualMachine, err error) { - if w.CreateFunc != nil { - return w.CreateFunc(ctx, vm, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachines(vm.Namespace).Create(ctx, vm, opts) -} - -// Update updates the given obj in the Kubernetes cluster. -func (w *FakeVMClientWrapper) Update(ctx context.Context, vm *vmopv1alpha1.VirtualMachine, opts metav1.UpdateOptions) (result *vmopv1alpha1.VirtualMachine, err error) { - if w.UpdateFunc != nil { - return w.UpdateFunc(ctx, vm, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachines(vm.Namespace).Update(ctx, vm, opts) -} - -// Delete deletes the given obj from Kubernetes cluster. -func (w *FakeVMClientWrapper) Delete(ctx context.Context, namespace, name string, opts metav1.DeleteOptions) error { - if w.DeleteFunc != nil { - return w.DeleteFunc(ctx, namespace, name, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachines(namespace).Delete(ctx, name, opts) -} - -// Discovery retrieves the DiscoveryClient -func (w *FakeVMClientWrapper) Discovery() discovery.DiscoveryInterface { - return w.fakeClient.Discovery() -} - -// VmoperatorV1alpha1 retrieves the VmoperatorV1alpha1Client -func (w *FakeVMClientWrapper) VmoperatorV1alpha1() vmoperatorv1alpha1.VmoperatorV1alpha1Interface { - return w.fakeClient.VmoperatorV1alpha1() -} diff --git a/pkg/util/fake_vm_service_client_wrapper.go b/pkg/util/fake_vm_service_client_wrapper.go deleted file mode 100644 index f505904dd..000000000 --- a/pkg/util/fake_vm_service_client_wrapper.go +++ /dev/null @@ -1,97 +0,0 @@ -/* -Copyright 2021 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 util - -import ( - "context" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/discovery" - - vmopv1alpha1 "github.com/vmware-tanzu/vm-operator-api/api/v1alpha1" - vmopclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned" - fake "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake" - vmoperatorv1alpha1 "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/typed/vmop/v1alpha1" -) - -// FakeVMServiceClientWrapper allows functions to be replaced for fault injection -type FakeVMServiceClientWrapper struct { - fakeClient vmopclient.Interface - // Set these functions if you want to override the default fakeClient behavior - GetFunc func(ctx context.Context, namespace, name string, opts metav1.GetOptions) (result *vmopv1alpha1.VirtualMachineService, err error) - ListFunc func(ctx context.Context, namespace string, opts metav1.ListOptions) (result *vmopv1alpha1.VirtualMachineServiceList, err error) - CreateFunc func(ctx context.Context, vm *vmopv1alpha1.VirtualMachineService, opts metav1.CreateOptions) (result *vmopv1alpha1.VirtualMachineService, err error) - UpdateFunc func(ctx context.Context, vm *vmopv1alpha1.VirtualMachineService, opts metav1.UpdateOptions) (result *vmopv1alpha1.VirtualMachineService, err error) - DeleteFunc func(ctx context.Context, namespace, name string, opts metav1.DeleteOptions) error -} - -// NewFakeVMClientWrapper creates a FakeClientWrapper -func NewFakeVMServiceClientWrapper(fakeClient *fake.Clientset) *FakeVMServiceClientWrapper { - fcw := FakeVMServiceClientWrapper{} - fcw.fakeClient = fakeClient - return &fcw -} - -// Get retrieves an obj for the given object key from the Kubernetes Cluster. -func (w *FakeVMServiceClientWrapper) Get(ctx context.Context, namespace, name string, opts metav1.GetOptions) (result *vmopv1alpha1.VirtualMachineService, err error) { - if w.GetFunc != nil { - return w.GetFunc(ctx, namespace, name, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachineServices(namespace).Get(ctx, name, opts) -} - -// List retrieves list of objects for a given namespace and list options. -func (w *FakeVMServiceClientWrapper) List(ctx context.Context, namespace string, opts metav1.ListOptions) (result *vmopv1alpha1.VirtualMachineServiceList, err error) { - if w.ListFunc != nil { - return w.ListFunc(ctx, namespace, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachineServices(namespace).List(ctx, opts) -} - -// Create saves the object obj in the Kubernetes cluster. -func (w *FakeVMServiceClientWrapper) Create(ctx context.Context, vmservice *vmopv1alpha1.VirtualMachineService, opts metav1.CreateOptions) (result *vmopv1alpha1.VirtualMachineService, err error) { - if w.CreateFunc != nil { - return w.CreateFunc(ctx, vmservice, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachineServices(vmservice.Namespace).Create(ctx, vmservice, opts) -} - -// Update updates the given obj in the Kubernetes cluster. -func (w *FakeVMServiceClientWrapper) Update(ctx context.Context, vmservice *vmopv1alpha1.VirtualMachineService, opts metav1.UpdateOptions) (result *vmopv1alpha1.VirtualMachineService, err error) { - if w.UpdateFunc != nil { - return w.UpdateFunc(ctx, vmservice, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachineServices(vmservice.Namespace).Update(ctx, vmservice, opts) -} - -// Delete deletes the given obj from Kubernetes cluster. -func (w *FakeVMServiceClientWrapper) Delete(ctx context.Context, namespace, name string, opts metav1.DeleteOptions) error { - if w.DeleteFunc != nil { - return w.DeleteFunc(ctx, namespace, name, opts) - } - return w.fakeClient.VmoperatorV1alpha1().VirtualMachineServices(namespace).Delete(ctx, name, opts) -} - -// Discovery retrieves the DiscoveryClient -func (w *FakeVMServiceClientWrapper) Discovery() discovery.DiscoveryInterface { - return w.fakeClient.Discovery() -} - -// VmoperatorV1alpha1 retrieves the VmoperatorV1alpha1Client -func (w *FakeVMServiceClientWrapper) VmoperatorV1alpha1() vmoperatorv1alpha1.VmoperatorV1alpha1Interface { - return w.fakeClient.VmoperatorV1alpha1() -}