Skip to content

Commit 2be23a6

Browse files
committed
fix(mockgen): use "go run" in all go:generate comments
Use vendored tooling by switching to "go run" in all generate statements. This makes the mockgen make rule work on all environements.
1 parent 4bdc281 commit 2be23a6

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

pkg/lib/operatorclient/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:generate mockgen -source client.go -destination operatorclientmocks/mock_client.go -package operatorclientmocks
1+
//go:generate go run github.com/golang/mock/mockgen -source client.go -destination operatorclientmocks/mock_client.go -package operatorclientmocks
22
package operatorclient
33

44
import (

pkg/lib/operatorlister/lister.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ type APIRegistrationV1Lister interface {
6868
APIServiceLister() aregv1.APIServiceLister
6969
}
7070

71-
//go:generate counterfeiter . APIExtensionsV1Lister
71+
//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . APIExtensionsV1Lister
7272
type APIExtensionsV1Lister interface {
7373
RegisterCustomResourceDefinitionLister(lister aextv1.CustomResourceDefinitionLister)
7474
CustomResourceDefinitionLister() aextv1.CustomResourceDefinitionLister
@@ -190,13 +190,13 @@ func newOperatorsV1Lister() *operatorsV1Lister {
190190
var _ OperatorLister = &lister{}
191191

192192
type lister struct {
193-
appsV1Lister *appsV1Lister
194-
coreV1Lister *coreV1Lister
195-
rbacV1Lister *rbacV1Lister
196-
apiRegistrationV1Lister *apiRegistrationV1Lister
197-
apiExtensionsV1Lister *apiExtensionsV1Lister
198-
operatorsV1alpha1Lister *operatorsV1alpha1Lister
199-
operatorsV1Lister *operatorsV1Lister
193+
appsV1Lister *appsV1Lister
194+
coreV1Lister *coreV1Lister
195+
rbacV1Lister *rbacV1Lister
196+
apiRegistrationV1Lister *apiRegistrationV1Lister
197+
apiExtensionsV1Lister *apiExtensionsV1Lister
198+
operatorsV1alpha1Lister *operatorsV1alpha1Lister
199+
operatorsV1Lister *operatorsV1Lister
200200
}
201201

202202
func (l *lister) AppsV1() AppsV1Lister {
@@ -230,12 +230,12 @@ func (l *lister) OperatorsV1() OperatorsV1Lister {
230230
func NewLister() OperatorLister {
231231
// TODO: better initialization
232232
return &lister{
233-
appsV1Lister: newAppsV1Lister(),
234-
coreV1Lister: newCoreV1Lister(),
235-
rbacV1Lister: newRbacV1Lister(),
236-
apiRegistrationV1Lister: newAPIRegistrationV1Lister(),
237-
apiExtensionsV1Lister: newAPIExtensionsV1Lister(),
238-
operatorsV1alpha1Lister: newOperatorsV1alpha1Lister(),
239-
operatorsV1Lister: newOperatorsV1Lister(),
233+
appsV1Lister: newAppsV1Lister(),
234+
coreV1Lister: newCoreV1Lister(),
235+
rbacV1Lister: newRbacV1Lister(),
236+
apiRegistrationV1Lister: newAPIRegistrationV1Lister(),
237+
apiExtensionsV1Lister: newAPIExtensionsV1Lister(),
238+
operatorsV1alpha1Lister: newOperatorsV1alpha1Lister(),
239+
operatorsV1Lister: newOperatorsV1Lister(),
240240
}
241241
}

scripts/update_mockgen.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ go install -mod=vendor ./vendor/github.com/maxbrunsfeld/counterfeiter/v6
66

77
# generate fakes and mocks
88
go generate -mod=vendor ./pkg/...
9-
counterfeiter -o ./pkg/fakes/client-go/listers/fake_v1_service_account_lister.go ./vendor/k8s.io/client-go/listers/core/v1 ServiceAccountLister
10-
counterfeiter -o ./pkg/fakes/client-go/listers/fake_v1_service_account_namespace_lister.go ./vendor/k8s.io/client-go/listers/core/v1 ServiceAccountNamespaceLister
9+
go run github.com/maxbrunsfeld/counterfeiter/v6 -o ./pkg/fakes/client-go/listers/fake_v1_service_account_lister.go ./vendor/k8s.io/client-go/listers/core/v1 ServiceAccountLister
10+
go run github.com/maxbrunsfeld/counterfeiter/v6 -o ./pkg/fakes/client-go/listers/fake_v1_service_account_namespace_lister.go ./vendor/k8s.io/client-go/listers/core/v1 ServiceAccountNamespaceLister

0 commit comments

Comments
 (0)