cleanup: add vet and make it pass (#3241)

* make go vet pass Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> * add vet to makefile Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> --------- Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
operator-framework · May 10, 2024 · 1c406c2 · 1c406c2
1 parent ef919fe
commit 1c406c2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -41,6 +41,10 @@ endif
 .PHONY: FORCE
 FORCE:
 
+.PHONY: vet
+vet:
+	go vet $(MOD_FLAGS) ./...
+
 all: test build
 
 test: clean cover.out
@@ -73,7 +77,7 @@ coverage-html: cover.out
 	go tool cover -html=cover.out
 
 build: build_cmd=build
-build: clean $(CMDS)
+build: clean vet $(CMDS)
 
 # build versions of the binaries with coverage enabled
 build-coverage: build_cmd=test -c -covermode=count -coverpkg ./pkg/controller/...

diff --git a/pkg/api/client/clientset/versioned/fake/decorator.go b/pkg/api/client/clientset/versioned/fake/decorator.go
@@ -47,7 +47,7 @@ func NewReactionForwardingClientsetDecorator(objects []runtime.Object, options .
 
 	// Swap out the embedded ReactionChain with a Reactor that reduces over the decorator's ReactionChain.
 	decorator.ReactionChain = decorator.Clientset.ReactionChain
-	decorator.Clientset.ReactionChain = []testing.Reactor{&testing.SimpleReactor{"*", "*", decorator.reduceReactions}}
+	decorator.Clientset.ReactionChain = []testing.Reactor{&testing.SimpleReactor{Verb: "*", Resource: "*", Reaction: decorator.reduceReactions}}
 
 	// Apply options
 	for _, option := range options {
@@ -81,5 +81,5 @@ func (c *ReactionForwardingClientsetDecorator) reduceReactions(action testing.Ac
 
 // PrependReactor adds a reactor to the beginning of the chain.
 func (c *ReactionForwardingClientsetDecorator) PrependReactor(verb, resource string, reaction testing.ReactionFunc) {
-	c.ReactionChain = append([]testing.Reactor{&testing.SimpleReactor{verb, resource, reaction}}, c.ReactionChain...)
+	c.ReactionChain = append([]testing.Reactor{&testing.SimpleReactor{Verb: verb, Resource: resource, Reaction: reaction}}, c.ReactionChain...)
 }
diff --git a/pkg/lib/clientfake/decorator.go b/pkg/lib/clientfake/decorator.go
@@ -34,7 +34,7 @@ func NewReactionForwardingClientsetDecorator(objects []runtime.Object, options .
 
 	// Swap out the embedded ReactionChain with a Reactor that reduces over the decorator's ReactionChain.
 	decorator.ReactionChain = decorator.Clientset.ReactionChain
-	decorator.Clientset.ReactionChain = []testing.Reactor{&testing.SimpleReactor{"*", "*", decorator.reduceReactions}}
+	decorator.Clientset.ReactionChain = []testing.Reactor{&testing.SimpleReactor{Verb: "*", Resource: "*", Reaction: decorator.reduceReactions}}
 
 	// Apply options
 	for _, option := range options {
@@ -68,5 +68,5 @@ func (c *ReactionForwardingClientsetDecorator) reduceReactions(action testing.Ac
 
 // PrependReactor adds a reactor to the beginning of the chain.
 func (c *ReactionForwardingClientsetDecorator) PrependReactor(verb, resource string, reaction testing.ReactionFunc) {
-	c.ReactionChain = append([]testing.Reactor{&testing.SimpleReactor{verb, resource, reaction}}, c.ReactionChain...)
+	c.ReactionChain = append([]testing.Reactor{&testing.SimpleReactor{Verb: verb, Resource: resource, Reaction: reaction}}, c.ReactionChain...)
 }
diff --git a/pkg/lib/operatorstatus/csv_reporter_test.go b/pkg/lib/operatorstatus/csv_reporter_test.go
@@ -37,7 +37,7 @@ func TestGetNewStatus(t *testing.T) {
 					},
 					Spec: v1alpha1.ClusterServiceVersionSpec{
 						Version: version.OperatorVersion{
-							semver.Version{
+							Version: semver.Version{
 								Major: 1, Minor: 0, Patch: 0,
 							},
 						},
@@ -100,7 +100,7 @@ func TestGetNewStatus(t *testing.T) {
 					},
 					Spec: v1alpha1.ClusterServiceVersionSpec{
 						Version: version.OperatorVersion{
-							semver.Version{
+							Version: semver.Version{
 								Major: 1, Minor: 0, Patch: 0,
 							},
 						},
@@ -180,7 +180,7 @@ func TestGetNewStatus(t *testing.T) {
 					},
 					Spec: v1alpha1.ClusterServiceVersionSpec{
 						Version: version.OperatorVersion{
-							semver.Version{
+							Version: semver.Version{
 								Major: 1, Minor: 0, Patch: 0,
 							},
 						},
@@ -260,7 +260,7 @@ func TestGetNewStatus(t *testing.T) {
 					},
 					Spec: v1alpha1.ClusterServiceVersionSpec{
 						Version: version.OperatorVersion{
-							semver.Version{
+							Version: semver.Version{
 								Major: 1, Minor: 0, Patch: 0,
 							},
 						},