Merge pull request #171 from appuio/fix/replace-gomock

Replace github.com/golang/mock with go.uber.org/mock
appuio · Nov 29, 2023 · f585de6 · f585de6
2 parents 0573991 + 3a58c65
commit f585de6
Show file tree

Hide file tree

Showing 25 changed files with 81 additions and 61 deletions.
diff --git a/apiserver/authwrapper/authorizer.go b/apiserver/authwrapper/authorizer.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/filters"
 )
 
-//go:generate go run github.com/golang/mock/mockgen -destination=./mock/$GOFILE -package mock k8s.io/apiserver/pkg/authorization/authorizer Authorizer
+//go:generate go run go.uber.org/mock/mockgen -destination=./mock/$GOFILE -package mock k8s.io/apiserver/pkg/authorization/authorizer Authorizer
 
 // Authorizer processes authorization requests for `{rbacID.Resource}` and checks them based on rbac rules for `{rbacID}`
 type Authorizer struct {

diff --git a/apiserver/authwrapper/mock/authorizer.go b/apiserver/authwrapper/mock/authorizer.go
diff --git a/apiserver/authwrapper/mock/storage.go b/apiserver/authwrapper/mock/storage.go
diff --git a/apiserver/authwrapper/storage.go b/apiserver/authwrapper/storage.go
@@ -17,7 +17,7 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 )
 
-//go:generate go run github.com/golang/mock/mockgen -destination=./mock/$GOFILE -package mock k8s.io/apiserver/pkg/registry/rest StandardStorage,Storage,Responder
+//go:generate go run go.uber.org/mock/mockgen -destination=./mock/$GOFILE -package mock k8s.io/apiserver/pkg/registry/rest StandardStorage,Storage,Responder
 
 var _ StandardStorage = &authorizedStorageWithLister{}
 

diff --git a/apiserver/authwrapper/storage_test.go b/apiserver/authwrapper/storage_test.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"

diff --git a/apiserver/billing/odoostorage/odoo/odoo8/client/clientmock/session.go b/apiserver/billing/odoostorage/odoo/odoo8/client/clientmock/session.go
diff --git a/apiserver/billing/odoostorage/odoo/odoo8/client/session.go b/apiserver/billing/odoostorage/odoo/odoo8/client/session.go
@@ -13,7 +13,7 @@ var (
 	ErrInvalidCredentials = errors.New("invalid credentials")
 )
 
-//go:generate go run github.com/golang/mock/mockgen -destination=./clientmock/$GOFILE -package clientmock . QueryExecutor
+//go:generate go run go.uber.org/mock/mockgen -destination=./clientmock/$GOFILE -package clientmock . QueryExecutor
 
 // QueryExecutor runs queries against Odoo API.
 type QueryExecutor interface {

diff --git a/apiserver/billing/odoostorage/odoo/odoo8/odoo8_test.go b/apiserver/billing/odoostorage/odoo/odoo8/odoo8_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	billingv1 "github.com/appuio/control-api/apis/billing/v1"

diff --git a/apiserver/billing/rbac_test.go b/apiserver/billing/rbac_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"
 	rbacv1 "k8s.io/api/rbac/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/apiserver/organization/create_test.go b/apiserver/organization/create_test.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 
 	orgv1 "github.com/appuio/control-api/apis/organization/v1"
 	controlv1 "github.com/appuio/control-api/apis/v1"

diff --git a/apiserver/organization/delete_test.go b/apiserver/organization/delete_test.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 
 	orgv1 "github.com/appuio/control-api/apis/organization/v1"
 

diff --git a/apiserver/organization/get_test.go b/apiserver/organization/get_test.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 
 	orgv1 "github.com/appuio/control-api/apis/organization/v1"
 

diff --git a/apiserver/organization/list_test.go b/apiserver/organization/list_test.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
 
 	orgv1 "github.com/appuio/control-api/apis/organization/v1"
 

diff --git a/apiserver/organization/members.go b/apiserver/organization/members.go
@@ -11,7 +11,7 @@ import (
 
 // memberProvider is an abstraction for interacting with the OrganizationMembers Object
 //
-//go:generate go run github.com/golang/mock/mockgen -source=$GOFILE -destination=./mock/$GOFILE
+//go:generate go run go.uber.org/mock/mockgen -source=$GOFILE -destination=./mock/$GOFILE
 type memberProvider interface {
 	CreateMembers(ctx context.Context, members *controlv1.OrganizationMembers) error
 }

diff --git a/apiserver/organization/mock/members.go b/apiserver/organization/mock/members.go