diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index 565917aa..ffce2a50 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/api/v1alpha1/groupversion_info.go @@ -15,8 +15,8 @@ limitations under the License. */ // Package v1alpha1 contains API Schema definitions for the upgrade v1alpha1 API group -//+kubebuilder:object:generate=true -//+groupName=upgrade.managed.openshift.io +// +kubebuilder:object:generate=true +// +groupName=upgrade.managed.openshift.io package v1alpha1 import ( diff --git a/docs/testing.md b/docs/testing.md index 198d9ef1..852fe00f 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -32,7 +32,7 @@ find . ### Mocking interfaces #### Basic Mock knowledge and process -This project makes use of [`GoMock`](https://github.com/golang/mock) to mock service interfaces. This comes with the `mockgen` utility which can be used to generate or re-generate mock interfaces that can be used to simulate the behaviour of an external dependency. +This project makes use of [`GoMock`](https://github.com/uber-go/mock) to mock service interfaces. This comes with the `mockgen` utility which can be used to generate or re-generate mock interfaces that can be used to simulate the behaviour of an external dependency. Once installed, an interface can be mocked by running: diff --git a/go.mod b/go.mod index 68ff3562..7da6dcfe 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/go-openapi/runtime v0.26.2 github.com/go-openapi/strfmt v0.22.0 github.com/go-resty/resty/v2 v2.11.0 - github.com/golang/mock v1.6.0 github.com/google/uuid v1.6.0 github.com/hashicorp/go-multierror v1.1.1 github.com/jarcoal/httpmock v1.3.0 @@ -30,7 +29,7 @@ require ( github.com/prometheus/alertmanager v0.26.0 github.com/prometheus/client_golang v1.23.0 github.com/sykesm/zap-logfmt v0.0.4 - go.uber.org/mock v0.4.0 + go.uber.org/mock v0.6.0 go.uber.org/zap v1.27.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.33.2 diff --git a/go.sum b/go.sum index 42847cb8..dd8dbaef 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,6 @@ github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXe github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc= github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= @@ -301,7 +299,6 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk= go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo= @@ -320,8 +317,8 @@ go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= -go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= @@ -344,7 +341,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= @@ -357,7 +353,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= @@ -371,7 +366,6 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= @@ -386,9 +380,7 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -429,7 +421,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= diff --git a/mocks/builder.go b/mocks/builder.go index 8a2d7616..78eb6a08 100644 --- a/mocks/builder.go +++ b/mocks/builder.go @@ -7,8 +7,8 @@ package mocks import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" dvo "github.com/openshift/managed-upgrade-operator/pkg/dvo" + "go.uber.org/mock/gomock" client "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/mocks/client.go b/mocks/client.go index 23b68481..a6ea7f5e 100644 --- a/mocks/client.go +++ b/mocks/client.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" ) // MockDvoClient is a mock of DvoClient interface. diff --git a/pkg/alertmanager/alertManagerSilenceClient.go b/pkg/alertmanager/alertManagerSilenceClient.go index 701d568c..2a6cf039 100644 --- a/pkg/alertmanager/alertManagerSilenceClient.go +++ b/pkg/alertmanager/alertManagerSilenceClient.go @@ -12,6 +12,7 @@ import ( ) // AlertManagerSilencer interface enables implementations of an AlertManagerSilencer +// //go:generate mockgen -destination=mocks/alertManagerSilenceClient.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/alertmanager AlertManagerSilencer type AlertManagerSilencer interface { Create(matchers amv2Models.Matchers, startsAt strfmt.DateTime, endsAt strfmt.DateTime, creator string, comment string) error diff --git a/pkg/alertmanager/mocks/alertManagerSilenceClient.go b/pkg/alertmanager/mocks/alertManagerSilenceClient.go index 7751a0c1..2d0d8c96 100644 --- a/pkg/alertmanager/mocks/alertManagerSilenceClient.go +++ b/pkg/alertmanager/mocks/alertManagerSilenceClient.go @@ -23,6 +23,7 @@ import ( type MockAlertManagerSilencer struct { ctrl *gomock.Controller recorder *MockAlertManagerSilencerMockRecorder + isgomock struct{} } // MockAlertManagerSilencerMockRecorder is the mock recorder for MockAlertManagerSilencer. @@ -43,38 +44,38 @@ func (m *MockAlertManagerSilencer) EXPECT() *MockAlertManagerSilencerMockRecorde } // Create mocks base method. -func (m *MockAlertManagerSilencer) Create(arg0 models.Matchers, arg1, arg2 strfmt.DateTime, arg3, arg4 string) error { +func (m *MockAlertManagerSilencer) Create(matchers models.Matchers, startsAt, endsAt strfmt.DateTime, creator, comment string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Create", arg0, arg1, arg2, arg3, arg4) + ret := m.ctrl.Call(m, "Create", matchers, startsAt, endsAt, creator, comment) ret0, _ := ret[0].(error) return ret0 } // Create indicates an expected call of Create. -func (mr *MockAlertManagerSilencerMockRecorder) Create(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockAlertManagerSilencerMockRecorder) Create(matchers, startsAt, endsAt, creator, comment any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockAlertManagerSilencer)(nil).Create), arg0, arg1, arg2, arg3, arg4) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockAlertManagerSilencer)(nil).Create), matchers, startsAt, endsAt, creator, comment) } // Delete mocks base method. -func (m *MockAlertManagerSilencer) Delete(arg0 string) error { +func (m *MockAlertManagerSilencer) Delete(id string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Delete", arg0) + ret := m.ctrl.Call(m, "Delete", id) ret0, _ := ret[0].(error) return ret0 } // Delete indicates an expected call of Delete. -func (mr *MockAlertManagerSilencerMockRecorder) Delete(arg0 any) *gomock.Call { +func (mr *MockAlertManagerSilencerMockRecorder) Delete(id any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockAlertManagerSilencer)(nil).Delete), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockAlertManagerSilencer)(nil).Delete), id) } // Filter mocks base method. -func (m *MockAlertManagerSilencer) Filter(arg0 ...alertmanager.SilencePredicate) (*[]models.GettableSilence, error) { +func (m *MockAlertManagerSilencer) Filter(predicates ...alertmanager.SilencePredicate) (*[]models.GettableSilence, error) { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range predicates { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Filter", varargs...) @@ -84,36 +85,36 @@ func (m *MockAlertManagerSilencer) Filter(arg0 ...alertmanager.SilencePredicate) } // Filter indicates an expected call of Filter. -func (mr *MockAlertManagerSilencerMockRecorder) Filter(arg0 ...any) *gomock.Call { +func (mr *MockAlertManagerSilencerMockRecorder) Filter(predicates ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Filter", reflect.TypeOf((*MockAlertManagerSilencer)(nil).Filter), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Filter", reflect.TypeOf((*MockAlertManagerSilencer)(nil).Filter), predicates...) } // List mocks base method. -func (m *MockAlertManagerSilencer) List(arg0 []string) (*silence.GetSilencesOK, error) { +func (m *MockAlertManagerSilencer) List(filter []string) (*silence.GetSilencesOK, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "List", arg0) + ret := m.ctrl.Call(m, "List", filter) ret0, _ := ret[0].(*silence.GetSilencesOK) ret1, _ := ret[1].(error) return ret0, ret1 } // List indicates an expected call of List. -func (mr *MockAlertManagerSilencerMockRecorder) List(arg0 any) *gomock.Call { +func (mr *MockAlertManagerSilencerMockRecorder) List(filter any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockAlertManagerSilencer)(nil).List), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockAlertManagerSilencer)(nil).List), filter) } // Update mocks base method. -func (m *MockAlertManagerSilencer) Update(arg0 string, arg1 strfmt.DateTime) error { +func (m *MockAlertManagerSilencer) Update(id string, endsAt strfmt.DateTime) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Update", arg0, arg1) + ret := m.ctrl.Call(m, "Update", id, endsAt) ret0, _ := ret[0].(error) return ret0 } // Update indicates an expected call of Update. -func (mr *MockAlertManagerSilencerMockRecorder) Update(arg0, arg1 any) *gomock.Call { +func (mr *MockAlertManagerSilencerMockRecorder) Update(id, endsAt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockAlertManagerSilencer)(nil).Update), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockAlertManagerSilencer)(nil).Update), id, endsAt) } diff --git a/pkg/availabilitychecks/availabilitychecks.go b/pkg/availabilitychecks/availabilitychecks.go index 378ffd6b..5c203ce4 100644 --- a/pkg/availabilitychecks/availabilitychecks.go +++ b/pkg/availabilitychecks/availabilitychecks.go @@ -4,6 +4,7 @@ package availabilitychecks type Config interface{} // AvailabilityChecker is an interface that enables implementations of AvailabilityChecker +// //go:generate mockgen -destination=mocks/mockAvailabilityChecks.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/availabilitychecks AvailabilityChecker type AvailabilityChecker interface { AvailabilityCheck() error diff --git a/pkg/availabilitychecks/mocks/mockAvailabilityChecks.go b/pkg/availabilitychecks/mocks/mockAvailabilityChecks.go index f8e7d68c..5c1c2e6f 100644 --- a/pkg/availabilitychecks/mocks/mockAvailabilityChecks.go +++ b/pkg/availabilitychecks/mocks/mockAvailabilityChecks.go @@ -19,6 +19,7 @@ import ( type MockAvailabilityChecker struct { ctrl *gomock.Controller recorder *MockAvailabilityCheckerMockRecorder + isgomock struct{} } // MockAvailabilityCheckerMockRecorder is the mock recorder for MockAvailabilityChecker. diff --git a/pkg/clusterversion/mocks/mockClusterVersion.go b/pkg/clusterversion/mocks/mockClusterVersion.go index 22548029..fdcf0d42 100644 --- a/pkg/clusterversion/mocks/mockClusterVersion.go +++ b/pkg/clusterversion/mocks/mockClusterVersion.go @@ -22,6 +22,7 @@ import ( type MockClusterVersion struct { ctrl *gomock.Controller recorder *MockClusterVersionMockRecorder + isgomock struct{} } // MockClusterVersionMockRecorder is the mock recorder for MockClusterVersion. @@ -42,18 +43,18 @@ func (m *MockClusterVersion) EXPECT() *MockClusterVersionMockRecorder { } // EnsureDesiredConfig mocks base method. -func (m *MockClusterVersion) EnsureDesiredConfig(arg0 *v1alpha1.UpgradeConfig) (bool, error) { +func (m *MockClusterVersion) EnsureDesiredConfig(uc *v1alpha1.UpgradeConfig) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "EnsureDesiredConfig", arg0) + ret := m.ctrl.Call(m, "EnsureDesiredConfig", uc) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // EnsureDesiredConfig indicates an expected call of EnsureDesiredConfig. -func (mr *MockClusterVersionMockRecorder) EnsureDesiredConfig(arg0 any) *gomock.Call { +func (mr *MockClusterVersionMockRecorder) EnsureDesiredConfig(uc any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnsureDesiredConfig", reflect.TypeOf((*MockClusterVersion)(nil).EnsureDesiredConfig), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnsureDesiredConfig", reflect.TypeOf((*MockClusterVersion)(nil).EnsureDesiredConfig), uc) } // GetClusterId mocks base method. diff --git a/pkg/clusterversion/mocks/mockClusterVersionBuilder.go b/pkg/clusterversion/mocks/mockClusterVersionBuilder.go index 26dc2318..8f8e6b5a 100644 --- a/pkg/clusterversion/mocks/mockClusterVersionBuilder.go +++ b/pkg/clusterversion/mocks/mockClusterVersionBuilder.go @@ -21,6 +21,7 @@ import ( type MockClusterVersionBuilder struct { ctrl *gomock.Controller recorder *MockClusterVersionBuilderMockRecorder + isgomock struct{} } // MockClusterVersionBuilderMockRecorder is the mock recorder for MockClusterVersionBuilder. diff --git a/pkg/configmanager/config.go b/pkg/configmanager/config.go index c4f32ade..ef63b6c4 100644 --- a/pkg/configmanager/config.go +++ b/pkg/configmanager/config.go @@ -10,6 +10,7 @@ import ( ) // ConfigManagerBuilder is an interface describing the functions of a cluster upgrader. +// //go:generate mockgen -destination=mocks/configmanagerbuilder.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/configmanager ConfigManagerBuilder type ConfigManagerBuilder interface { New(client.Client, Target) ConfigManager @@ -30,6 +31,7 @@ func NewBuilder() ConfigManagerBuilder { } // ConfigManager is an interface describing the functions of a cluster upgrader. +// //go:generate mockgen -destination=mocks/configmanager.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/configmanager ConfigManager type ConfigManager interface { Into(ConfigValidator) error diff --git a/pkg/configmanager/mocks/configmanager.go b/pkg/configmanager/mocks/configmanager.go index 6a366614..33eb69e4 100644 --- a/pkg/configmanager/mocks/configmanager.go +++ b/pkg/configmanager/mocks/configmanager.go @@ -20,6 +20,7 @@ import ( type MockConfigManager struct { ctrl *gomock.Controller recorder *MockConfigManagerMockRecorder + isgomock struct{} } // MockConfigManagerMockRecorder is the mock recorder for MockConfigManager. diff --git a/pkg/configmanager/mocks/configmanagerbuilder.go b/pkg/configmanager/mocks/configmanagerbuilder.go index dc9c26ec..ace91ae4 100644 --- a/pkg/configmanager/mocks/configmanagerbuilder.go +++ b/pkg/configmanager/mocks/configmanagerbuilder.go @@ -21,6 +21,7 @@ import ( type MockConfigManagerBuilder struct { ctrl *gomock.Controller recorder *MockConfigManagerBuilderMockRecorder + isgomock struct{} } // MockConfigManagerBuilderMockRecorder is the mock recorder for MockConfigManagerBuilder. diff --git a/pkg/drain/drainStrategyMock.go b/pkg/drain/drainStrategyMock.go index dba8f017..e8491d5c 100644 --- a/pkg/drain/drainStrategyMock.go +++ b/pkg/drain/drainStrategyMock.go @@ -21,6 +21,7 @@ import ( type MockDrainStrategy struct { ctrl *gomock.Controller recorder *MockDrainStrategyMockRecorder + isgomock struct{} } // MockDrainStrategyMockRecorder is the mock recorder for MockDrainStrategy. diff --git a/pkg/drain/mocks/nodeDrainStrategy.go b/pkg/drain/mocks/nodeDrainStrategy.go index bb399277..55c77218 100644 --- a/pkg/drain/mocks/nodeDrainStrategy.go +++ b/pkg/drain/mocks/nodeDrainStrategy.go @@ -22,6 +22,7 @@ import ( type MockNodeDrainStrategy struct { ctrl *gomock.Controller recorder *MockNodeDrainStrategyMockRecorder + isgomock struct{} } // MockNodeDrainStrategyMockRecorder is the mock recorder for MockNodeDrainStrategy. diff --git a/pkg/drain/mocks/nodeDrainStrategyBuilder.go b/pkg/drain/mocks/nodeDrainStrategyBuilder.go index ad673cc4..8683409d 100644 --- a/pkg/drain/mocks/nodeDrainStrategyBuilder.go +++ b/pkg/drain/mocks/nodeDrainStrategyBuilder.go @@ -23,6 +23,7 @@ import ( type MockNodeDrainStrategyBuilder struct { ctrl *gomock.Controller recorder *MockNodeDrainStrategyBuilderMockRecorder + isgomock struct{} } // MockNodeDrainStrategyBuilderMockRecorder is the mock recorder for MockNodeDrainStrategyBuilder. @@ -43,31 +44,31 @@ func (m *MockNodeDrainStrategyBuilder) EXPECT() *MockNodeDrainStrategyBuilderMoc } // NewDefaultNodeDrainStrategy mocks base method. -func (m *MockNodeDrainStrategyBuilder) NewDefaultNodeDrainStrategy(arg0 client.Client, arg1 logr.Logger, arg2 *v1alpha1.UpgradeConfig, arg3 *drain.NodeDrain) (drain.NodeDrainStrategy, error) { +func (m *MockNodeDrainStrategyBuilder) NewDefaultNodeDrainStrategy(c client.Client, logger logr.Logger, uc *v1alpha1.UpgradeConfig, cfg *drain.NodeDrain) (drain.NodeDrainStrategy, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NewDefaultNodeDrainStrategy", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "NewDefaultNodeDrainStrategy", c, logger, uc, cfg) ret0, _ := ret[0].(drain.NodeDrainStrategy) ret1, _ := ret[1].(error) return ret0, ret1 } // NewDefaultNodeDrainStrategy indicates an expected call of NewDefaultNodeDrainStrategy. -func (mr *MockNodeDrainStrategyBuilderMockRecorder) NewDefaultNodeDrainStrategy(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockNodeDrainStrategyBuilderMockRecorder) NewDefaultNodeDrainStrategy(c, logger, uc, cfg any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewDefaultNodeDrainStrategy", reflect.TypeOf((*MockNodeDrainStrategyBuilder)(nil).NewDefaultNodeDrainStrategy), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewDefaultNodeDrainStrategy", reflect.TypeOf((*MockNodeDrainStrategyBuilder)(nil).NewDefaultNodeDrainStrategy), c, logger, uc, cfg) } // NewNodeDrainStrategy mocks base method. -func (m *MockNodeDrainStrategyBuilder) NewNodeDrainStrategy(arg0 client.Client, arg1 logr.Logger, arg2 *v1alpha1.UpgradeConfig, arg3 *drain.NodeDrain) (drain.NodeDrainStrategy, error) { +func (m *MockNodeDrainStrategyBuilder) NewNodeDrainStrategy(c client.Client, logger logr.Logger, uc *v1alpha1.UpgradeConfig, cfg *drain.NodeDrain) (drain.NodeDrainStrategy, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NewNodeDrainStrategy", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "NewNodeDrainStrategy", c, logger, uc, cfg) ret0, _ := ret[0].(drain.NodeDrainStrategy) ret1, _ := ret[1].(error) return ret0, ret1 } // NewNodeDrainStrategy indicates an expected call of NewNodeDrainStrategy. -func (mr *MockNodeDrainStrategyBuilderMockRecorder) NewNodeDrainStrategy(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockNodeDrainStrategyBuilderMockRecorder) NewNodeDrainStrategy(c, logger, uc, cfg any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewNodeDrainStrategy", reflect.TypeOf((*MockNodeDrainStrategyBuilder)(nil).NewNodeDrainStrategy), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewNodeDrainStrategy", reflect.TypeOf((*MockNodeDrainStrategyBuilder)(nil).NewNodeDrainStrategy), c, logger, uc, cfg) } diff --git a/pkg/drain/timedDrainStrategyMock.go b/pkg/drain/timedDrainStrategyMock.go index 333eccc3..dccdb364 100644 --- a/pkg/drain/timedDrainStrategyMock.go +++ b/pkg/drain/timedDrainStrategyMock.go @@ -20,6 +20,7 @@ import ( type MockTimedDrainStrategy struct { ctrl *gomock.Controller recorder *MockTimedDrainStrategyMockRecorder + isgomock struct{} } // MockTimedDrainStrategyMockRecorder is the mock recorder for MockTimedDrainStrategy. diff --git a/pkg/dvo/builder.go b/pkg/dvo/builder.go index a970b550..d696781b 100644 --- a/pkg/dvo/builder.go +++ b/pkg/dvo/builder.go @@ -10,6 +10,7 @@ import ( ) // DvoClientBuilder enables implementation of a DVO client. +// //go:generate mockgen -destination=mocks/builder.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/dvo DvoClientBuilder type DvoClientBuilder interface { New(c client.Client) (DvoClient, error) diff --git a/pkg/dvo/mocks/builder.go b/pkg/dvo/mocks/builder.go index f39998f7..551eff3a 100644 --- a/pkg/dvo/mocks/builder.go +++ b/pkg/dvo/mocks/builder.go @@ -21,6 +21,7 @@ import ( type MockDvoClientBuilder struct { ctrl *gomock.Controller recorder *MockDvoClientBuilderMockRecorder + isgomock struct{} } // MockDvoClientBuilderMockRecorder is the mock recorder for MockDvoClientBuilder. @@ -41,16 +42,16 @@ func (m *MockDvoClientBuilder) EXPECT() *MockDvoClientBuilderMockRecorder { } // New mocks base method. -func (m *MockDvoClientBuilder) New(arg0 client.Client) (dvo.DvoClient, error) { +func (m *MockDvoClientBuilder) New(c client.Client) (dvo.DvoClient, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "New", arg0) + ret := m.ctrl.Call(m, "New", c) ret0, _ := ret[0].(dvo.DvoClient) ret1, _ := ret[1].(error) return ret0, ret1 } // New indicates an expected call of New. -func (mr *MockDvoClientBuilderMockRecorder) New(arg0 any) *gomock.Call { +func (mr *MockDvoClientBuilderMockRecorder) New(c any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockDvoClientBuilder)(nil).New), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockDvoClientBuilder)(nil).New), c) } diff --git a/pkg/dvo/mocks/client.go b/pkg/dvo/mocks/client.go index db2acd44..b54c5c4e 100644 --- a/pkg/dvo/mocks/client.go +++ b/pkg/dvo/mocks/client.go @@ -19,6 +19,7 @@ import ( type MockDvoClient struct { ctrl *gomock.Controller recorder *MockDvoClientMockRecorder + isgomock struct{} } // MockDvoClientMockRecorder is the mock recorder for MockDvoClient. diff --git a/pkg/eventmanager/mocks/eventmanager.go b/pkg/eventmanager/mocks/eventmanager.go index 91b7d6ff..c0917263 100644 --- a/pkg/eventmanager/mocks/eventmanager.go +++ b/pkg/eventmanager/mocks/eventmanager.go @@ -20,6 +20,7 @@ import ( type MockEventManager struct { ctrl *gomock.Controller recorder *MockEventManagerMockRecorder + isgomock struct{} } // MockEventManagerMockRecorder is the mock recorder for MockEventManager. @@ -40,29 +41,29 @@ func (m *MockEventManager) EXPECT() *MockEventManagerMockRecorder { } // Notify mocks base method. -func (m *MockEventManager) Notify(arg0 notifier.MuoState) error { +func (m *MockEventManager) Notify(state notifier.MuoState) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Notify", arg0) + ret := m.ctrl.Call(m, "Notify", state) ret0, _ := ret[0].(error) return ret0 } // Notify indicates an expected call of Notify. -func (mr *MockEventManagerMockRecorder) Notify(arg0 any) *gomock.Call { +func (mr *MockEventManagerMockRecorder) Notify(state any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Notify", reflect.TypeOf((*MockEventManager)(nil).Notify), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Notify", reflect.TypeOf((*MockEventManager)(nil).Notify), state) } // NotifyResult mocks base method. -func (m *MockEventManager) NotifyResult(arg0 notifier.MuoState, arg1 string) error { +func (m *MockEventManager) NotifyResult(state notifier.MuoState, result string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NotifyResult", arg0, arg1) + ret := m.ctrl.Call(m, "NotifyResult", state, result) ret0, _ := ret[0].(error) return ret0 } // NotifyResult indicates an expected call of NotifyResult. -func (mr *MockEventManagerMockRecorder) NotifyResult(arg0, arg1 any) *gomock.Call { +func (mr *MockEventManagerMockRecorder) NotifyResult(state, result any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotifyResult", reflect.TypeOf((*MockEventManager)(nil).NotifyResult), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotifyResult", reflect.TypeOf((*MockEventManager)(nil).NotifyResult), state, result) } diff --git a/pkg/eventmanager/mocks/eventmanager_builder.go b/pkg/eventmanager/mocks/eventmanager_builder.go index 8527d171..b98dfcc9 100644 --- a/pkg/eventmanager/mocks/eventmanager_builder.go +++ b/pkg/eventmanager/mocks/eventmanager_builder.go @@ -21,6 +21,7 @@ import ( type MockEventManagerBuilder struct { ctrl *gomock.Controller recorder *MockEventManagerBuilderMockRecorder + isgomock struct{} } // MockEventManagerBuilderMockRecorder is the mock recorder for MockEventManagerBuilder. diff --git a/pkg/machinery/mocks/machinery.go b/pkg/machinery/mocks/machinery.go index 49ad9d12..9864aaea 100644 --- a/pkg/machinery/mocks/machinery.go +++ b/pkg/machinery/mocks/machinery.go @@ -22,6 +22,7 @@ import ( type MockMachinery struct { ctrl *gomock.Controller recorder *MockMachineryMockRecorder + isgomock struct{} } // MockMachineryMockRecorder is the mock recorder for MockMachinery. @@ -42,86 +43,86 @@ func (m *MockMachinery) EXPECT() *MockMachineryMockRecorder { } // HasDiskPressure mocks base method. -func (m *MockMachinery) HasDiskPressure(arg0 *v1.Node) bool { +func (m *MockMachinery) HasDiskPressure(node *v1.Node) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "HasDiskPressure", arg0) + ret := m.ctrl.Call(m, "HasDiskPressure", node) ret0, _ := ret[0].(bool) return ret0 } // HasDiskPressure indicates an expected call of HasDiskPressure. -func (mr *MockMachineryMockRecorder) HasDiskPressure(arg0 any) *gomock.Call { +func (mr *MockMachineryMockRecorder) HasDiskPressure(node any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasDiskPressure", reflect.TypeOf((*MockMachinery)(nil).HasDiskPressure), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasDiskPressure", reflect.TypeOf((*MockMachinery)(nil).HasDiskPressure), node) } // HasMemoryPressure mocks base method. -func (m *MockMachinery) HasMemoryPressure(arg0 *v1.Node) bool { +func (m *MockMachinery) HasMemoryPressure(node *v1.Node) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "HasMemoryPressure", arg0) + ret := m.ctrl.Call(m, "HasMemoryPressure", node) ret0, _ := ret[0].(bool) return ret0 } // HasMemoryPressure indicates an expected call of HasMemoryPressure. -func (mr *MockMachineryMockRecorder) HasMemoryPressure(arg0 any) *gomock.Call { +func (mr *MockMachineryMockRecorder) HasMemoryPressure(node any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasMemoryPressure", reflect.TypeOf((*MockMachinery)(nil).HasMemoryPressure), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasMemoryPressure", reflect.TypeOf((*MockMachinery)(nil).HasMemoryPressure), node) } // HasPidPressure mocks base method. -func (m *MockMachinery) HasPidPressure(arg0 *v1.Node) bool { +func (m *MockMachinery) HasPidPressure(node *v1.Node) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "HasPidPressure", arg0) + ret := m.ctrl.Call(m, "HasPidPressure", node) ret0, _ := ret[0].(bool) return ret0 } // HasPidPressure indicates an expected call of HasPidPressure. -func (mr *MockMachineryMockRecorder) HasPidPressure(arg0 any) *gomock.Call { +func (mr *MockMachineryMockRecorder) HasPidPressure(node any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasPidPressure", reflect.TypeOf((*MockMachinery)(nil).HasPidPressure), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasPidPressure", reflect.TypeOf((*MockMachinery)(nil).HasPidPressure), node) } // IsNodeCordoned mocks base method. -func (m *MockMachinery) IsNodeCordoned(arg0 *v1.Node) *machinery.IsCordonedResult { +func (m *MockMachinery) IsNodeCordoned(node *v1.Node) *machinery.IsCordonedResult { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsNodeCordoned", arg0) + ret := m.ctrl.Call(m, "IsNodeCordoned", node) ret0, _ := ret[0].(*machinery.IsCordonedResult) return ret0 } // IsNodeCordoned indicates an expected call of IsNodeCordoned. -func (mr *MockMachineryMockRecorder) IsNodeCordoned(arg0 any) *gomock.Call { +func (mr *MockMachineryMockRecorder) IsNodeCordoned(node any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsNodeCordoned", reflect.TypeOf((*MockMachinery)(nil).IsNodeCordoned), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsNodeCordoned", reflect.TypeOf((*MockMachinery)(nil).IsNodeCordoned), node) } // IsNodeUpgrading mocks base method. -func (m *MockMachinery) IsNodeUpgrading(arg0 *v1.Node) bool { +func (m *MockMachinery) IsNodeUpgrading(node *v1.Node) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsNodeUpgrading", arg0) + ret := m.ctrl.Call(m, "IsNodeUpgrading", node) ret0, _ := ret[0].(bool) return ret0 } // IsNodeUpgrading indicates an expected call of IsNodeUpgrading. -func (mr *MockMachineryMockRecorder) IsNodeUpgrading(arg0 any) *gomock.Call { +func (mr *MockMachineryMockRecorder) IsNodeUpgrading(node any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsNodeUpgrading", reflect.TypeOf((*MockMachinery)(nil).IsNodeUpgrading), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsNodeUpgrading", reflect.TypeOf((*MockMachinery)(nil).IsNodeUpgrading), node) } // IsUpgrading mocks base method. -func (m *MockMachinery) IsUpgrading(arg0 client.Client, arg1 string) (*machinery.UpgradingResult, error) { +func (m *MockMachinery) IsUpgrading(c client.Client, nodeType string) (*machinery.UpgradingResult, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsUpgrading", arg0, arg1) + ret := m.ctrl.Call(m, "IsUpgrading", c, nodeType) ret0, _ := ret[0].(*machinery.UpgradingResult) ret1, _ := ret[1].(error) return ret0, ret1 } // IsUpgrading indicates an expected call of IsUpgrading. -func (mr *MockMachineryMockRecorder) IsUpgrading(arg0, arg1 any) *gomock.Call { +func (mr *MockMachineryMockRecorder) IsUpgrading(c, nodeType any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsUpgrading", reflect.TypeOf((*MockMachinery)(nil).IsUpgrading), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsUpgrading", reflect.TypeOf((*MockMachinery)(nil).IsUpgrading), c, nodeType) } diff --git a/pkg/maintenance/maintenance.go b/pkg/maintenance/maintenance.go index 34fa216e..0be4d8f4 100644 --- a/pkg/maintenance/maintenance.go +++ b/pkg/maintenance/maintenance.go @@ -7,6 +7,7 @@ import ( ) // Maintenance enables implementation of a maintenance interface type +// //go:generate mockgen -destination=mocks/maintenance.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/maintenance Maintenance type Maintenance interface { StartControlPlane(endsAt time.Time, version string, ignoredAlerts []string) error @@ -18,6 +19,7 @@ type Maintenance interface { } // MaintenanceBuilder enables an implementation of a maintenancebuilder interface type +// //go:generate mockgen -destination=mocks/maintenanceBuilder.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/maintenance MaintenanceBuilder type MaintenanceBuilder interface { NewClient(client client.Client) (Maintenance, error) diff --git a/pkg/maintenance/mocks/maintenance.go b/pkg/maintenance/mocks/maintenance.go index 3a1abb6b..2fd86867 100644 --- a/pkg/maintenance/mocks/maintenance.go +++ b/pkg/maintenance/mocks/maintenance.go @@ -20,6 +20,7 @@ import ( type MockMaintenance struct { ctrl *gomock.Controller recorder *MockMaintenanceMockRecorder + isgomock struct{} } // MockMaintenanceMockRecorder is the mock recorder for MockMaintenance. @@ -54,17 +55,17 @@ func (mr *MockMaintenanceMockRecorder) EndControlPlane() *gomock.Call { } // EndSilences mocks base method. -func (m *MockMaintenance) EndSilences(arg0 string) error { +func (m *MockMaintenance) EndSilences(comment string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "EndSilences", arg0) + ret := m.ctrl.Call(m, "EndSilences", comment) ret0, _ := ret[0].(error) return ret0 } // EndSilences indicates an expected call of EndSilences. -func (mr *MockMaintenanceMockRecorder) EndSilences(arg0 any) *gomock.Call { +func (mr *MockMaintenanceMockRecorder) EndSilences(comment any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EndSilences", reflect.TypeOf((*MockMaintenance)(nil).EndSilences), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EndSilences", reflect.TypeOf((*MockMaintenance)(nil).EndSilences), comment) } // EndWorker mocks base method. @@ -97,29 +98,29 @@ func (mr *MockMaintenanceMockRecorder) IsActive() *gomock.Call { } // SetWorker mocks base method. -func (m *MockMaintenance) SetWorker(arg0 time.Time, arg1 string, arg2 int32) error { +func (m *MockMaintenance) SetWorker(endsAt time.Time, version string, count int32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetWorker", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "SetWorker", endsAt, version, count) ret0, _ := ret[0].(error) return ret0 } // SetWorker indicates an expected call of SetWorker. -func (mr *MockMaintenanceMockRecorder) SetWorker(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockMaintenanceMockRecorder) SetWorker(endsAt, version, count any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWorker", reflect.TypeOf((*MockMaintenance)(nil).SetWorker), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWorker", reflect.TypeOf((*MockMaintenance)(nil).SetWorker), endsAt, version, count) } // StartControlPlane mocks base method. -func (m *MockMaintenance) StartControlPlane(arg0 time.Time, arg1 string, arg2 []string) error { +func (m *MockMaintenance) StartControlPlane(endsAt time.Time, version string, ignoredAlerts []string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "StartControlPlane", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "StartControlPlane", endsAt, version, ignoredAlerts) ret0, _ := ret[0].(error) return ret0 } // StartControlPlane indicates an expected call of StartControlPlane. -func (mr *MockMaintenanceMockRecorder) StartControlPlane(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockMaintenanceMockRecorder) StartControlPlane(endsAt, version, ignoredAlerts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartControlPlane", reflect.TypeOf((*MockMaintenance)(nil).StartControlPlane), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartControlPlane", reflect.TypeOf((*MockMaintenance)(nil).StartControlPlane), endsAt, version, ignoredAlerts) } diff --git a/pkg/maintenance/mocks/maintenanceBuilder.go b/pkg/maintenance/mocks/maintenanceBuilder.go index 44b3bfd2..1591b888 100644 --- a/pkg/maintenance/mocks/maintenanceBuilder.go +++ b/pkg/maintenance/mocks/maintenanceBuilder.go @@ -21,6 +21,7 @@ import ( type MockMaintenanceBuilder struct { ctrl *gomock.Controller recorder *MockMaintenanceBuilderMockRecorder + isgomock struct{} } // MockMaintenanceBuilderMockRecorder is the mock recorder for MockMaintenanceBuilder. diff --git a/pkg/metrics/mocks/metrics.go b/pkg/metrics/mocks/metrics.go index 1cc3f249..074546c8 100644 --- a/pkg/metrics/mocks/metrics.go +++ b/pkg/metrics/mocks/metrics.go @@ -21,6 +21,7 @@ import ( type MockMetrics struct { ctrl *gomock.Controller recorder *MockMetricsMockRecorder + isgomock struct{} } // MockMetricsMockRecorder is the mock recorder for MockMetrics. @@ -56,63 +57,63 @@ func (mr *MockMetricsMockRecorder) AlertsFromUpgrade(arg0, arg1 any) *gomock.Cal } // IsAlertFiring mocks base method. -func (m *MockMetrics) IsAlertFiring(arg0 string, arg1, arg2 []string) (bool, error) { +func (m *MockMetrics) IsAlertFiring(alert string, checkedNS, ignoredNS []string) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsAlertFiring", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "IsAlertFiring", alert, checkedNS, ignoredNS) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // IsAlertFiring indicates an expected call of IsAlertFiring. -func (mr *MockMetricsMockRecorder) IsAlertFiring(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockMetricsMockRecorder) IsAlertFiring(alert, checkedNS, ignoredNS any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsAlertFiring", reflect.TypeOf((*MockMetrics)(nil).IsAlertFiring), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsAlertFiring", reflect.TypeOf((*MockMetrics)(nil).IsAlertFiring), alert, checkedNS, ignoredNS) } // IsClusterVersionAtVersion mocks base method. -func (m *MockMetrics) IsClusterVersionAtVersion(arg0 string) (bool, error) { +func (m *MockMetrics) IsClusterVersionAtVersion(version string) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsClusterVersionAtVersion", arg0) + ret := m.ctrl.Call(m, "IsClusterVersionAtVersion", version) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // IsClusterVersionAtVersion indicates an expected call of IsClusterVersionAtVersion. -func (mr *MockMetricsMockRecorder) IsClusterVersionAtVersion(arg0 any) *gomock.Call { +func (mr *MockMetricsMockRecorder) IsClusterVersionAtVersion(version any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsClusterVersionAtVersion", reflect.TypeOf((*MockMetrics)(nil).IsClusterVersionAtVersion), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsClusterVersionAtVersion", reflect.TypeOf((*MockMetrics)(nil).IsClusterVersionAtVersion), version) } // IsMetricNotificationEventSentSet mocks base method. -func (m *MockMetrics) IsMetricNotificationEventSentSet(arg0, arg1, arg2 string) (bool, error) { +func (m *MockMetrics) IsMetricNotificationEventSentSet(upgradeConfigName, event, version string) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsMetricNotificationEventSentSet", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "IsMetricNotificationEventSentSet", upgradeConfigName, event, version) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // IsMetricNotificationEventSentSet indicates an expected call of IsMetricNotificationEventSentSet. -func (mr *MockMetricsMockRecorder) IsMetricNotificationEventSentSet(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockMetricsMockRecorder) IsMetricNotificationEventSentSet(upgradeConfigName, event, version any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsMetricNotificationEventSentSet", reflect.TypeOf((*MockMetrics)(nil).IsMetricNotificationEventSentSet), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsMetricNotificationEventSentSet", reflect.TypeOf((*MockMetrics)(nil).IsMetricNotificationEventSentSet), upgradeConfigName, event, version) } // Query mocks base method. -func (m *MockMetrics) Query(arg0 string) (*metrics.AlertResponse, error) { +func (m *MockMetrics) Query(query string) (*metrics.AlertResponse, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Query", arg0) + ret := m.ctrl.Call(m, "Query", query) ret0, _ := ret[0].(*metrics.AlertResponse) ret1, _ := ret[1].(error) return ret0, ret1 } // Query indicates an expected call of Query. -func (mr *MockMetricsMockRecorder) Query(arg0 any) *gomock.Call { +func (mr *MockMetricsMockRecorder) Query(query any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockMetrics)(nil).Query), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockMetrics)(nil).Query), query) } // ResetAllMetricNodeDrainFailed mocks base method. diff --git a/pkg/metrics/mocks/metrics_builder.go b/pkg/metrics/mocks/metrics_builder.go index 57b2b0c5..f987487f 100644 --- a/pkg/metrics/mocks/metrics_builder.go +++ b/pkg/metrics/mocks/metrics_builder.go @@ -21,6 +21,7 @@ import ( type MockMetricsBuilder struct { ctrl *gomock.Controller recorder *MockMetricsBuilderMockRecorder + isgomock struct{} } // MockMetricsBuilderMockRecorder is the mock recorder for MockMetricsBuilder. @@ -41,16 +42,16 @@ func (m *MockMetricsBuilder) EXPECT() *MockMetricsBuilderMockRecorder { } // NewClient mocks base method. -func (m *MockMetricsBuilder) NewClient(arg0 client.Client) (metrics.Metrics, error) { +func (m *MockMetricsBuilder) NewClient(c client.Client) (metrics.Metrics, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NewClient", arg0) + ret := m.ctrl.Call(m, "NewClient", c) ret0, _ := ret[0].(metrics.Metrics) ret1, _ := ret[1].(error) return ret0, ret1 } // NewClient indicates an expected call of NewClient. -func (mr *MockMetricsBuilderMockRecorder) NewClient(arg0 any) *gomock.Call { +func (mr *MockMetricsBuilderMockRecorder) NewClient(c any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewClient", reflect.TypeOf((*MockMetricsBuilder)(nil).NewClient), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewClient", reflect.TypeOf((*MockMetricsBuilder)(nil).NewClient), c) } diff --git a/pkg/notifier/mocks/notifier.go b/pkg/notifier/mocks/notifier.go index 6e816c3e..f249af85 100644 --- a/pkg/notifier/mocks/notifier.go +++ b/pkg/notifier/mocks/notifier.go @@ -20,6 +20,7 @@ import ( type MockNotifier struct { ctrl *gomock.Controller recorder *MockNotifierMockRecorder + isgomock struct{} } // MockNotifierMockRecorder is the mock recorder for MockNotifier. @@ -40,15 +41,15 @@ func (m *MockNotifier) EXPECT() *MockNotifierMockRecorder { } // NotifyState mocks base method. -func (m *MockNotifier) NotifyState(arg0 notifier.MuoState, arg1 string) error { +func (m *MockNotifier) NotifyState(value notifier.MuoState, description string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NotifyState", arg0, arg1) + ret := m.ctrl.Call(m, "NotifyState", value, description) ret0, _ := ret[0].(error) return ret0 } // NotifyState indicates an expected call of NotifyState. -func (mr *MockNotifierMockRecorder) NotifyState(arg0, arg1 any) *gomock.Call { +func (mr *MockNotifierMockRecorder) NotifyState(value, description any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotifyState", reflect.TypeOf((*MockNotifier)(nil).NotifyState), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NotifyState", reflect.TypeOf((*MockNotifier)(nil).NotifyState), value, description) } diff --git a/pkg/notifier/mocks/notifier_builder.go b/pkg/notifier/mocks/notifier_builder.go index 28c72a6d..1dd4ffd6 100644 --- a/pkg/notifier/mocks/notifier_builder.go +++ b/pkg/notifier/mocks/notifier_builder.go @@ -23,6 +23,7 @@ import ( type MockNotifierBuilder struct { ctrl *gomock.Controller recorder *MockNotifierBuilderMockRecorder + isgomock struct{} } // MockNotifierBuilderMockRecorder is the mock recorder for MockNotifierBuilder. diff --git a/pkg/ocm/mocks/builder.go b/pkg/ocm/mocks/builder.go index 060f20d9..c327219c 100644 --- a/pkg/ocm/mocks/builder.go +++ b/pkg/ocm/mocks/builder.go @@ -22,6 +22,7 @@ import ( type MockOcmClientBuilder struct { ctrl *gomock.Controller recorder *MockOcmClientBuilderMockRecorder + isgomock struct{} } // MockOcmClientBuilderMockRecorder is the mock recorder for MockOcmClientBuilder. @@ -42,16 +43,16 @@ func (m *MockOcmClientBuilder) EXPECT() *MockOcmClientBuilderMockRecorder { } // New mocks base method. -func (m *MockOcmClientBuilder) New(arg0 client.Client, arg1 *url.URL) (ocm.OcmClient, error) { +func (m *MockOcmClientBuilder) New(c client.Client, ocmBaseUrl *url.URL) (ocm.OcmClient, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "New", arg0, arg1) + ret := m.ctrl.Call(m, "New", c, ocmBaseUrl) ret0, _ := ret[0].(ocm.OcmClient) ret1, _ := ret[1].(error) return ret0, ret1 } // New indicates an expected call of New. -func (mr *MockOcmClientBuilderMockRecorder) New(arg0, arg1 any) *gomock.Call { +func (mr *MockOcmClientBuilderMockRecorder) New(c, ocmBaseUrl any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockOcmClientBuilder)(nil).New), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockOcmClientBuilder)(nil).New), c, ocmBaseUrl) } diff --git a/pkg/ocm/mocks/client.go b/pkg/ocm/mocks/client.go index b9fe80a8..2e327439 100644 --- a/pkg/ocm/mocks/client.go +++ b/pkg/ocm/mocks/client.go @@ -20,6 +20,7 @@ import ( type MockOcmClient struct { ctrl *gomock.Controller recorder *MockOcmClientMockRecorder + isgomock struct{} } // MockOcmClientMockRecorder is the mock recorder for MockOcmClient. @@ -55,59 +56,59 @@ func (mr *MockOcmClientMockRecorder) GetCluster() *gomock.Call { } // GetClusterUpgradePolicies mocks base method. -func (m *MockOcmClient) GetClusterUpgradePolicies(arg0 string) (*ocm.UpgradePolicyList, error) { +func (m *MockOcmClient) GetClusterUpgradePolicies(clusterId string) (*ocm.UpgradePolicyList, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetClusterUpgradePolicies", arg0) + ret := m.ctrl.Call(m, "GetClusterUpgradePolicies", clusterId) ret0, _ := ret[0].(*ocm.UpgradePolicyList) ret1, _ := ret[1].(error) return ret0, ret1 } // GetClusterUpgradePolicies indicates an expected call of GetClusterUpgradePolicies. -func (mr *MockOcmClientMockRecorder) GetClusterUpgradePolicies(arg0 any) *gomock.Call { +func (mr *MockOcmClientMockRecorder) GetClusterUpgradePolicies(clusterId any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClusterUpgradePolicies", reflect.TypeOf((*MockOcmClient)(nil).GetClusterUpgradePolicies), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClusterUpgradePolicies", reflect.TypeOf((*MockOcmClient)(nil).GetClusterUpgradePolicies), clusterId) } // GetClusterUpgradePolicyState mocks base method. -func (m *MockOcmClient) GetClusterUpgradePolicyState(arg0, arg1 string) (*ocm.UpgradePolicyState, error) { +func (m *MockOcmClient) GetClusterUpgradePolicyState(policyId, clusterId string) (*ocm.UpgradePolicyState, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetClusterUpgradePolicyState", arg0, arg1) + ret := m.ctrl.Call(m, "GetClusterUpgradePolicyState", policyId, clusterId) ret0, _ := ret[0].(*ocm.UpgradePolicyState) ret1, _ := ret[1].(error) return ret0, ret1 } // GetClusterUpgradePolicyState indicates an expected call of GetClusterUpgradePolicyState. -func (mr *MockOcmClientMockRecorder) GetClusterUpgradePolicyState(arg0, arg1 any) *gomock.Call { +func (mr *MockOcmClientMockRecorder) GetClusterUpgradePolicyState(policyId, clusterId any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClusterUpgradePolicyState", reflect.TypeOf((*MockOcmClient)(nil).GetClusterUpgradePolicyState), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClusterUpgradePolicyState", reflect.TypeOf((*MockOcmClient)(nil).GetClusterUpgradePolicyState), policyId, clusterId) } // PostServiceLog mocks base method. -func (m *MockOcmClient) PostServiceLog(arg0 *ocm.ServiceLog, arg1 string) error { +func (m *MockOcmClient) PostServiceLog(sl *ocm.ServiceLog, description string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "PostServiceLog", arg0, arg1) + ret := m.ctrl.Call(m, "PostServiceLog", sl, description) ret0, _ := ret[0].(error) return ret0 } // PostServiceLog indicates an expected call of PostServiceLog. -func (mr *MockOcmClientMockRecorder) PostServiceLog(arg0, arg1 any) *gomock.Call { +func (mr *MockOcmClientMockRecorder) PostServiceLog(sl, description any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PostServiceLog", reflect.TypeOf((*MockOcmClient)(nil).PostServiceLog), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PostServiceLog", reflect.TypeOf((*MockOcmClient)(nil).PostServiceLog), sl, description) } // SetState mocks base method. -func (m *MockOcmClient) SetState(arg0, arg1, arg2, arg3 string) error { +func (m *MockOcmClient) SetState(value, description, policyId, clusterId string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetState", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "SetState", value, description, policyId, clusterId) ret0, _ := ret[0].(error) return ret0 } // SetState indicates an expected call of SetState. -func (mr *MockOcmClientMockRecorder) SetState(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockOcmClientMockRecorder) SetState(value, description, policyId, clusterId any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetState", reflect.TypeOf((*MockOcmClient)(nil).SetState), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetState", reflect.TypeOf((*MockOcmClient)(nil).SetState), value, description, policyId, clusterId) } diff --git a/pkg/ocmagent/client_test.go b/pkg/ocmagent/client_test.go index 25ebf30d..24793ecd 100644 --- a/pkg/ocmagent/client_test.go +++ b/pkg/ocmagent/client_test.go @@ -10,9 +10,9 @@ import ( "github.com/openshift/managed-upgrade-operator/pkg/ocm" - "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "go.uber.org/mock/gomock" ) const ( @@ -128,9 +128,9 @@ var _ = Describe("OCM Client", func() { result, err := oc.GetClusterUpgradePolicies(TEST_CLUSTER_ID) Expect(result).To(Equal(&ocm.UpgradePolicyList{ - Kind: "UpgradePolicyList", - Page: 1, - Size: int64(len(upgradePolicyListResponse)), + Kind: "UpgradePolicyList", + Page: 1, + Size: int64(len(upgradePolicyListResponse)), Total: int64(len(upgradePolicyListResponse)), Items: upgradePolicyListResponse, })) diff --git a/pkg/ocmagent/mocks/builder.go b/pkg/ocmagent/mocks/builder.go index 060f20d9..c327219c 100644 --- a/pkg/ocmagent/mocks/builder.go +++ b/pkg/ocmagent/mocks/builder.go @@ -22,6 +22,7 @@ import ( type MockOcmClientBuilder struct { ctrl *gomock.Controller recorder *MockOcmClientBuilderMockRecorder + isgomock struct{} } // MockOcmClientBuilderMockRecorder is the mock recorder for MockOcmClientBuilder. @@ -42,16 +43,16 @@ func (m *MockOcmClientBuilder) EXPECT() *MockOcmClientBuilderMockRecorder { } // New mocks base method. -func (m *MockOcmClientBuilder) New(arg0 client.Client, arg1 *url.URL) (ocm.OcmClient, error) { +func (m *MockOcmClientBuilder) New(c client.Client, ocmBaseUrl *url.URL) (ocm.OcmClient, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "New", arg0, arg1) + ret := m.ctrl.Call(m, "New", c, ocmBaseUrl) ret0, _ := ret[0].(ocm.OcmClient) ret1, _ := ret[1].(error) return ret0, ret1 } // New indicates an expected call of New. -func (mr *MockOcmClientBuilderMockRecorder) New(arg0, arg1 any) *gomock.Call { +func (mr *MockOcmClientBuilderMockRecorder) New(c, ocmBaseUrl any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockOcmClientBuilder)(nil).New), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockOcmClientBuilder)(nil).New), c, ocmBaseUrl) } diff --git a/pkg/scaler/mocks/scaler.go b/pkg/scaler/mocks/scaler.go index c75352d2..d6c03179 100644 --- a/pkg/scaler/mocks/scaler.go +++ b/pkg/scaler/mocks/scaler.go @@ -23,6 +23,7 @@ import ( type MockScaler struct { ctrl *gomock.Controller recorder *MockScalerMockRecorder + isgomock struct{} } // MockScalerMockRecorder is the mock recorder for MockScaler. diff --git a/pkg/scheduler/mocks/mockScheduler.go b/pkg/scheduler/mocks/mockScheduler.go index 569c3fda..fcb7a672 100644 --- a/pkg/scheduler/mocks/mockScheduler.go +++ b/pkg/scheduler/mocks/mockScheduler.go @@ -22,6 +22,7 @@ import ( type MockScheduler struct { ctrl *gomock.Controller recorder *MockSchedulerMockRecorder + isgomock struct{} } // MockSchedulerMockRecorder is the mock recorder for MockScheduler. diff --git a/pkg/specprovider/config.go b/pkg/specprovider/config.go index a5975244..bd2fd3c6 100644 --- a/pkg/specprovider/config.go +++ b/pkg/specprovider/config.go @@ -20,7 +20,7 @@ type ConfigManagerSource string // SpecProviderConfig holds fields that describe a spec providers config type SpecProviderConfig struct { // UpgradeType is used to select which upgrader to use when upgrading - UpgradeType string `yaml:"upgradeType"` + UpgradeType string `yaml:"upgradeType"` // ConfigManager configures the source that the operator uses to read UpgradeConfig specs ConfigManager ConfigManager `yaml:"configManager"` } diff --git a/pkg/specprovider/mocks/specprovider.go b/pkg/specprovider/mocks/specprovider.go index 5d47e055..bb841102 100644 --- a/pkg/specprovider/mocks/specprovider.go +++ b/pkg/specprovider/mocks/specprovider.go @@ -20,6 +20,7 @@ import ( type MockSpecProvider struct { ctrl *gomock.Controller recorder *MockSpecProviderMockRecorder + isgomock struct{} } // MockSpecProviderMockRecorder is the mock recorder for MockSpecProvider. diff --git a/pkg/specprovider/mocks/specprovider_builder.go b/pkg/specprovider/mocks/specprovider_builder.go index e09f3df9..ea8f5128 100644 --- a/pkg/specprovider/mocks/specprovider_builder.go +++ b/pkg/specprovider/mocks/specprovider_builder.go @@ -22,6 +22,7 @@ import ( type MockSpecProviderBuilder struct { ctrl *gomock.Controller recorder *MockSpecProviderBuilderMockRecorder + isgomock struct{} } // MockSpecProviderBuilderMockRecorder is the mock recorder for MockSpecProviderBuilder. diff --git a/pkg/specprovider/specprovider.go b/pkg/specprovider/specprovider.go index bcee01f2..ae6601ca 100644 --- a/pkg/specprovider/specprovider.go +++ b/pkg/specprovider/specprovider.go @@ -6,20 +6,22 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/openshift/managed-upgrade-operator/config" upgradev1alpha1 "github.com/openshift/managed-upgrade-operator/api/v1alpha1" + "github.com/openshift/managed-upgrade-operator/config" "github.com/openshift/managed-upgrade-operator/pkg/configmanager" "github.com/openshift/managed-upgrade-operator/pkg/localprovider" "github.com/openshift/managed-upgrade-operator/pkg/ocmprovider" ) // SpecProvider is an interface that enables an implementation of a spec provider +// //go:generate mockgen -destination=mocks/specprovider.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/specprovider SpecProvider type SpecProvider interface { Get() ([]upgradev1alpha1.UpgradeConfigSpec, error) } // SpecProviderBuilder is an interface that enables implementation of a spec provider builder +// //go:generate mockgen -destination=mocks/specprovider_builder.go -package=mocks github.com/openshift/managed-upgrade-operator/pkg/specprovider SpecProviderBuilder type SpecProviderBuilder interface { New(client.Client, configmanager.ConfigManagerBuilder) (SpecProvider, error) diff --git a/pkg/upgradeconfigmanager/mocks/upgradeconfigmanager.go b/pkg/upgradeconfigmanager/mocks/upgradeconfigmanager.go index 6ae6ec7c..c0e99350 100644 --- a/pkg/upgradeconfigmanager/mocks/upgradeconfigmanager.go +++ b/pkg/upgradeconfigmanager/mocks/upgradeconfigmanager.go @@ -21,6 +21,7 @@ import ( type MockUpgradeConfigManager struct { ctrl *gomock.Controller recorder *MockUpgradeConfigManagerMockRecorder + isgomock struct{} } // MockUpgradeConfigManagerMockRecorder is the mock recorder for MockUpgradeConfigManager. @@ -71,13 +72,13 @@ func (mr *MockUpgradeConfigManagerMockRecorder) Refresh() *gomock.Call { } // StartSync mocks base method. -func (m *MockUpgradeConfigManager) StartSync(arg0 context.Context) { +func (m *MockUpgradeConfigManager) StartSync(stopCh context.Context) { m.ctrl.T.Helper() - m.ctrl.Call(m, "StartSync", arg0) + m.ctrl.Call(m, "StartSync", stopCh) } // StartSync indicates an expected call of StartSync. -func (mr *MockUpgradeConfigManagerMockRecorder) StartSync(arg0 any) *gomock.Call { +func (mr *MockUpgradeConfigManagerMockRecorder) StartSync(stopCh any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartSync", reflect.TypeOf((*MockUpgradeConfigManager)(nil).StartSync), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartSync", reflect.TypeOf((*MockUpgradeConfigManager)(nil).StartSync), stopCh) } diff --git a/pkg/upgradeconfigmanager/mocks/upgradeconfigmanager_builder.go b/pkg/upgradeconfigmanager/mocks/upgradeconfigmanager_builder.go index ad98d4be..d495eae1 100644 --- a/pkg/upgradeconfigmanager/mocks/upgradeconfigmanager_builder.go +++ b/pkg/upgradeconfigmanager/mocks/upgradeconfigmanager_builder.go @@ -21,6 +21,7 @@ import ( type MockUpgradeConfigManagerBuilder struct { ctrl *gomock.Controller recorder *MockUpgradeConfigManagerBuilderMockRecorder + isgomock struct{} } // MockUpgradeConfigManagerBuilderMockRecorder is the mock recorder for MockUpgradeConfigManagerBuilder. diff --git a/pkg/upgraders/mocks/cluster_upgrader.go b/pkg/upgraders/mocks/cluster_upgrader.go index 5410d675..224dc49e 100644 --- a/pkg/upgraders/mocks/cluster_upgrader.go +++ b/pkg/upgraders/mocks/cluster_upgrader.go @@ -22,6 +22,7 @@ import ( type MockClusterUpgrader struct { ctrl *gomock.Controller recorder *MockClusterUpgraderMockRecorder + isgomock struct{} } // MockClusterUpgraderMockRecorder is the mock recorder for MockClusterUpgrader. @@ -42,31 +43,31 @@ func (m *MockClusterUpgrader) EXPECT() *MockClusterUpgraderMockRecorder { } // HealthCheck mocks base method. -func (m *MockClusterUpgrader) HealthCheck(arg0 context.Context, arg1 *v1alpha1.UpgradeConfig, arg2 logr.Logger) (bool, error) { +func (m *MockClusterUpgrader) HealthCheck(ctx context.Context, upgradeConfig *v1alpha1.UpgradeConfig, logger logr.Logger) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "HealthCheck", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "HealthCheck", ctx, upgradeConfig, logger) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // HealthCheck indicates an expected call of HealthCheck. -func (mr *MockClusterUpgraderMockRecorder) HealthCheck(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockClusterUpgraderMockRecorder) HealthCheck(ctx, upgradeConfig, logger any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HealthCheck", reflect.TypeOf((*MockClusterUpgrader)(nil).HealthCheck), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HealthCheck", reflect.TypeOf((*MockClusterUpgrader)(nil).HealthCheck), ctx, upgradeConfig, logger) } // UpgradeCluster mocks base method. -func (m *MockClusterUpgrader) UpgradeCluster(arg0 context.Context, arg1 *v1alpha1.UpgradeConfig, arg2 logr.Logger) (v1alpha1.UpgradePhase, error) { +func (m *MockClusterUpgrader) UpgradeCluster(ctx context.Context, upgradeConfig *v1alpha1.UpgradeConfig, logger logr.Logger) (v1alpha1.UpgradePhase, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpgradeCluster", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "UpgradeCluster", ctx, upgradeConfig, logger) ret0, _ := ret[0].(v1alpha1.UpgradePhase) ret1, _ := ret[1].(error) return ret0, ret1 } // UpgradeCluster indicates an expected call of UpgradeCluster. -func (mr *MockClusterUpgraderMockRecorder) UpgradeCluster(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockClusterUpgraderMockRecorder) UpgradeCluster(ctx, upgradeConfig, logger any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpgradeCluster", reflect.TypeOf((*MockClusterUpgrader)(nil).UpgradeCluster), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpgradeCluster", reflect.TypeOf((*MockClusterUpgrader)(nil).UpgradeCluster), ctx, upgradeConfig, logger) } diff --git a/pkg/upgraders/mocks/cluster_upgrader_builder.go b/pkg/upgraders/mocks/cluster_upgrader_builder.go index c2e21e16..f89e7eb4 100644 --- a/pkg/upgraders/mocks/cluster_upgrader_builder.go +++ b/pkg/upgraders/mocks/cluster_upgrader_builder.go @@ -25,6 +25,7 @@ import ( type MockClusterUpgraderBuilder struct { ctrl *gomock.Controller recorder *MockClusterUpgraderBuilderMockRecorder + isgomock struct{} } // MockClusterUpgraderBuilderMockRecorder is the mock recorder for MockClusterUpgraderBuilder. diff --git a/pkg/upgradesteps/action.go b/pkg/upgradesteps/action.go index 20294d08..f6c26793 100644 --- a/pkg/upgradesteps/action.go +++ b/pkg/upgradesteps/action.go @@ -20,7 +20,7 @@ func Action(n string, f actionFunction) actionStep { // performed. type actionStep struct { name string - f actionFunction + f actionFunction } // run executes the actionStep's actionFunction in the supplied context @@ -32,4 +32,3 @@ func (s actionStep) run(ctx context.Context, logger logr.Logger) (bool, error) { func (s actionStep) String() string { return s.name } - diff --git a/pkg/upgradesteps/runner_test.go b/pkg/upgradesteps/runner_test.go index 270b2f77..b47ef079 100644 --- a/pkg/upgradesteps/runner_test.go +++ b/pkg/upgradesteps/runner_test.go @@ -42,8 +42,8 @@ var _ = Describe("HealthCheckStep", func() { } upgradeConfig = testStructs.NewUpgradeConfigBuilder().WithNamespacedName(upgradeConfigName).GetUpgradeConfig() upgradeConfig.Status.History.SetHistory(upgradev1alpha1.UpgradeHistory{ - Version: upgradeConfig.Spec.Desired.Version, - Phase: upgradev1alpha1.UpgradePhaseNew, + Version: upgradeConfig.Spec.Desired.Version, + Phase: upgradev1alpha1.UpgradePhaseNew, }) }) diff --git a/pkg/validation/mocks/mockValidation.go b/pkg/validation/mocks/mockValidation.go index 37f6cc83..2ae1ed79 100644 --- a/pkg/validation/mocks/mockValidation.go +++ b/pkg/validation/mocks/mockValidation.go @@ -24,6 +24,7 @@ import ( type MockValidator struct { ctrl *gomock.Controller recorder *MockValidatorMockRecorder + isgomock struct{} } // MockValidatorMockRecorder is the mock recorder for MockValidator. @@ -44,16 +45,16 @@ func (m *MockValidator) EXPECT() *MockValidatorMockRecorder { } // IsValidUpgradeConfig mocks base method. -func (m *MockValidator) IsValidUpgradeConfig(arg0 client.Client, arg1 *v1alpha1.UpgradeConfig, arg2 *v1.ClusterVersion, arg3 logr.Logger) (validation.ValidatorResult, error) { +func (m *MockValidator) IsValidUpgradeConfig(c client.Client, uC *v1alpha1.UpgradeConfig, cV *v1.ClusterVersion, logger logr.Logger) (validation.ValidatorResult, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsValidUpgradeConfig", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "IsValidUpgradeConfig", c, uC, cV, logger) ret0, _ := ret[0].(validation.ValidatorResult) ret1, _ := ret[1].(error) return ret0, ret1 } // IsValidUpgradeConfig indicates an expected call of IsValidUpgradeConfig. -func (mr *MockValidatorMockRecorder) IsValidUpgradeConfig(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockValidatorMockRecorder) IsValidUpgradeConfig(c, uC, cV, logger any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsValidUpgradeConfig", reflect.TypeOf((*MockValidator)(nil).IsValidUpgradeConfig), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsValidUpgradeConfig", reflect.TypeOf((*MockValidator)(nil).IsValidUpgradeConfig), c, uC, cV, logger) } diff --git a/pkg/validation/mocks/mockValidationBuilder.go b/pkg/validation/mocks/mockValidationBuilder.go index 7609a094..1a993f69 100644 --- a/pkg/validation/mocks/mockValidationBuilder.go +++ b/pkg/validation/mocks/mockValidationBuilder.go @@ -21,6 +21,7 @@ import ( type MockValidationBuilder struct { ctrl *gomock.Controller recorder *MockValidationBuilderMockRecorder + isgomock struct{} } // MockValidationBuilderMockRecorder is the mock recorder for MockValidationBuilder. diff --git a/tools.go b/tools.go index 82cbbe10..9d79f649 100644 --- a/tools.go +++ b/tools.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools // Place any runtime dependencies as imports in this file.