Bump mocks (#1600)

The original mock framework is now a public archive (https://github.com/golang/mock) and https://github.com/uber-go/mock is now used. This PR changes the mocks lib. Signed-off-by: Michal Kuritka <[email protected]>
k8gb-io · Jun 14, 2024 · 767dd43 · 767dd43
1 parent 6d4c520
commit 767dd43
Show file tree

Hide file tree

Showing 14 changed files with 122 additions and 71 deletions.
diff --git a/Makefile b/Makefile
@@ -388,7 +388,7 @@ k8gb: lint
 
 .PHONY: mocks
 mocks:
-	go install github.com/golang/mock/mockgen@v1.5.0
+	go install go.uber.org/mock/mockgen@v0.4.0
 	mockgen -package=mocks -destination=controllers/mocks/assistant_mock.go -source=controllers/providers/assistant/assistant.go Assistant
 	mockgen -package=mocks -destination=controllers/mocks/infoblox-client_mock.go -source=controllers/providers/dns/infoblox-client.go InfobloxClient
 	mockgen -package=mocks -destination=controllers/mocks/infoblox-connection_mock.go github.com/infobloxopen/infoblox-go-client IBConnector

diff --git a/controllers/gslb_controller_reconciliation_test.go b/controllers/gslb_controller_reconciliation_test.go
@@ -40,11 +40,11 @@ import (
 	"github.com/k8gb-io/k8gb/controllers/tracing"
 
 	str "github.com/AbsaOSS/gopkg/string"
-	"github.com/golang/mock/gomock"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/api/errors"

diff --git a/controllers/gslb_controller_weight_test.go b/controllers/gslb_controller_weight_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/k8gb-io/k8gb/controllers/mocks"
 	"github.com/k8gb-io/k8gb/controllers/providers/assistant"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	externaldns "sigs.k8s.io/external-dns/endpoint"
 )

diff --git a/controllers/mocks/assistant_mock.go b/controllers/mocks/assistant_mock.go
diff --git a/controllers/mocks/client_mock.go b/controllers/mocks/client_mock.go
diff --git a/controllers/mocks/infoblox-client_mock.go b/controllers/mocks/infoblox-client_mock.go
diff --git a/controllers/mocks/infoblox-connection_mock.go b/controllers/mocks/infoblox-connection_mock.go