Skip to content

CNF-23387: mockgen deprecated: use uber-go/mock instead #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebrandon1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CNF-23387: mockgen deprecated: use uber-go/mock instead #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ require (
github.com/distribution/distribution/v3 v3.0.0
github.com/dustin/go-humanize v1.0.1
github.com/go-openapi/swag v0.23.0
github.com/golang/mock v1.7.0-rc.1
github.com/hashicorp/go-version v1.8.0
github.com/itchyny/gojq v0.12.18
github.com/onsi/ginkgo/v2 v2.28.1
Expand All @@ -33,6 +32,8 @@ require (
github.com/spf13/cobra v1.10.2
github.com/thedevsaddam/retry v1.2.1
github.com/thoas/go-funk v0.9.3
github.com/vincent-petithory/dataurl v1.0.0
go.uber.org/mock v0.6.0
golang.org/x/crypto v0.47.0
golang.org/x/term v0.39.0
k8s.io/api v0.30.3
Expand Down Expand Up @@ -133,6 +134,7 @@ require (
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/golang/mock v1.7.0-rc.1 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
Expand Down Expand Up @@ -233,7 +235,6 @@ require (
github.com/spf13/pflag v1.0.10 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/ulikunitz/xz v0.5.15 // indirect
github.com/vincent-petithory/dataurl v1.0.0 // indirect
github.com/vmware/govmomi v0.37.2 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,8 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
Expand Down
2 changes: 1 addition & 1 deletion pkg/coreos/coreos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/go-openapi/swag"
"github.com/openshift/appliance/pkg/types"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
. "github.com/onsi/ginkgo/v2/dsl/core"
. "github.com/onsi/gomega"
"github.com/openshift/appliance/pkg/asset/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/executer/mock_executer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/genisoimage/genisoimage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
. "github.com/onsi/ginkgo/v2/dsl/core"
. "github.com/onsi/gomega"
"github.com/openshift/appliance/pkg/executer"
Expand Down
2 changes: 1 addition & 1 deletion pkg/ignition/mock_ignition.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/installer/installer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/openshift/appliance/pkg/release"
"github.com/openshift/appliance/pkg/types"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
. "github.com/onsi/ginkgo/v2/dsl/core"
. "github.com/onsi/gomega"
"github.com/openshift/appliance/pkg/asset/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/registry/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
. "github.com/onsi/ginkgo/v2/dsl/core"
. "github.com/onsi/ginkgo/v2/dsl/table"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion pkg/release/mock_release.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/release/release_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"github.com/go-openapi/swag"
"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
. "github.com/onsi/ginkgo/v2/dsl/core"
. "github.com/onsi/gomega"
"github.com/openshift/appliance/pkg/asset/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/releasebundle/releasebundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/openshift/appliance/pkg/executer"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/skopeo/skopeo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/openshift/appliance/pkg/consts"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
. "github.com/onsi/ginkgo/v2/dsl/core"
. "github.com/onsi/gomega"
"github.com/openshift/appliance/pkg/executer"
Expand Down
2 changes: 1 addition & 1 deletion pkg/syslinux/syslinux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
. "github.com/onsi/ginkgo/v2/dsl/core"
. "github.com/onsi/gomega"
"github.com/openshift/appliance/pkg/executer"
Expand Down