Skip to content

Commit c439aa7

Browse files
committed
mockgen deprecated: use uber-go/mock instead
1 parent 97028f3 commit c439aa7

File tree

13 files changed

+1768
-9
lines changed

13 files changed

+1768
-9
lines changed

go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ require (
1212
github.com/devfile/library/v2 v2.2.3-0.20250502201248-d0fa9c11591d
1313
github.com/devfile/registry-support/index/generator v0.0.0-20240419194226-cca4c9a81f8d
1414
github.com/devfile/registry-support/registry-library v0.0.0-20240521161747-89fc566cb024
15-
github.com/golang/mock v1.6.0
1615
github.com/gorilla/securecookie v1.1.2
1716
github.com/gorilla/sessions v1.4.0
1817
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
@@ -31,7 +30,8 @@ require (
3130
github.com/rawagner/graphql-transport-ws v0.0.0-20200817140314-dcfbf0388067
3231
github.com/redhat-certification/chart-verifier v0.0.0-20250415162918-111669f9d053
3332
github.com/stretchr/testify v1.10.0
34-
golang.org/x/mod v0.25.0
33+
go.uber.org/mock v0.6.0
34+
golang.org/x/mod v0.27.0
3535
golang.org/x/net v0.41.0
3636
golang.org/x/oauth2 v0.30.0
3737
gopkg.in/yaml.v2 v2.4.0
@@ -106,6 +106,7 @@ require (
106106
github.com/gobwas/glob v0.2.3 // indirect
107107
github.com/gogo/protobuf v1.3.2 // indirect
108108
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
109+
github.com/golang/mock v1.6.0 // indirect
109110
github.com/google/btree v1.1.3 // indirect
110111
github.com/google/cel-go v0.23.2 // indirect
111112
github.com/google/gnostic-models v0.6.9 // indirect

go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,8 @@ go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1
593593
go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
594594
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
595595
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
596+
go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
597+
go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
596598
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
597599
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
598600
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
@@ -613,8 +615,8 @@ golang.org/x/exp v0.0.0-20250228200357-dead58393ab7/go.mod h1:BHOTPb3L19zxehTsLo
613615
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
614616
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
615617
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
616-
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
617-
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
618+
golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
619+
golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
618620
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
619621
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
620622
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -669,8 +671,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
669671
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
670672
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
671673
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
672-
golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
673-
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
674+
golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
675+
golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
674676
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
675677
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
676678
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

pkg/devfile/resources_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"github.com/devfile/library/v2/pkg/devfile/parser"
1414
"github.com/devfile/library/v2/pkg/devfile/parser/data"
1515
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
16-
"github.com/golang/mock/gomock"
1716
"github.com/stretchr/testify/assert"
17+
"go.uber.org/mock/gomock"
1818
)
1919

2020
func TestGetResourceFromDevfile(t *testing.T) {

pkg/devfile/utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/devfile/library/v2/pkg/devfile/parser"
1111
"github.com/devfile/library/v2/pkg/devfile/parser/data"
1212
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
13-
"github.com/golang/mock/gomock"
13+
"go.uber.org/mock/gomock"
1414
)
1515

1616
func TestGetImageBuildComponent(t *testing.T) {

vendor/go.uber.org/mock/AUTHORS

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.uber.org/mock/LICENSE

Lines changed: 202 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)