Migrate gomock to Uber gomock (#1196)

ansible · Oct 25, 2024 · 72de0f7 · 72de0f7
1 parent 52be401
commit 72de0f7
Show file tree

Hide file tree

Showing 33 changed files with 1,222 additions and 1,179 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -86,7 +86,6 @@ linters-settings:
           - "github.com/fortytw2/leaktest"
           - "github.com/fsnotify/fsnotify"
           - "github.com/gorilla/websocket"
-          - "github.com/golang/mock/gomock"
           - "github.com/prep/socketpair"
           - "github.com/google/go-cmp/cmp"
           - "k8s.io/api/core/v1"

diff --git a/pkg/backends/mock_backends/websockets.go b/pkg/backends/mock_backends/websockets.go
diff --git a/pkg/backends/websockets_test.go b/pkg/backends/websockets_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/ansible/receptor/pkg/backends"
 	"github.com/ansible/receptor/pkg/backends/mock_backends"
 	"github.com/ansible/receptor/pkg/logger"
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 )
 
 const (
@@ -208,11 +208,11 @@ func TestWebsocketDialerGetTLS(t *testing.T) {
 	}
 }
 
-func setUpListener(t *testing.T) (*gomock.Controller, *mock_backends.MockGorillaWebsocketUpgraderForListener, *mock_backends.MockHttpServerForListener) {
+func setUpListener(t *testing.T) (*gomock.Controller, *mock_backends.MockGorillaWebsocketUpgraderForListener, *mock_backends.MockHTTPServerForListener) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	mockWebsocketUpgrader := mock_backends.NewMockGorillaWebsocketUpgraderForListener(ctrl)
-	mockServer := mock_backends.NewMockHttpServerForListener(ctrl)
+	mockServer := mock_backends.NewMockHTTPServerForListener(ctrl)
 
 	return ctrl, mockWebsocketUpgrader, mockServer
 }

diff --git a/pkg/controlsvc/connect_test.go b/pkg/controlsvc/connect_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ansible/receptor/pkg/controlsvc"
 	"github.com/ansible/receptor/pkg/controlsvc/mock_controlsvc"
 	"github.com/ansible/receptor/pkg/logger"
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 )
 
 func CheckExpectedError(expectedError bool, errorMessage string, t *testing.T, err error) {

diff --git a/pkg/controlsvc/controlsvc_test.go b/pkg/controlsvc/controlsvc_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ansible/receptor/pkg/controlsvc"
 	"github.com/ansible/receptor/pkg/controlsvc/mock_controlsvc"
 	"github.com/ansible/receptor/pkg/logger"
-	"github.com/golang/mock/gomock"
+	"go.uber.org/mock/gomock"
 )
 
 const (

diff --git a/pkg/controlsvc/mock_controlsvc/controlsvc.go b/pkg/controlsvc/mock_controlsvc/controlsvc.go