ingress-controller/mock: switch to uber mock (#939)

pomerium · Apr 16, 2024 · 5e833f1 · 5e833f1
1 parent 883ba78
commit 5e833f1
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 51 deletions.
diff --git a/controllers/ingress/controller_test.go b/controllers/ingress/controller_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -44,7 +44,8 @@ func TestManagingIngressClass(t *testing.T) {
 			networkingv1.Ingress{
 				Spec: networkingv1.IngressSpec{
 					IngressClassName: &pomeriumIngressClass,
-				}},
+				},
+			},
 			[]networkingv1.IngressClass{{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: pomeriumIngressClass,
@@ -61,7 +62,8 @@ func TestManagingIngressClass(t *testing.T) {
 				Spec: networkingv1.IngressSpec{
 					IngressClassName: &otherIngressClass,
 				},
-			}, []networkingv1.IngressClass{{
+			},
+			[]networkingv1.IngressClass{{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: otherIngressClass,
 				},
@@ -79,7 +81,8 @@ func TestManagingIngressClass(t *testing.T) {
 						IngressClassAnnotationKey: pomeriumIngressClass,
 					},
 				},
-			}, []networkingv1.IngressClass{{
+			},
+			[]networkingv1.IngressClass{{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: pomeriumIngressClass,
 				},
@@ -90,7 +93,9 @@ func TestManagingIngressClass(t *testing.T) {
 			true,
 		},
 		{
-			"default ingress", networkingv1.Ingress{}, []networkingv1.IngressClass{{
+			"default ingress",
+			networkingv1.Ingress{},
+			[]networkingv1.IngressClass{{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: pomeriumIngressClass,
 					Annotations: map[string]string{

diff --git a/controllers/mock/client.go b/controllers/mock/client.go
diff --git a/controllers/mock/mock.go b/controllers/mock/mock.go
@@ -1,6 +1,6 @@
 // Package mock_test contains mock clients for testing
 package mock_test
 
-//go:generate go run github.com/golang/mock/mockgen -package mock_test -destination client.go sigs.k8s.io/controller-runtime/pkg/client Client
-//go:generate go run github.com/golang/mock/mockgen -package mock_test -destination pomerium_ingress_reconciler.go github.com/pomerium/ingress-controller/pomerium IngressReconciler
-//go:generate go run github.com/golang/mock/mockgen -package mock_test -destination pomerium_config_reconciler.go github.com/pomerium/ingress-controller/pomerium ConfigReconciler
+//go:generate go run go.uber.org/mock/mockgen -package mock_test -destination client.go sigs.k8s.io/controller-runtime/pkg/client Client
+//go:generate go run go.uber.org/mock/mockgen -package mock_test -destination pomerium_ingress_reconciler.go github.com/pomerium/ingress-controller/pomerium IngressReconciler
+//go:generate go run go.uber.org/mock/mockgen -package mock_test -destination pomerium_config_reconciler.go github.com/pomerium/ingress-controller/pomerium ConfigReconciler
diff --git a/controllers/mock/pomerium_config_reconciler.go b/controllers/mock/pomerium_config_reconciler.go
diff --git a/controllers/mock/pomerium_ingress_reconciler.go b/controllers/mock/pomerium_ingress_reconciler.go
diff --git a/controllers/settings/fetch_test.go b/controllers/settings/fetch_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 	"google.golang.org/protobuf/proto"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/controllers/settings/integration_test.go b/controllers/settings/integration_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"github.com/go-logr/zapr"
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"go.uber.org/mock/gomock"
 	"go.uber.org/zap/zaptest"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/cspell.config.yaml b/cspell.config.yaml
@@ -7,6 +7,7 @@ words:
   - databroker
   - deepcopy
   - envtest
+  - mockgen
   - pomerium
   - protobuf
   - oidc

diff --git a/go.mod b/go.mod
@@ -9,21 +9,22 @@ require (
 	github.com/go-logr/logr v1.4.1
 	github.com/go-logr/zapr v1.3.0
 	github.com/go-playground/validator/v10 v10.19.0
-	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
 	github.com/gosimple/slug v1.14.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/iancoleman/strcase v0.3.0
 	github.com/martinlindhe/base36 v1.1.1
 	github.com/open-policy-agent/opa v0.63.0
+	github.com/pomerium/csrf v1.7.0
 	github.com/pomerium/pomerium v0.25.1
 	github.com/rs/zerolog v1.32.0
 	github.com/sergi/go-diff v1.3.1
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.18.2
 	github.com/stretchr/testify v1.9.0
+	go.uber.org/mock v0.4.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.6.0
 	google.golang.org/grpc v1.62.1
@@ -152,7 +153,6 @@ require (
 	github.com/philhofer/fwd v1.0.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/pomerium/csrf v1.7.0 // indirect
 	github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524 // indirect
 	github.com/pomerium/webauthn v0.0.0-20221118023040-00a9c430578b // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect