From 1334a7b9605e2e96dbee869e270aca1375309624 Mon Sep 17 00:00:00 2001 From: James Yean Date: Thu, 21 Dec 2023 15:08:00 +0800 Subject: [PATCH] feat: use go.uber.org/mock instead of github.com/golang/mock (#645) Signed-off-by: James Yean --- api/cluster/mock_controller.go | 2 +- api/controller/controller_grpc_mock.pb.go | 2 +- api/go.mod | 2 +- api/go.sum | 13 +--- api/proxy/proxy_grpc_mock.pb.go | 2 +- api/segment/segment_grpc_mock.pb.go | 2 +- api/trigger/trigger_grpc_mock.pb.go | 2 +- client/go.mod | 2 +- client/go.sum | 8 +- client/mock_client.go | 15 ++-- client/pkg/api/mock_client.go | 53 ++++++++------ go.mod | 2 +- go.sum | 8 +- go.work.sum | 3 +- pkg/authentication/authentication.go | 2 +- pkg/authentication/authentication_test.go | 2 +- pkg/authentication/client.go | 2 +- pkg/authentication/mock_authentication.go | 9 ++- pkg/authentication/mock_client.go | 9 ++- pkg/authorization/authorization.go | 2 +- pkg/authorization/authorization_test.go | 2 +- pkg/authorization/client.go | 2 +- pkg/authorization/mock_authorization.go | 9 ++- pkg/authorization/mock_client.go | 17 +++-- pkg/kv/client.go | 1 + pkg/kv/mock_client.go | 33 +++++---- .../controller/eventbus/block/block_test.go | 2 +- .../controller/eventbus/block/mock_block.go | 13 +++- .../eventbus/block/selector_test.go | 2 +- server/controller/eventbus/controller_test.go | 2 +- .../eventbus/eventlog/eventlog_test.go | 2 +- .../eventbus/eventlog/mock_eventlog.go | 27 ++++--- .../eventbus/eventlog/segment_test.go | 2 +- .../eventbus/server/instance_test.go | 2 +- .../eventbus/server/manager_test.go | 2 +- .../eventbus/server/mock_instance.go | 13 +++- .../eventbus/server/mock_manager.go | 27 ++++--- .../eventbus/volume/manager_test.go | 2 +- .../eventbus/volume/mock_manager.go | 19 +++-- server/controller/member/mock_member.go | 15 ++-- server/controller/tenant/controller_test.go | 2 +- .../tenant/manager/mock_namespace.go | 19 +++-- server/controller/tenant/manager/mock_role.go | 19 +++-- .../controller/tenant/manager/mock_token.go | 21 ++++-- server/controller/tenant/manager/mock_user.go | 17 +++-- .../tenant/manager/namespace_test.go | 2 +- server/controller/tenant/manager/role_test.go | 2 +- .../controller/tenant/manager/token_test.go | 2 +- server/controller/tenant/manager/user_test.go | 2 +- server/controller/trigger/controller_test.go | 2 +- .../controller/trigger/secret/mock_storage.go | 13 +++- .../controller/trigger/storage/mock_offset.go | 15 ++-- .../trigger/storage/mock_storage.go | 2 +- .../trigger/storage/mock_subscription.go | 17 +++-- .../trigger/storage/mock_trigger_worker.go | 15 ++-- .../controller/trigger/storage/offset_test.go | 2 +- .../controller/trigger/storage/secret_test.go | 2 +- .../trigger/storage/subscription_test.go | 2 +- .../trigger/storage/trigger_worker_test.go | 2 +- .../trigger/subscription/mock_subscription.go | 35 +++++---- .../subscription/offset/mock_offset.go | 13 +++- .../subscription/offset/offset_test.go | 2 +- .../trigger/subscription/offset_test.go | 2 +- .../trigger/subscription/subscription_test.go | 2 +- .../controller/trigger/worker/manager_test.go | 2 +- .../controller/trigger/worker/mock_manager.go | 17 +++-- .../controller/trigger/worker/mock_worker.go | 19 +++-- .../trigger/worker/scheduler_test.go | 2 +- .../controller/trigger/worker/worker_test.go | 2 +- server/gateway/gateway_test.go | 2 +- server/gateway/proxy/direct_test.go | 2 +- server/gateway/proxy/proxy_test.go | 2 +- server/store/block/entry_test.go | 2 +- server/store/block/fragment_test.go | 2 +- server/store/block/testing/mock_block.go | 19 +++-- server/store/block/testing/mock_entry.go | 73 ++++++++++--------- server/store/block/testing/mock_fragment.go | 7 +- .../raft/storage/mock_snapshot_storage.go | 11 ++- server/store/raft/storage/snapshot_storage.go | 2 +- .../raft/storage/snapshot_storage_test.go | 2 +- .../store/schema/ce/convert/protobuf_test.go | 2 +- server/store/schema/ce/field_test.go | 2 +- server/store/schema/ce/testing/entry.go | 2 +- server/store/segment/api_test.go | 2 +- server/store/segment/mock_polling.go | 11 ++- server/store/segment/mock_replica.go | 19 +++-- server/store/segment/mock_server.go | 33 +++++---- server/store/segment/server_init_test.go | 2 +- server/store/segment/server_test.go | 2 +- server/store/vsb/block_append_test.go | 2 +- server/store/vsb/block_open_test.go | 2 +- server/store/vsb/block_read_test.go | 2 +- server/store/vsb/codec/codec_test.go | 2 +- server/store/vsb/fragment_test.go | 2 +- server/store/vsb/index/entry_test.go | 2 +- server/store/vsb/index/index_test.go | 2 +- server/store/vsb/index/testing/entry.go | 2 +- server/store/vsb/index/testing/index.go | 2 +- server/store/vsb/index/testing/mock_index.go | 7 +- .../leaderelection/leaderelection_test.go | 2 +- .../leaderelection/mock_leaderelection.go | 15 ++-- server/timer/timingwheel/bucket_test.go | 2 +- server/timer/timingwheel/timingwheel_test.go | 2 +- server/trigger/client/mock_interface.go | 19 +++-- server/trigger/mock_worker.go | 25 ++++--- server/trigger/reader/mock_reader.go | 7 +- server/trigger/reader/reader_test.go | 2 +- server/trigger/server_test.go | 2 +- server/trigger/trigger/mock_trigger.go | 21 ++++-- server/trigger/trigger/trigger_test.go | 2 +- server/trigger/worker_test.go | 2 +- 111 files changed, 544 insertions(+), 371 deletions(-) diff --git a/api/cluster/mock_controller.go b/api/cluster/mock_controller.go index e8278a8bb..4c7999d1c 100644 --- a/api/cluster/mock_controller.go +++ b/api/cluster/mock_controller.go @@ -9,7 +9,7 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" controller "github.com/vanus-labs/vanus/api/controller" meta "github.com/vanus-labs/vanus/api/meta" ) diff --git a/api/controller/controller_grpc_mock.pb.go b/api/controller/controller_grpc_mock.pb.go index 0586bb09f..d5ff35a56 100644 --- a/api/controller/controller_grpc_mock.pb.go +++ b/api/controller/controller_grpc_mock.pb.go @@ -7,8 +7,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" meta "github.com/vanus-labs/vanus/api/meta" + gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/api/go.mod b/api/go.mod index ad6897918..b3da184b1 100644 --- a/api/go.mod +++ b/api/go.mod @@ -4,11 +4,11 @@ go 1.19 require ( github.com/cloudevents/sdk-go/v2 v2.14.0 - github.com/golang/mock v1.6.0 github.com/pkg/errors v0.9.1 github.com/smartystreets/goconvey v1.8.1 github.com/vanus-labs/vanus/pkg/observability v0.0.0-00010101000000-000000000000 github.com/vanus-labs/vanus/pkg/raft v0.9.0 + go.uber.org/mock v0.4.0 golang.org/x/oauth2 v0.7.0 google.golang.org/grpc v1.54.0 google.golang.org/protobuf v1.30.0 diff --git a/api/go.sum b/api/go.sum index 5a4647ee6..4aef1112d 100644 --- a/api/go.sum +++ b/api/go.sum @@ -7,8 +7,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= @@ -57,19 +55,18 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= @@ -77,19 +74,14 @@ golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -99,7 +91,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/api/proxy/proxy_grpc_mock.pb.go b/api/proxy/proxy_grpc_mock.pb.go index 0ddf3b8a1..db9d577fd 100644 --- a/api/proxy/proxy_grpc_mock.pb.go +++ b/api/proxy/proxy_grpc_mock.pb.go @@ -7,9 +7,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" controller "github.com/vanus-labs/vanus/api/controller" meta "github.com/vanus-labs/vanus/api/meta" + gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/api/segment/segment_grpc_mock.pb.go b/api/segment/segment_grpc_mock.pb.go index 4f5477e73..0bb3f6b85 100644 --- a/api/segment/segment_grpc_mock.pb.go +++ b/api/segment/segment_grpc_mock.pb.go @@ -7,7 +7,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/api/trigger/trigger_grpc_mock.pb.go b/api/trigger/trigger_grpc_mock.pb.go index 803d26fa3..f9c95bb80 100644 --- a/api/trigger/trigger_grpc_mock.pb.go +++ b/api/trigger/trigger_grpc_mock.pb.go @@ -7,7 +7,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/client/go.mod b/client/go.mod index dc6097617..c2d941c7a 100644 --- a/client/go.mod +++ b/client/go.mod @@ -4,12 +4,12 @@ go 1.19 require ( github.com/cloudevents/sdk-go/v2 v2.14.0 - github.com/golang/mock v1.6.0 github.com/scylladb/go-set v1.0.2 github.com/vanus-labs/vanus/api v0.9.0 github.com/vanus-labs/vanus/pkg/observability v0.9.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 go.opentelemetry.io/otel/trace v1.14.0 + go.uber.org/mock v0.4.0 google.golang.org/grpc v1.54.0 google.golang.org/protobuf v1.30.0 ) diff --git a/client/go.sum b/client/go.sum index 63b5c5c91..91dc0a053 100644 --- a/client/go.sum +++ b/client/go.sum @@ -94,8 +94,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -197,7 +195,6 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -227,6 +224,8 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= @@ -267,7 +266,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -312,7 +310,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -401,7 +398,6 @@ golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/client/mock_client.go b/client/mock_client.go index 61ebcb453..ab3916998 100644 --- a/client/mock_client.go +++ b/client/mock_client.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: client.go +// +// Generated by this command: +// +// mockgen -source=client.go -destination=mock_client.go -package=client +// // Package client is a generated GoMock package. package client @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" api "github.com/vanus-labs/vanus/client/pkg/api" + gomock "go.uber.org/mock/gomock" ) // MockClient is a mock of Client interface. @@ -42,7 +47,7 @@ func (m *MockClient) Disconnect(ctx context.Context) { } // Disconnect indicates an expected call of Disconnect. -func (mr *MockClientMockRecorder) Disconnect(ctx interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Disconnect(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Disconnect", reflect.TypeOf((*MockClient)(nil).Disconnect), ctx) } @@ -50,7 +55,7 @@ func (mr *MockClientMockRecorder) Disconnect(ctx interface{}) *gomock.Call { // Eventbus mocks base method. func (m *MockClient) Eventbus(ctx context.Context, opts ...api.EventbusOption) api.Eventbus { m.ctrl.T.Helper() - varargs := []interface{}{ctx} + varargs := []any{ctx} for _, a := range opts { varargs = append(varargs, a) } @@ -60,8 +65,8 @@ func (m *MockClient) Eventbus(ctx context.Context, opts ...api.EventbusOption) a } // Eventbus indicates an expected call of Eventbus. -func (mr *MockClientMockRecorder) Eventbus(ctx interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Eventbus(ctx any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx}, opts...) + varargs := append([]any{ctx}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Eventbus", reflect.TypeOf((*MockClient)(nil).Eventbus), varargs...) } diff --git a/client/pkg/api/mock_client.go b/client/pkg/api/mock_client.go index 49e0f23f4..7ec95623e 100644 --- a/client/pkg/api/mock_client.go +++ b/client/pkg/api/mock_client.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: client.go +// +// Generated by this command: +// +// mockgen -source=client.go -destination=mock_client.go -package=api +// // Package api is a generated GoMock package. package api @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" cloudevents "github.com/vanus-labs/vanus/api/cloudevents" + gomock "go.uber.org/mock/gomock" ) // MockEventbus is a mock of Eventbus interface. @@ -44,7 +49,7 @@ func (m *MockEventbus) CheckHealth(ctx context.Context) error { } // CheckHealth indicates an expected call of CheckHealth. -func (mr *MockEventbusMockRecorder) CheckHealth(ctx interface{}) *gomock.Call { +func (mr *MockEventbusMockRecorder) CheckHealth(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckHealth", reflect.TypeOf((*MockEventbus)(nil).CheckHealth), ctx) } @@ -56,7 +61,7 @@ func (m *MockEventbus) Close(ctx context.Context) { } // Close indicates an expected call of Close. -func (mr *MockEventbusMockRecorder) Close(ctx interface{}) *gomock.Call { +func (mr *MockEventbusMockRecorder) Close(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockEventbus)(nil).Close), ctx) } @@ -64,7 +69,7 @@ func (mr *MockEventbusMockRecorder) Close(ctx interface{}) *gomock.Call { // GetLog mocks base method. func (m *MockEventbus) GetLog(ctx context.Context, logID uint64, opts ...LogOption) (Eventlog, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, logID} + varargs := []any{ctx, logID} for _, a := range opts { varargs = append(varargs, a) } @@ -75,16 +80,16 @@ func (m *MockEventbus) GetLog(ctx context.Context, logID uint64, opts ...LogOpti } // GetLog indicates an expected call of GetLog. -func (mr *MockEventbusMockRecorder) GetLog(ctx, logID interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockEventbusMockRecorder) GetLog(ctx, logID any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, logID}, opts...) + varargs := append([]any{ctx, logID}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLog", reflect.TypeOf((*MockEventbus)(nil).GetLog), varargs...) } // ListLog mocks base method. func (m *MockEventbus) ListLog(ctx context.Context, opts ...LogOption) ([]Eventlog, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx} + varargs := []any{ctx} for _, a := range opts { varargs = append(varargs, a) } @@ -95,16 +100,16 @@ func (m *MockEventbus) ListLog(ctx context.Context, opts ...LogOption) ([]Eventl } // ListLog indicates an expected call of ListLog. -func (mr *MockEventbusMockRecorder) ListLog(ctx interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockEventbusMockRecorder) ListLog(ctx any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx}, opts...) + varargs := append([]any{ctx}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListLog", reflect.TypeOf((*MockEventbus)(nil).ListLog), varargs...) } // Reader mocks base method. func (m *MockEventbus) Reader(opts ...ReadOption) BusReader { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range opts { varargs = append(varargs, a) } @@ -114,7 +119,7 @@ func (m *MockEventbus) Reader(opts ...ReadOption) BusReader { } // Reader indicates an expected call of Reader. -func (mr *MockEventbusMockRecorder) Reader(opts ...interface{}) *gomock.Call { +func (mr *MockEventbusMockRecorder) Reader(opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Reader", reflect.TypeOf((*MockEventbus)(nil).Reader), opts...) } @@ -122,7 +127,7 @@ func (mr *MockEventbusMockRecorder) Reader(opts ...interface{}) *gomock.Call { // Writer mocks base method. func (m *MockEventbus) Writer(opts ...WriteOption) BusWriter { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range opts { varargs = append(varargs, a) } @@ -132,7 +137,7 @@ func (m *MockEventbus) Writer(opts ...WriteOption) BusWriter { } // Writer indicates an expected call of Writer. -func (mr *MockEventbusMockRecorder) Writer(opts ...interface{}) *gomock.Call { +func (mr *MockEventbusMockRecorder) Writer(opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Writer", reflect.TypeOf((*MockEventbus)(nil).Writer), opts...) } @@ -163,7 +168,7 @@ func (m *MockBusWriter) EXPECT() *MockBusWriterMockRecorder { // Append mocks base method. func (m *MockBusWriter) Append(ctx context.Context, events *cloudevents.CloudEventBatch, opts ...WriteOption) ([]string, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, events} + varargs := []any{ctx, events} for _, a := range opts { varargs = append(varargs, a) } @@ -174,9 +179,9 @@ func (m *MockBusWriter) Append(ctx context.Context, events *cloudevents.CloudEve } // Append indicates an expected call of Append. -func (mr *MockBusWriterMockRecorder) Append(ctx, events interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockBusWriterMockRecorder) Append(ctx, events any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, events}, opts...) + varargs := append([]any{ctx, events}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Append", reflect.TypeOf((*MockBusWriter)(nil).Append), varargs...) } @@ -206,7 +211,7 @@ func (m *MockBusReader) EXPECT() *MockBusReaderMockRecorder { // Read mocks base method. func (m *MockBusReader) Read(ctx context.Context, opts ...ReadOption) (*cloudevents.CloudEventBatch, int64, uint64, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx} + varargs := []any{ctx} for _, a := range opts { varargs = append(varargs, a) } @@ -219,9 +224,9 @@ func (m *MockBusReader) Read(ctx context.Context, opts ...ReadOption) (*cloudeve } // Read indicates an expected call of Read. -func (mr *MockBusReaderMockRecorder) Read(ctx interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockBusReaderMockRecorder) Read(ctx any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx}, opts...) + varargs := append([]any{ctx}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockBusReader)(nil).Read), varargs...) } @@ -257,7 +262,7 @@ func (m *MockEventlog) CheckHealth(ctx context.Context) error { } // CheckHealth indicates an expected call of CheckHealth. -func (mr *MockEventlogMockRecorder) CheckHealth(ctx interface{}) *gomock.Call { +func (mr *MockEventlogMockRecorder) CheckHealth(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckHealth", reflect.TypeOf((*MockEventlog)(nil).CheckHealth), ctx) } @@ -272,7 +277,7 @@ func (m *MockEventlog) EarliestOffset(ctx context.Context) (int64, error) { } // EarliestOffset indicates an expected call of EarliestOffset. -func (mr *MockEventlogMockRecorder) EarliestOffset(ctx interface{}) *gomock.Call { +func (mr *MockEventlogMockRecorder) EarliestOffset(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EarliestOffset", reflect.TypeOf((*MockEventlog)(nil).EarliestOffset), ctx) } @@ -301,7 +306,7 @@ func (m *MockEventlog) LatestOffset(ctx context.Context) (int64, error) { } // LatestOffset indicates an expected call of LatestOffset. -func (mr *MockEventlogMockRecorder) LatestOffset(ctx interface{}) *gomock.Call { +func (mr *MockEventlogMockRecorder) LatestOffset(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LatestOffset", reflect.TypeOf((*MockEventlog)(nil).LatestOffset), ctx) } @@ -316,7 +321,7 @@ func (m *MockEventlog) Length(ctx context.Context) (int64, error) { } // Length indicates an expected call of Length. -func (mr *MockEventlogMockRecorder) Length(ctx interface{}) *gomock.Call { +func (mr *MockEventlogMockRecorder) Length(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Length", reflect.TypeOf((*MockEventlog)(nil).Length), ctx) } @@ -331,7 +336,7 @@ func (m *MockEventlog) QueryOffsetByTime(ctx context.Context, timestamp int64) ( } // QueryOffsetByTime indicates an expected call of QueryOffsetByTime. -func (mr *MockEventlogMockRecorder) QueryOffsetByTime(ctx, timestamp interface{}) *gomock.Call { +func (mr *MockEventlogMockRecorder) QueryOffsetByTime(ctx, timestamp any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryOffsetByTime", reflect.TypeOf((*MockEventlog)(nil).QueryOffsetByTime), ctx, timestamp) } diff --git a/go.mod b/go.mod index 981a61a05..19109cc5f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/cloudevents/sdk-go/v2 v2.14.0 github.com/fatih/color v1.15.0 github.com/gogo/protobuf v1.3.2 - github.com/golang/mock v1.6.0 github.com/google/cel-go v0.14.0 github.com/google/uuid v1.3.0 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 @@ -35,6 +34,7 @@ require ( go.opentelemetry.io/otel v1.14.0 go.opentelemetry.io/otel/trace v1.14.0 go.uber.org/atomic v1.10.0 + go.uber.org/mock v0.4.0 go.uber.org/ratelimit v0.2.0 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 golang.org/x/time v0.3.0 diff --git a/go.sum b/go.sum index e2c419368..f9482dabc 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -331,7 +329,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/etcd/api/v3 v3.5.8 h1:Zf44zJszoU7zRV0X/nStPenegNXoFDWcB/MwrJbA+L4= go.etcd.io/etcd/api/v3 v3.5.8/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= go.etcd.io/etcd/client/pkg/v3 v3.5.8 h1:tPp9YRn/UBFAHdhOQUII9eUs7aOK35eulpMhX4YBd+M= @@ -369,6 +366,8 @@ go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= @@ -413,7 +412,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -462,7 +460,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -560,7 +557,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/go.work.sum b/go.work.sum index 184f12ab1..7c41e0417 100644 --- a/go.work.sum +++ b/go.work.sum @@ -289,6 +289,7 @@ github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= @@ -355,8 +356,6 @@ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJ github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/smarty/assertions v1.15.1 h1:812oFiXI+G55vxsFf+8bIZ1ux30qtkdqzKbEFwyX3Tk= -github.com/smarty/assertions v1.15.1/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= diff --git a/pkg/authentication/authentication.go b/pkg/authentication/authentication.go index 9ea51e304..ffcd9a966 100644 --- a/pkg/authentication/authentication.go +++ b/pkg/authentication/authentication.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:generate mockgen -source=authentication.go -destination=mock_authentication.go -package=authentication package authentication import ( @@ -23,7 +24,6 @@ import ( "github.com/vanus-labs/vanus/pkg/observability/log" ) -//go:generate mockgen -source=authentication.go -destination=mock_authentication.go -package=authentication type Authentication interface { // Authenticate check token valid and return user identifier Authenticate(ctx context.Context, token string) (string, error) diff --git a/pkg/authentication/authentication_test.go b/pkg/authentication/authentication_test.go index a279e814b..a68d8b1ca 100644 --- a/pkg/authentication/authentication_test.go +++ b/pkg/authentication/authentication_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/errors" ) diff --git a/pkg/authentication/client.go b/pkg/authentication/client.go index e3845a883..81a7407b2 100644 --- a/pkg/authentication/client.go +++ b/pkg/authentication/client.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:generate mockgen -source=client.go -destination=mock_client.go -package=authentication package authentication import ( @@ -20,7 +21,6 @@ import ( "github.com/vanus-labs/vanus/api/cluster" ) -//go:generate mockgen -source=client.go -destination=mock_client.go -package=authentication type TokenClient interface { GetUser(ctx context.Context, token string) (string, error) } diff --git a/pkg/authentication/mock_authentication.go b/pkg/authentication/mock_authentication.go index 6e4ce06c7..df3f3232c 100644 --- a/pkg/authentication/mock_authentication.go +++ b/pkg/authentication/mock_authentication.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: authentication.go +// +// Generated by this command: +// +// mockgen -source=authentication.go -destination=mock_authentication.go -package=authentication +// // Package authentication is a generated GoMock package. package authentication @@ -8,7 +13,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockAuthentication is a mock of Authentication interface. @@ -44,7 +49,7 @@ func (m *MockAuthentication) Authenticate(ctx context.Context, token string) (st } // Authenticate indicates an expected call of Authenticate. -func (mr *MockAuthenticationMockRecorder) Authenticate(ctx, token interface{}) *gomock.Call { +func (mr *MockAuthenticationMockRecorder) Authenticate(ctx, token any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Authenticate", reflect.TypeOf((*MockAuthentication)(nil).Authenticate), ctx, token) } diff --git a/pkg/authentication/mock_client.go b/pkg/authentication/mock_client.go index 8ee7cf7e1..db8d348bc 100644 --- a/pkg/authentication/mock_client.go +++ b/pkg/authentication/mock_client.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: client.go +// +// Generated by this command: +// +// mockgen -source=client.go -destination=mock_client.go -package=authentication +// // Package authentication is a generated GoMock package. package authentication @@ -8,7 +13,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockTokenClient is a mock of TokenClient interface. @@ -44,7 +49,7 @@ func (m *MockTokenClient) GetUser(ctx context.Context, token string) (string, er } // GetUser indicates an expected call of GetUser. -func (mr *MockTokenClientMockRecorder) GetUser(ctx, token interface{}) *gomock.Call { +func (mr *MockTokenClientMockRecorder) GetUser(ctx, token any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUser", reflect.TypeOf((*MockTokenClient)(nil).GetUser), ctx, token) } diff --git a/pkg/authorization/authorization.go b/pkg/authorization/authorization.go index d48ae69ac..d76aa4693 100644 --- a/pkg/authorization/authorization.go +++ b/pkg/authorization/authorization.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:generate mockgen -source=authorization.go -destination=mock_authorization.go -package=authorization package authorization import ( @@ -21,7 +22,6 @@ import ( vanus "github.com/vanus-labs/vanus/api/vsr" ) -//go:generate mockgen -source=authorization.go -destination=mock_authorization.go -package=authorization type Authorization interface { Authorize(ctx context.Context, user string, attributes Attributes) (bool, error) } diff --git a/pkg/authorization/authorization_test.go b/pkg/authorization/authorization_test.go index 6f51a2756..8ecad00d5 100644 --- a/pkg/authorization/authorization_test.go +++ b/pkg/authorization/authorization_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/cluster" metapb "github.com/vanus-labs/vanus/api/meta" diff --git a/pkg/authorization/client.go b/pkg/authorization/client.go index a4cb8d9c9..de77f8365 100644 --- a/pkg/authorization/client.go +++ b/pkg/authorization/client.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:generate mockgen -source=client.go -destination=mock_client.go -package=authorization package authorization import ( @@ -23,7 +24,6 @@ import ( vanus "github.com/vanus-labs/vanus/api/vsr" ) -//go:generate mockgen -source=client.go -destination=mock_client.go -package=authorization type RoleClient interface { // IsClusterAdmin check the use is cluster admin. IsClusterAdmin(ctx context.Context, user string) (bool, error) diff --git a/pkg/authorization/mock_authorization.go b/pkg/authorization/mock_authorization.go index c1fa68601..24eff5823 100644 --- a/pkg/authorization/mock_authorization.go +++ b/pkg/authorization/mock_authorization.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: authorization.go +// +// Generated by this command: +// +// mockgen -source=authorization.go -destination=mock_authorization.go -package=authorization +// // Package authorization is a generated GoMock package. package authorization @@ -8,7 +13,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockAuthorization is a mock of Authorization interface. @@ -44,7 +49,7 @@ func (m *MockAuthorization) Authorize(ctx context.Context, user string, attribut } // Authorize indicates an expected call of Authorize. -func (mr *MockAuthorizationMockRecorder) Authorize(ctx, user, attributes interface{}) *gomock.Call { +func (mr *MockAuthorizationMockRecorder) Authorize(ctx, user, attributes any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Authorize", reflect.TypeOf((*MockAuthorization)(nil).Authorize), ctx, user, attributes) } diff --git a/pkg/authorization/mock_client.go b/pkg/authorization/mock_client.go index 32cf89c42..f49fdf234 100644 --- a/pkg/authorization/mock_client.go +++ b/pkg/authorization/mock_client.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: client.go +// +// Generated by this command: +// +// mockgen -source=client.go -destination=mock_client.go -package=authorization +// // Package authorization is a generated GoMock package. package authorization @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" + gomock "go.uber.org/mock/gomock" ) // MockRoleClient is a mock of RoleClient interface. @@ -45,7 +50,7 @@ func (m *MockRoleClient) GetUserEventbusID(ctx context.Context, user string) (vs } // GetUserEventbusID indicates an expected call of GetUserEventbusID. -func (mr *MockRoleClientMockRecorder) GetUserEventbusID(ctx, user interface{}) *gomock.Call { +func (mr *MockRoleClientMockRecorder) GetUserEventbusID(ctx, user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserEventbusID", reflect.TypeOf((*MockRoleClient)(nil).GetUserEventbusID), ctx, user) } @@ -60,7 +65,7 @@ func (m *MockRoleClient) GetUserNamespaceID(ctx context.Context, user string) (v } // GetUserNamespaceID indicates an expected call of GetUserNamespaceID. -func (mr *MockRoleClientMockRecorder) GetUserNamespaceID(ctx, user interface{}) *gomock.Call { +func (mr *MockRoleClientMockRecorder) GetUserNamespaceID(ctx, user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserNamespaceID", reflect.TypeOf((*MockRoleClient)(nil).GetUserNamespaceID), ctx, user) } @@ -75,7 +80,7 @@ func (m *MockRoleClient) GetUserRole(ctx context.Context, user string) ([]*UserR } // GetUserRole indicates an expected call of GetUserRole. -func (mr *MockRoleClientMockRecorder) GetUserRole(ctx, user interface{}) *gomock.Call { +func (mr *MockRoleClientMockRecorder) GetUserRole(ctx, user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserRole", reflect.TypeOf((*MockRoleClient)(nil).GetUserRole), ctx, user) } @@ -90,7 +95,7 @@ func (m *MockRoleClient) GetUserSubscriptionID(ctx context.Context, user string) } // GetUserSubscriptionID indicates an expected call of GetUserSubscriptionID. -func (mr *MockRoleClientMockRecorder) GetUserSubscriptionID(ctx, user interface{}) *gomock.Call { +func (mr *MockRoleClientMockRecorder) GetUserSubscriptionID(ctx, user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserSubscriptionID", reflect.TypeOf((*MockRoleClient)(nil).GetUserSubscriptionID), ctx, user) } @@ -105,7 +110,7 @@ func (m *MockRoleClient) IsClusterAdmin(ctx context.Context, user string) (bool, } // IsClusterAdmin indicates an expected call of IsClusterAdmin. -func (mr *MockRoleClientMockRecorder) IsClusterAdmin(ctx, user interface{}) *gomock.Call { +func (mr *MockRoleClientMockRecorder) IsClusterAdmin(ctx, user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsClusterAdmin", reflect.TypeOf((*MockRoleClient)(nil).IsClusterAdmin), ctx, user) } diff --git a/pkg/kv/client.go b/pkg/kv/client.go index d97e2a362..2a11ca962 100644 --- a/pkg/kv/client.go +++ b/pkg/kv/client.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:generate mockgen -source=client.go -destination=mock_client.go -package=kv package kv import ( diff --git a/pkg/kv/mock_client.go b/pkg/kv/mock_client.go index 0dd311154..8f8708ce3 100644 --- a/pkg/kv/mock_client.go +++ b/pkg/kv/mock_client.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: client.go +// +// Generated by this command: +// +// mockgen -source=client.go -destination=mock_client.go -package=kv +// // Package kv is a generated GoMock package. package kv @@ -9,7 +14,7 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockClient is a mock of Client interface. @@ -58,7 +63,7 @@ func (m *MockClient) CompareAndDelete(ctx context.Context, key string, preValue } // CompareAndDelete indicates an expected call of CompareAndDelete. -func (mr *MockClientMockRecorder) CompareAndDelete(ctx, key, preValue interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) CompareAndDelete(ctx, key, preValue any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CompareAndDelete", reflect.TypeOf((*MockClient)(nil).CompareAndDelete), ctx, key, preValue) } @@ -72,7 +77,7 @@ func (m *MockClient) CompareAndSwap(ctx context.Context, key string, preValue, v } // CompareAndSwap indicates an expected call of CompareAndSwap. -func (mr *MockClientMockRecorder) CompareAndSwap(ctx, key, preValue, value interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) CompareAndSwap(ctx, key, preValue, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CompareAndSwap", reflect.TypeOf((*MockClient)(nil).CompareAndSwap), ctx, key, preValue, value) } @@ -86,7 +91,7 @@ func (m *MockClient) Create(ctx context.Context, key string, value []byte) error } // Create indicates an expected call of Create. -func (mr *MockClientMockRecorder) Create(ctx, key, value interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Create(ctx, key, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockClient)(nil).Create), ctx, key, value) } @@ -100,7 +105,7 @@ func (m *MockClient) Delete(ctx context.Context, key string) error { } // Delete indicates an expected call of Delete. -func (mr *MockClientMockRecorder) Delete(ctx, key interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Delete(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockClient)(nil).Delete), ctx, key) } @@ -114,7 +119,7 @@ func (m *MockClient) DeleteDir(ctx context.Context, path string) error { } // DeleteDir indicates an expected call of DeleteDir. -func (mr *MockClientMockRecorder) DeleteDir(ctx, path interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) DeleteDir(ctx, path any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDir", reflect.TypeOf((*MockClient)(nil).DeleteDir), ctx, path) } @@ -129,7 +134,7 @@ func (m *MockClient) Exists(ctx context.Context, key string) (bool, error) { } // Exists indicates an expected call of Exists. -func (mr *MockClientMockRecorder) Exists(ctx, key interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Exists(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exists", reflect.TypeOf((*MockClient)(nil).Exists), ctx, key) } @@ -144,7 +149,7 @@ func (m *MockClient) Get(ctx context.Context, key string) ([]byte, error) { } // Get indicates an expected call of Get. -func (mr *MockClientMockRecorder) Get(ctx, key interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Get(ctx, key any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockClient)(nil).Get), ctx, key) } @@ -159,7 +164,7 @@ func (m *MockClient) List(ctx context.Context, path string) ([]Pair, error) { } // List indicates an expected call of List. -func (mr *MockClientMockRecorder) List(ctx, path interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) List(ctx, path any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockClient)(nil).List), ctx, path) } @@ -173,7 +178,7 @@ func (m *MockClient) Set(ctx context.Context, key string, value []byte) error { } // Set indicates an expected call of Set. -func (mr *MockClientMockRecorder) Set(ctx, key, value interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Set(ctx, key, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockClient)(nil).Set), ctx, key, value) } @@ -187,7 +192,7 @@ func (m *MockClient) SetWithTTL(ctx context.Context, key string, value []byte, t } // SetWithTTL indicates an expected call of SetWithTTL. -func (mr *MockClientMockRecorder) SetWithTTL(ctx, key, value, ttl interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SetWithTTL(ctx, key, value, ttl any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWithTTL", reflect.TypeOf((*MockClient)(nil).SetWithTTL), ctx, key, value, ttl) } @@ -201,7 +206,7 @@ func (m *MockClient) Update(ctx context.Context, key string, value []byte) error } // Update indicates an expected call of Update. -func (mr *MockClientMockRecorder) Update(ctx, key, value interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Update(ctx, key, value any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockClient)(nil).Update), ctx, key, value) } @@ -216,7 +221,7 @@ func (m *MockClient) Watch(ctx context.Context, key string, stopCh <-chan struct } // Watch indicates an expected call of Watch. -func (mr *MockClientMockRecorder) Watch(ctx, key, stopCh interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Watch(ctx, key, stopCh any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockClient)(nil).Watch), ctx, key, stopCh) } @@ -231,7 +236,7 @@ func (m *MockClient) WatchTree(ctx context.Context, path string, stopCh <-chan s } // WatchTree indicates an expected call of WatchTree. -func (mr *MockClientMockRecorder) WatchTree(ctx, path, stopCh interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) WatchTree(ctx, path, stopCh any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WatchTree", reflect.TypeOf((*MockClient)(nil).WatchTree), ctx, path, stopCh) } diff --git a/server/controller/eventbus/block/block_test.go b/server/controller/eventbus/block/block_test.go index cc0f68a30..6f67a0374 100644 --- a/server/controller/eventbus/block/block_test.go +++ b/server/controller/eventbus/block/block_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/huandu/skiplist" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" vanus "github.com/vanus-labs/vanus/api/vsr" diff --git a/server/controller/eventbus/block/mock_block.go b/server/controller/eventbus/block/mock_block.go index 818e32daf..1cb0d7b7a 100644 --- a/server/controller/eventbus/block/mock_block.go +++ b/server/controller/eventbus/block/mock_block.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: block.go +// +// Generated by this command: +// +// mockgen -source=block.go -destination=mock_block.go -package=block +// // Package block is a generated GoMock package. package block @@ -8,10 +13,10 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" kv "github.com/vanus-labs/vanus/pkg/kv" metadata "github.com/vanus-labs/vanus/server/controller/eventbus/metadata" + gomock "go.uber.org/mock/gomock" ) // MockAllocator is a mock of Allocator interface. @@ -47,7 +52,7 @@ func (m *MockAllocator) Pick(ctx context.Context, num int) ([]*metadata.Block, e } // Pick indicates an expected call of Pick. -func (mr *MockAllocatorMockRecorder) Pick(ctx, num interface{}) *gomock.Call { +func (mr *MockAllocatorMockRecorder) Pick(ctx, num any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Pick", reflect.TypeOf((*MockAllocator)(nil).Pick), ctx, num) } @@ -62,7 +67,7 @@ func (m *MockAllocator) PickByVolumes(ctx context.Context, volumes []vsr.ID) ([] } // PickByVolumes indicates an expected call of PickByVolumes. -func (mr *MockAllocatorMockRecorder) PickByVolumes(ctx, volumes interface{}) *gomock.Call { +func (mr *MockAllocatorMockRecorder) PickByVolumes(ctx, volumes any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PickByVolumes", reflect.TypeOf((*MockAllocator)(nil).PickByVolumes), ctx, volumes) } @@ -76,7 +81,7 @@ func (m *MockAllocator) Run(ctx context.Context, kvCli kv.Client, dynamicAllocat } // Run indicates an expected call of Run. -func (mr *MockAllocatorMockRecorder) Run(ctx, kvCli, dynamicAllocate interface{}) *gomock.Call { +func (mr *MockAllocatorMockRecorder) Run(ctx, kvCli, dynamicAllocate any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockAllocator)(nil).Run), ctx, kvCli, dynamicAllocate) } diff --git a/server/controller/eventbus/block/selector_test.go b/server/controller/eventbus/block/selector_test.go index 9ae1a5b40..da4fd7265 100644 --- a/server/controller/eventbus/block/selector_test.go +++ b/server/controller/eventbus/block/selector_test.go @@ -19,8 +19,8 @@ import ( "testing" // third-party libraries. - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" // first-party libraries. vanus "github.com/vanus-labs/vanus/api/vsr" diff --git a/server/controller/eventbus/controller_test.go b/server/controller/eventbus/controller_test.go index 2c167f12f..a998818ec 100644 --- a/server/controller/eventbus/controller_test.go +++ b/server/controller/eventbus/controller_test.go @@ -20,8 +20,8 @@ import ( "sort" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "google.golang.org/protobuf/types/known/wrapperspb" "github.com/vanus-labs/vanus/api/cluster" diff --git a/server/controller/eventbus/eventlog/eventlog_test.go b/server/controller/eventbus/eventlog/eventlog_test.go index 9c4a37f47..8d182d6da 100644 --- a/server/controller/eventbus/eventlog/eventlog_test.go +++ b/server/controller/eventbus/eventlog/eventlog_test.go @@ -23,8 +23,8 @@ import ( "time" // third-party libraries. - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" // first-party libraries. "github.com/vanus-labs/vanus/api/errors" diff --git a/server/controller/eventbus/eventlog/mock_eventlog.go b/server/controller/eventbus/eventlog/mock_eventlog.go index fea0a3bd6..9b1c074a7 100644 --- a/server/controller/eventbus/eventlog/mock_eventlog.go +++ b/server/controller/eventbus/eventlog/mock_eventlog.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: eventlog.go +// +// Generated by this command: +// +// mockgen -source=eventlog.go -destination=mock_eventlog.go -package=eventlog +// // Package eventlog is a generated GoMock package. package eventlog @@ -8,10 +13,10 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" kv "github.com/vanus-labs/vanus/pkg/kv" metadata "github.com/vanus-labs/vanus/server/controller/eventbus/metadata" + gomock "go.uber.org/mock/gomock" ) // MockManager is a mock of Manager interface. @@ -47,7 +52,7 @@ func (m *MockManager) AcquireEventlog(ctx context.Context, eventbusID vsr.ID, ev } // AcquireEventlog indicates an expected call of AcquireEventlog. -func (mr *MockManagerMockRecorder) AcquireEventlog(ctx, eventbusID, eventbusName interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) AcquireEventlog(ctx, eventbusID, eventbusName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AcquireEventlog", reflect.TypeOf((*MockManager)(nil).AcquireEventlog), ctx, eventbusID, eventbusName) } @@ -59,7 +64,7 @@ func (m *MockManager) DeleteEventlog(ctx context.Context, id vsr.ID) { } // DeleteEventlog indicates an expected call of DeleteEventlog. -func (mr *MockManagerMockRecorder) DeleteEventlog(ctx, id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) DeleteEventlog(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteEventlog", reflect.TypeOf((*MockManager)(nil).DeleteEventlog), ctx, id) } @@ -74,7 +79,7 @@ func (m *MockManager) GetAppendableSegment(ctx context.Context, eli *metadata.Ev } // GetAppendableSegment indicates an expected call of GetAppendableSegment. -func (mr *MockManagerMockRecorder) GetAppendableSegment(ctx, eli, num interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetAppendableSegment(ctx, eli, num any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAppendableSegment", reflect.TypeOf((*MockManager)(nil).GetAppendableSegment), ctx, eli, num) } @@ -88,7 +93,7 @@ func (m *MockManager) GetBlock(id vsr.ID) *metadata.Block { } // GetBlock indicates an expected call of GetBlock. -func (mr *MockManagerMockRecorder) GetBlock(id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetBlock(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlock", reflect.TypeOf((*MockManager)(nil).GetBlock), id) } @@ -102,7 +107,7 @@ func (m *MockManager) GetEventlog(ctx context.Context, id vsr.ID) *metadata.Even } // GetEventlog indicates an expected call of GetEventlog. -func (mr *MockManagerMockRecorder) GetEventlog(ctx, id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetEventlog(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEventlog", reflect.TypeOf((*MockManager)(nil).GetEventlog), ctx, id) } @@ -116,7 +121,7 @@ func (m *MockManager) GetEventlogSegmentList(elID vsr.ID) []Segment { } // GetEventlogSegmentList indicates an expected call of GetEventlogSegmentList. -func (mr *MockManagerMockRecorder) GetEventlogSegmentList(elID interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetEventlogSegmentList(elID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEventlogSegmentList", reflect.TypeOf((*MockManager)(nil).GetEventlogSegmentList), elID) } @@ -131,7 +136,7 @@ func (m *MockManager) GetSegmentByBlockID(block *metadata.Block) (Segment, error } // GetSegmentByBlockID indicates an expected call of GetSegmentByBlockID. -func (mr *MockManagerMockRecorder) GetSegmentByBlockID(block interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetSegmentByBlockID(block any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSegmentByBlockID", reflect.TypeOf((*MockManager)(nil).GetSegmentByBlockID), block) } @@ -145,7 +150,7 @@ func (m *MockManager) Run(ctx context.Context, kvClient kv.Client, startTask boo } // Run indicates an expected call of Run. -func (mr *MockManagerMockRecorder) Run(ctx, kvClient, startTask interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Run(ctx, kvClient, startTask any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockManager)(nil).Run), ctx, kvClient, startTask) } @@ -169,7 +174,7 @@ func (m_2 *MockManager) UpdateSegment(ctx context.Context, m map[string][]Segmen } // UpdateSegment indicates an expected call of UpdateSegment. -func (mr *MockManagerMockRecorder) UpdateSegment(ctx, m interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) UpdateSegment(ctx, m any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSegment", reflect.TypeOf((*MockManager)(nil).UpdateSegment), ctx, m) } @@ -183,7 +188,7 @@ func (m *MockManager) UpdateSegmentReplicas(ctx context.Context, segID vsr.ID, t } // UpdateSegmentReplicas indicates an expected call of UpdateSegmentReplicas. -func (mr *MockManagerMockRecorder) UpdateSegmentReplicas(ctx, segID, term interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) UpdateSegmentReplicas(ctx, segID, term any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSegmentReplicas", reflect.TypeOf((*MockManager)(nil).UpdateSegmentReplicas), ctx, segID, term) } diff --git a/server/controller/eventbus/eventlog/segment_test.go b/server/controller/eventbus/eventlog/segment_test.go index c05b88847..b482d2496 100644 --- a/server/controller/eventbus/eventlog/segment_test.go +++ b/server/controller/eventbus/eventlog/segment_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" vanus "github.com/vanus-labs/vanus/api/vsr" diff --git a/server/controller/eventbus/server/instance_test.go b/server/controller/eventbus/server/instance_test.go index 09eb3feba..2d46ff4f1 100644 --- a/server/controller/eventbus/server/instance_test.go +++ b/server/controller/eventbus/server/instance_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/server/controller/eventbus/server/manager_test.go b/server/controller/eventbus/server/manager_test.go index 30f96a19d..096ca945c 100644 --- a/server/controller/eventbus/server/manager_test.go +++ b/server/controller/eventbus/server/manager_test.go @@ -22,8 +22,8 @@ import ( "time" // third-party libraries. - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/server/controller/eventbus/server/mock_instance.go b/server/controller/eventbus/server/mock_instance.go index 129dbf5e2..c6cc8aeed 100644 --- a/server/controller/eventbus/server/mock_instance.go +++ b/server/controller/eventbus/server/mock_instance.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: instance.go +// +// Generated by this command: +// +// mockgen -source=instance.go -destination=mock_instance.go -package=server +// // Package server is a generated GoMock package. package server @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" metadata "github.com/vanus-labs/vanus/server/controller/eventbus/metadata" + gomock "go.uber.org/mock/gomock" ) // MockInstance is a mock of Instance interface. @@ -74,7 +79,7 @@ func (m *MockInstance) CreateBlock(arg0 context.Context, arg1 int64) (*metadata. } // CreateBlock indicates an expected call of CreateBlock. -func (mr *MockInstanceMockRecorder) CreateBlock(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockInstanceMockRecorder) CreateBlock(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBlock", reflect.TypeOf((*MockInstance)(nil).CreateBlock), arg0, arg1) } @@ -88,7 +93,7 @@ func (m *MockInstance) DeleteBlock(arg0 context.Context, arg1 vsr.ID) error { } // DeleteBlock indicates an expected call of DeleteBlock. -func (mr *MockInstanceMockRecorder) DeleteBlock(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockInstanceMockRecorder) DeleteBlock(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteBlock", reflect.TypeOf((*MockInstance)(nil).DeleteBlock), arg0, arg1) } @@ -142,7 +147,7 @@ func (m *MockInstance) SetServer(arg0 Server) { } // SetServer indicates an expected call of SetServer. -func (mr *MockInstanceMockRecorder) SetServer(arg0 interface{}) *gomock.Call { +func (mr *MockInstanceMockRecorder) SetServer(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetServer", reflect.TypeOf((*MockInstance)(nil).SetServer), arg0) } diff --git a/server/controller/eventbus/server/mock_manager.go b/server/controller/eventbus/server/mock_manager.go index d98f218a9..cdeee9fe9 100644 --- a/server/controller/eventbus/server/mock_manager.go +++ b/server/controller/eventbus/server/mock_manager.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: manager.go +// +// Generated by this command: +// +// mockgen -source=manager.go -destination=mock_manager.go -package=server +// // Package server is a generated GoMock package. package server @@ -9,8 +14,8 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" segment "github.com/vanus-labs/vanus/api/segment" + gomock "go.uber.org/mock/gomock" ) // MockManager is a mock of Manager interface. @@ -45,7 +50,7 @@ func (m *MockManager) AddServer(ctx context.Context, srv Server) error { } // AddServer indicates an expected call of AddServer. -func (mr *MockManagerMockRecorder) AddServer(ctx, srv interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) AddServer(ctx, srv any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddServer", reflect.TypeOf((*MockManager)(nil).AddServer), ctx, srv) } @@ -59,7 +64,7 @@ func (m *MockManager) CanCreateEventbus(ctx context.Context, replicaNum int) boo } // CanCreateEventbus indicates an expected call of CanCreateEventbus. -func (mr *MockManagerMockRecorder) CanCreateEventbus(ctx, replicaNum interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) CanCreateEventbus(ctx, replicaNum any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CanCreateEventbus", reflect.TypeOf((*MockManager)(nil).CanCreateEventbus), ctx, replicaNum) } @@ -73,7 +78,7 @@ func (m *MockManager) GetServerByAddress(addr string) Server { } // GetServerByAddress indicates an expected call of GetServerByAddress. -func (mr *MockManagerMockRecorder) GetServerByAddress(addr interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetServerByAddress(addr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetServerByAddress", reflect.TypeOf((*MockManager)(nil).GetServerByAddress), addr) } @@ -87,7 +92,7 @@ func (m *MockManager) GetServerByVolumeID(id uint64) Server { } // GetServerByVolumeID indicates an expected call of GetServerByVolumeID. -func (mr *MockManagerMockRecorder) GetServerByVolumeID(id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetServerByVolumeID(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetServerByVolumeID", reflect.TypeOf((*MockManager)(nil).GetServerByVolumeID), id) } @@ -101,7 +106,7 @@ func (m *MockManager) RemoveServer(ctx context.Context, srv Server) error { } // RemoveServer indicates an expected call of RemoveServer. -func (mr *MockManagerMockRecorder) RemoveServer(ctx, srv interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) RemoveServer(ctx, srv any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveServer", reflect.TypeOf((*MockManager)(nil).RemoveServer), ctx, srv) } @@ -115,7 +120,7 @@ func (m *MockManager) Run(ctx context.Context) error { } // Run indicates an expected call of Run. -func (mr *MockManagerMockRecorder) Run(ctx interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Run(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockManager)(nil).Run), ctx) } @@ -127,7 +132,7 @@ func (m *MockManager) Stop(ctx context.Context) { } // Stop indicates an expected call of Stop. -func (mr *MockManagerMockRecorder) Stop(ctx interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Stop(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockManager)(nil).Stop), ctx) } @@ -206,7 +211,7 @@ func (m *MockServer) IsActive(ctx context.Context) bool { } // IsActive indicates an expected call of IsActive. -func (mr *MockServerMockRecorder) IsActive(ctx interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) IsActive(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsActive", reflect.TypeOf((*MockServer)(nil).IsActive), ctx) } @@ -232,7 +237,7 @@ func (m *MockServer) RemoteStart(ctx context.Context) error { } // RemoteStart indicates an expected call of RemoteStart. -func (mr *MockServerMockRecorder) RemoteStart(ctx interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) RemoteStart(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoteStart", reflect.TypeOf((*MockServer)(nil).RemoteStart), ctx) } @@ -244,7 +249,7 @@ func (m *MockServer) RemoteStop(ctx context.Context) { } // RemoteStop indicates an expected call of RemoteStop. -func (mr *MockServerMockRecorder) RemoteStop(ctx interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) RemoteStop(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoteStop", reflect.TypeOf((*MockServer)(nil).RemoteStop), ctx) } diff --git a/server/controller/eventbus/volume/manager_test.go b/server/controller/eventbus/volume/manager_test.go index 5bd40a76c..76d213064 100644 --- a/server/controller/eventbus/volume/manager_test.go +++ b/server/controller/eventbus/volume/manager_test.go @@ -24,8 +24,8 @@ import ( "time" // third-party libraries. - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" // first-party libraries. "github.com/vanus-labs/vanus/api/errors" diff --git a/server/controller/eventbus/volume/mock_manager.go b/server/controller/eventbus/volume/mock_manager.go index f25425e60..e9666810d 100644 --- a/server/controller/eventbus/volume/mock_manager.go +++ b/server/controller/eventbus/volume/mock_manager.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: manager.go +// +// Generated by this command: +// +// mockgen -source=manager.go -destination=mock_manager.go -package=volume +// // Package volume is a generated GoMock package. package volume @@ -8,11 +13,11 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" kv "github.com/vanus-labs/vanus/pkg/kv" metadata "github.com/vanus-labs/vanus/server/controller/eventbus/metadata" server "github.com/vanus-labs/vanus/server/controller/eventbus/server" + gomock "go.uber.org/mock/gomock" ) // MockManager is a mock of Manager interface. @@ -62,7 +67,7 @@ func (m *MockManager) GetBlocksOfVolume(ctx context.Context, instance server.Ins } // GetBlocksOfVolume indicates an expected call of GetBlocksOfVolume. -func (mr *MockManagerMockRecorder) GetBlocksOfVolume(ctx, instance interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetBlocksOfVolume(ctx, instance any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlocksOfVolume", reflect.TypeOf((*MockManager)(nil).GetBlocksOfVolume), ctx, instance) } @@ -76,7 +81,7 @@ func (m *MockManager) GetVolumeInstanceByID(id vsr.ID) server.Instance { } // GetVolumeInstanceByID indicates an expected call of GetVolumeInstanceByID. -func (mr *MockManagerMockRecorder) GetVolumeInstanceByID(id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetVolumeInstanceByID(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVolumeInstanceByID", reflect.TypeOf((*MockManager)(nil).GetVolumeInstanceByID), id) } @@ -90,7 +95,7 @@ func (m *MockManager) Init(ctx context.Context, kvClient kv.Client) error { } // Init indicates an expected call of Init. -func (mr *MockManagerMockRecorder) Init(ctx, kvClient interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Init(ctx, kvClient any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockManager)(nil).Init), ctx, kvClient) } @@ -104,7 +109,7 @@ func (m *MockManager) LookupVolumeByID(id uint64) server.Instance { } // LookupVolumeByID indicates an expected call of LookupVolumeByID. -func (mr *MockManagerMockRecorder) LookupVolumeByID(id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) LookupVolumeByID(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LookupVolumeByID", reflect.TypeOf((*MockManager)(nil).LookupVolumeByID), id) } @@ -119,7 +124,7 @@ func (m *MockManager) RegisterVolume(ctx context.Context, md *metadata.VolumeMet } // RegisterVolume indicates an expected call of RegisterVolume. -func (mr *MockManagerMockRecorder) RegisterVolume(ctx, md interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) RegisterVolume(ctx, md any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterVolume", reflect.TypeOf((*MockManager)(nil).RegisterVolume), ctx, md) } @@ -131,7 +136,7 @@ func (m *MockManager) UpdateRouting(ctx context.Context, ins server.Instance, sr } // UpdateRouting indicates an expected call of UpdateRouting. -func (mr *MockManagerMockRecorder) UpdateRouting(ctx, ins, srv interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) UpdateRouting(ctx, ins, srv any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateRouting", reflect.TypeOf((*MockManager)(nil).UpdateRouting), ctx, ins, srv) } diff --git a/server/controller/member/mock_member.go b/server/controller/member/mock_member.go index 48dfc2380..84028f65a 100644 --- a/server/controller/member/mock_member.go +++ b/server/controller/member/mock_member.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: member.go +// +// Generated by this command: +// +// mockgen -source=member.go -destination=mock_member.go -package=member +// // Package member is a generated GoMock package. package member @@ -8,7 +13,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockMember is a mock of Member interface. @@ -71,7 +76,7 @@ func (m *MockMember) Init(arg0 context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockMemberMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockMemberMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockMember)(nil).Init), arg0) } @@ -111,7 +116,7 @@ func (m *MockMember) RegisterMembershipChangedProcessor(arg0 MembershipEventProc } // RegisterMembershipChangedProcessor indicates an expected call of RegisterMembershipChangedProcessor. -func (mr *MockMemberMockRecorder) RegisterMembershipChangedProcessor(arg0 interface{}) *gomock.Call { +func (mr *MockMemberMockRecorder) RegisterMembershipChangedProcessor(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterMembershipChangedProcessor", reflect.TypeOf((*MockMember)(nil).RegisterMembershipChangedProcessor), arg0) } @@ -137,7 +142,7 @@ func (m *MockMember) Start(arg0 context.Context) error { } // Start indicates an expected call of Start. -func (mr *MockMemberMockRecorder) Start(arg0 interface{}) *gomock.Call { +func (mr *MockMemberMockRecorder) Start(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockMember)(nil).Start), arg0) } @@ -149,7 +154,7 @@ func (m *MockMember) Stop(arg0 context.Context) { } // Stop indicates an expected call of Stop. -func (mr *MockMemberMockRecorder) Stop(arg0 interface{}) *gomock.Call { +func (mr *MockMemberMockRecorder) Stop(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockMember)(nil).Stop), arg0) } diff --git a/server/controller/tenant/controller_test.go b/server/controller/tenant/controller_test.go index 6a0ade624..5e2e3dd0e 100644 --- a/server/controller/tenant/controller_test.go +++ b/server/controller/tenant/controller_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" ctrlpb "github.com/vanus-labs/vanus/api/controller" "github.com/vanus-labs/vanus/pkg/snowflake" diff --git a/server/controller/tenant/manager/mock_namespace.go b/server/controller/tenant/manager/mock_namespace.go index fac0bf5f7..3ff8ac871 100644 --- a/server/controller/tenant/manager/mock_namespace.go +++ b/server/controller/tenant/manager/mock_namespace.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: namespace.go +// +// Generated by this command: +// +// mockgen -source=namespace.go -destination=mock_namespace.go -package=manager +// // Package manager is a generated GoMock package. package manager @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" metadata "github.com/vanus-labs/vanus/server/controller/tenant/metadata" + gomock "go.uber.org/mock/gomock" ) // MockNamespaceManager is a mock of NamespaceManager interface. @@ -45,7 +50,7 @@ func (m *MockNamespaceManager) AddNamespace(ctx context.Context, ns *metadata.Na } // AddNamespace indicates an expected call of AddNamespace. -func (mr *MockNamespaceManagerMockRecorder) AddNamespace(ctx, ns interface{}) *gomock.Call { +func (mr *MockNamespaceManagerMockRecorder) AddNamespace(ctx, ns any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNamespace", reflect.TypeOf((*MockNamespaceManager)(nil).AddNamespace), ctx, ns) } @@ -59,7 +64,7 @@ func (m *MockNamespaceManager) DeleteNamespace(ctx context.Context, id vsr.ID) e } // DeleteNamespace indicates an expected call of DeleteNamespace. -func (mr *MockNamespaceManagerMockRecorder) DeleteNamespace(ctx, id interface{}) *gomock.Call { +func (mr *MockNamespaceManagerMockRecorder) DeleteNamespace(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteNamespace", reflect.TypeOf((*MockNamespaceManager)(nil).DeleteNamespace), ctx, id) } @@ -73,7 +78,7 @@ func (m *MockNamespaceManager) GetNamespace(ctx context.Context, id vsr.ID) *met } // GetNamespace indicates an expected call of GetNamespace. -func (mr *MockNamespaceManagerMockRecorder) GetNamespace(ctx, id interface{}) *gomock.Call { +func (mr *MockNamespaceManagerMockRecorder) GetNamespace(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNamespace", reflect.TypeOf((*MockNamespaceManager)(nil).GetNamespace), ctx, id) } @@ -87,7 +92,7 @@ func (m *MockNamespaceManager) GetNamespaceByName(ctx context.Context, name stri } // GetNamespaceByName indicates an expected call of GetNamespaceByName. -func (mr *MockNamespaceManagerMockRecorder) GetNamespaceByName(ctx, name interface{}) *gomock.Call { +func (mr *MockNamespaceManagerMockRecorder) GetNamespaceByName(ctx, name any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNamespaceByName", reflect.TypeOf((*MockNamespaceManager)(nil).GetNamespaceByName), ctx, name) } @@ -101,7 +106,7 @@ func (m *MockNamespaceManager) Init(ctx context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockNamespaceManagerMockRecorder) Init(ctx interface{}) *gomock.Call { +func (mr *MockNamespaceManagerMockRecorder) Init(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockNamespaceManager)(nil).Init), ctx) } @@ -115,7 +120,7 @@ func (m *MockNamespaceManager) ListNamespace(ctx context.Context) []*metadata.Na } // ListNamespace indicates an expected call of ListNamespace. -func (mr *MockNamespaceManagerMockRecorder) ListNamespace(ctx interface{}) *gomock.Call { +func (mr *MockNamespaceManagerMockRecorder) ListNamespace(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListNamespace", reflect.TypeOf((*MockNamespaceManager)(nil).ListNamespace), ctx) } diff --git a/server/controller/tenant/manager/mock_role.go b/server/controller/tenant/manager/mock_role.go index 4a7ddce18..5ad611b47 100644 --- a/server/controller/tenant/manager/mock_role.go +++ b/server/controller/tenant/manager/mock_role.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: role.go +// +// Generated by this command: +// +// mockgen -source=role.go -destination=mock_role.go -package=manager +// // Package manager is a generated GoMock package. package manager @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" metadata "github.com/vanus-labs/vanus/server/controller/tenant/metadata" + gomock "go.uber.org/mock/gomock" ) // MockUserRoleManager is a mock of UserRoleManager interface. @@ -45,7 +50,7 @@ func (m *MockUserRoleManager) AddUserRole(ctx context.Context, role *metadata.Us } // AddUserRole indicates an expected call of AddUserRole. -func (mr *MockUserRoleManagerMockRecorder) AddUserRole(ctx, role interface{}) *gomock.Call { +func (mr *MockUserRoleManagerMockRecorder) AddUserRole(ctx, role any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddUserRole", reflect.TypeOf((*MockUserRoleManager)(nil).AddUserRole), ctx, role) } @@ -59,7 +64,7 @@ func (m *MockUserRoleManager) DeleteUserRole(ctx context.Context, role *metadata } // DeleteUserRole indicates an expected call of DeleteUserRole. -func (mr *MockUserRoleManagerMockRecorder) DeleteUserRole(ctx, role interface{}) *gomock.Call { +func (mr *MockUserRoleManagerMockRecorder) DeleteUserRole(ctx, role any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUserRole", reflect.TypeOf((*MockUserRoleManager)(nil).DeleteUserRole), ctx, role) } @@ -74,7 +79,7 @@ func (m *MockUserRoleManager) GetUserRoleByResourceID(ctx context.Context, resou } // GetUserRoleByResourceID indicates an expected call of GetUserRoleByResourceID. -func (mr *MockUserRoleManagerMockRecorder) GetUserRoleByResourceID(ctx, resourceID interface{}) *gomock.Call { +func (mr *MockUserRoleManagerMockRecorder) GetUserRoleByResourceID(ctx, resourceID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserRoleByResourceID", reflect.TypeOf((*MockUserRoleManager)(nil).GetUserRoleByResourceID), ctx, resourceID) } @@ -89,7 +94,7 @@ func (m *MockUserRoleManager) GetUserRoleByUser(ctx context.Context, userIdentif } // GetUserRoleByUser indicates an expected call of GetUserRoleByUser. -func (mr *MockUserRoleManagerMockRecorder) GetUserRoleByUser(ctx, userIdentifier interface{}) *gomock.Call { +func (mr *MockUserRoleManagerMockRecorder) GetUserRoleByUser(ctx, userIdentifier any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserRoleByUser", reflect.TypeOf((*MockUserRoleManager)(nil).GetUserRoleByUser), ctx, userIdentifier) } @@ -103,7 +108,7 @@ func (m *MockUserRoleManager) Init(ctx context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockUserRoleManagerMockRecorder) Init(ctx interface{}) *gomock.Call { +func (mr *MockUserRoleManagerMockRecorder) Init(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockUserRoleManager)(nil).Init), ctx) } @@ -117,7 +122,7 @@ func (m *MockUserRoleManager) IsUserRoleExist(ctx context.Context, role *metadat } // IsUserRoleExist indicates an expected call of IsUserRoleExist. -func (mr *MockUserRoleManagerMockRecorder) IsUserRoleExist(ctx, role interface{}) *gomock.Call { +func (mr *MockUserRoleManagerMockRecorder) IsUserRoleExist(ctx, role any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsUserRoleExist", reflect.TypeOf((*MockUserRoleManager)(nil).IsUserRoleExist), ctx, role) } diff --git a/server/controller/tenant/manager/mock_token.go b/server/controller/tenant/manager/mock_token.go index f62da51d9..427f4aa28 100644 --- a/server/controller/tenant/manager/mock_token.go +++ b/server/controller/tenant/manager/mock_token.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: token.go +// +// Generated by this command: +// +// mockgen -source=token.go -destination=mock_token.go -package=manager +// // Package manager is a generated GoMock package. package manager @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" metadata "github.com/vanus-labs/vanus/server/controller/tenant/metadata" + gomock "go.uber.org/mock/gomock" ) // MockTokenManager is a mock of TokenManager interface. @@ -45,7 +50,7 @@ func (m *MockTokenManager) AddToken(ctx context.Context, user *metadata.Token) e } // AddToken indicates an expected call of AddToken. -func (mr *MockTokenManagerMockRecorder) AddToken(ctx, user interface{}) *gomock.Call { +func (mr *MockTokenManagerMockRecorder) AddToken(ctx, user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddToken", reflect.TypeOf((*MockTokenManager)(nil).AddToken), ctx, user) } @@ -59,7 +64,7 @@ func (m *MockTokenManager) DeleteToken(ctx context.Context, id vsr.ID) error { } // DeleteToken indicates an expected call of DeleteToken. -func (mr *MockTokenManagerMockRecorder) DeleteToken(ctx, id interface{}) *gomock.Call { +func (mr *MockTokenManagerMockRecorder) DeleteToken(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteToken", reflect.TypeOf((*MockTokenManager)(nil).DeleteToken), ctx, id) } @@ -74,7 +79,7 @@ func (m *MockTokenManager) GetToken(ctx context.Context, id vsr.ID) (*metadata.T } // GetToken indicates an expected call of GetToken. -func (mr *MockTokenManagerMockRecorder) GetToken(ctx, id interface{}) *gomock.Call { +func (mr *MockTokenManagerMockRecorder) GetToken(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetToken", reflect.TypeOf((*MockTokenManager)(nil).GetToken), ctx, id) } @@ -89,7 +94,7 @@ func (m *MockTokenManager) GetUser(ctx context.Context, token string) (string, e } // GetUser indicates an expected call of GetUser. -func (mr *MockTokenManagerMockRecorder) GetUser(ctx, token interface{}) *gomock.Call { +func (mr *MockTokenManagerMockRecorder) GetUser(ctx, token any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUser", reflect.TypeOf((*MockTokenManager)(nil).GetUser), ctx, token) } @@ -103,7 +108,7 @@ func (m *MockTokenManager) GetUserToken(ctx context.Context, identifier string) } // GetUserToken indicates an expected call of GetUserToken. -func (mr *MockTokenManagerMockRecorder) GetUserToken(ctx, identifier interface{}) *gomock.Call { +func (mr *MockTokenManagerMockRecorder) GetUserToken(ctx, identifier any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserToken", reflect.TypeOf((*MockTokenManager)(nil).GetUserToken), ctx, identifier) } @@ -117,7 +122,7 @@ func (m *MockTokenManager) Init(ctx context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockTokenManagerMockRecorder) Init(ctx interface{}) *gomock.Call { +func (mr *MockTokenManagerMockRecorder) Init(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockTokenManager)(nil).Init), ctx) } @@ -131,7 +136,7 @@ func (m *MockTokenManager) ListToken(ctx context.Context) []*metadata.Token { } // ListToken indicates an expected call of ListToken. -func (mr *MockTokenManagerMockRecorder) ListToken(ctx interface{}) *gomock.Call { +func (mr *MockTokenManagerMockRecorder) ListToken(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListToken", reflect.TypeOf((*MockTokenManager)(nil).ListToken), ctx) } diff --git a/server/controller/tenant/manager/mock_user.go b/server/controller/tenant/manager/mock_user.go index f009f4c9f..8c6a033b6 100644 --- a/server/controller/tenant/manager/mock_user.go +++ b/server/controller/tenant/manager/mock_user.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: user.go +// +// Generated by this command: +// +// mockgen -source=user.go -destination=mock_user.go -package=manager +// // Package manager is a generated GoMock package. package manager @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" metadata "github.com/vanus-labs/vanus/server/controller/tenant/metadata" + gomock "go.uber.org/mock/gomock" ) // MockUserManager is a mock of UserManager interface. @@ -44,7 +49,7 @@ func (m *MockUserManager) AddUser(ctx context.Context, user *metadata.User) erro } // AddUser indicates an expected call of AddUser. -func (mr *MockUserManagerMockRecorder) AddUser(ctx, user interface{}) *gomock.Call { +func (mr *MockUserManagerMockRecorder) AddUser(ctx, user any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddUser", reflect.TypeOf((*MockUserManager)(nil).AddUser), ctx, user) } @@ -58,7 +63,7 @@ func (m *MockUserManager) DeleteUser(ctx context.Context, identifier string) err } // DeleteUser indicates an expected call of DeleteUser. -func (mr *MockUserManagerMockRecorder) DeleteUser(ctx, identifier interface{}) *gomock.Call { +func (mr *MockUserManagerMockRecorder) DeleteUser(ctx, identifier any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUser", reflect.TypeOf((*MockUserManager)(nil).DeleteUser), ctx, identifier) } @@ -72,7 +77,7 @@ func (m *MockUserManager) GetUser(ctx context.Context, identifier string) *metad } // GetUser indicates an expected call of GetUser. -func (mr *MockUserManagerMockRecorder) GetUser(ctx, identifier interface{}) *gomock.Call { +func (mr *MockUserManagerMockRecorder) GetUser(ctx, identifier any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUser", reflect.TypeOf((*MockUserManager)(nil).GetUser), ctx, identifier) } @@ -86,7 +91,7 @@ func (m *MockUserManager) Init(ctx context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockUserManagerMockRecorder) Init(ctx interface{}) *gomock.Call { +func (mr *MockUserManagerMockRecorder) Init(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockUserManager)(nil).Init), ctx) } @@ -100,7 +105,7 @@ func (m *MockUserManager) ListUser(ctx context.Context) []*metadata.User { } // ListUser indicates an expected call of ListUser. -func (mr *MockUserManagerMockRecorder) ListUser(ctx interface{}) *gomock.Call { +func (mr *MockUserManagerMockRecorder) ListUser(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListUser", reflect.TypeOf((*MockUserManager)(nil).ListUser), ctx) } diff --git a/server/controller/tenant/manager/namespace_test.go b/server/controller/tenant/manager/namespace_test.go index 1a29f0779..55572f911 100644 --- a/server/controller/tenant/manager/namespace_test.go +++ b/server/controller/tenant/manager/namespace_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" primitive "github.com/vanus-labs/vanus/pkg" "github.com/vanus-labs/vanus/pkg/kv" diff --git a/server/controller/tenant/manager/role_test.go b/server/controller/tenant/manager/role_test.go index 09659f07d..57881cc51 100644 --- a/server/controller/tenant/manager/role_test.go +++ b/server/controller/tenant/manager/role_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/errors" diff --git a/server/controller/tenant/manager/token_test.go b/server/controller/tenant/manager/token_test.go index f5084a439..164a981fd 100644 --- a/server/controller/tenant/manager/token_test.go +++ b/server/controller/tenant/manager/token_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" vanus "github.com/vanus-labs/vanus/api/vsr" diff --git a/server/controller/tenant/manager/user_test.go b/server/controller/tenant/manager/user_test.go index 1248da178..4cd1f7332 100644 --- a/server/controller/tenant/manager/user_test.go +++ b/server/controller/tenant/manager/user_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" primitive "github.com/vanus-labs/vanus/pkg" "github.com/vanus-labs/vanus/pkg/kv" diff --git a/server/controller/trigger/controller_test.go b/server/controller/trigger/controller_test.go index 22e25cf1d..3214ae105 100644 --- a/server/controller/trigger/controller_test.go +++ b/server/controller/trigger/controller_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" ctrlpb "github.com/vanus-labs/vanus/api/controller" metapb "github.com/vanus-labs/vanus/api/meta" diff --git a/server/controller/trigger/secret/mock_storage.go b/server/controller/trigger/secret/mock_storage.go index 1f8241227..f5df69a01 100644 --- a/server/controller/trigger/secret/mock_storage.go +++ b/server/controller/trigger/secret/mock_storage.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: storage.go +// +// Generated by this command: +// +// mockgen -source=storage.go -destination=mock_storage.go -package=secret +// // Package secret is a generated GoMock package. package secret @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" pkg "github.com/vanus-labs/vanus/pkg" + gomock "go.uber.org/mock/gomock" ) // MockStorage is a mock of Storage interface. @@ -45,7 +50,7 @@ func (m *MockStorage) Delete(ctx context.Context, subID vsr.ID) error { } // Delete indicates an expected call of Delete. -func (mr *MockStorageMockRecorder) Delete(ctx, subID interface{}) *gomock.Call { +func (mr *MockStorageMockRecorder) Delete(ctx, subID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockStorage)(nil).Delete), ctx, subID) } @@ -60,7 +65,7 @@ func (m *MockStorage) Read(ctx context.Context, subID vsr.ID, credentialType pkg } // Read indicates an expected call of Read. -func (mr *MockStorageMockRecorder) Read(ctx, subID, credentialType interface{}) *gomock.Call { +func (mr *MockStorageMockRecorder) Read(ctx, subID, credentialType any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockStorage)(nil).Read), ctx, subID, credentialType) } @@ -74,7 +79,7 @@ func (m *MockStorage) Write(ctx context.Context, subID vsr.ID, credential pkg.Si } // Write indicates an expected call of Write. -func (mr *MockStorageMockRecorder) Write(ctx, subID, credential interface{}) *gomock.Call { +func (mr *MockStorageMockRecorder) Write(ctx, subID, credential any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Write", reflect.TypeOf((*MockStorage)(nil).Write), ctx, subID, credential) } diff --git a/server/controller/trigger/storage/mock_offset.go b/server/controller/trigger/storage/mock_offset.go index 0294191df..ef9e9c7fb 100644 --- a/server/controller/trigger/storage/mock_offset.go +++ b/server/controller/trigger/storage/mock_offset.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: offset.go +// +// Generated by this command: +// +// mockgen -source=offset.go -destination=mock_offset.go -package=storage +// // Package storage is a generated GoMock package. package storage @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" info "github.com/vanus-labs/vanus/pkg/info" + gomock "go.uber.org/mock/gomock" ) // MockOffsetStorage is a mock of OffsetStorage interface. @@ -45,7 +50,7 @@ func (m *MockOffsetStorage) CreateOffset(ctx context.Context, subscriptionID vsr } // CreateOffset indicates an expected call of CreateOffset. -func (mr *MockOffsetStorageMockRecorder) CreateOffset(ctx, subscriptionID, info interface{}) *gomock.Call { +func (mr *MockOffsetStorageMockRecorder) CreateOffset(ctx, subscriptionID, info any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOffset", reflect.TypeOf((*MockOffsetStorage)(nil).CreateOffset), ctx, subscriptionID, info) } @@ -59,7 +64,7 @@ func (m *MockOffsetStorage) DeleteOffset(ctx context.Context, subscriptionID vsr } // DeleteOffset indicates an expected call of DeleteOffset. -func (mr *MockOffsetStorageMockRecorder) DeleteOffset(ctx, subscriptionID interface{}) *gomock.Call { +func (mr *MockOffsetStorageMockRecorder) DeleteOffset(ctx, subscriptionID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteOffset", reflect.TypeOf((*MockOffsetStorage)(nil).DeleteOffset), ctx, subscriptionID) } @@ -74,7 +79,7 @@ func (m *MockOffsetStorage) GetOffsets(ctx context.Context, subscriptionID vsr.I } // GetOffsets indicates an expected call of GetOffsets. -func (mr *MockOffsetStorageMockRecorder) GetOffsets(ctx, subscriptionID interface{}) *gomock.Call { +func (mr *MockOffsetStorageMockRecorder) GetOffsets(ctx, subscriptionID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOffsets", reflect.TypeOf((*MockOffsetStorage)(nil).GetOffsets), ctx, subscriptionID) } @@ -88,7 +93,7 @@ func (m *MockOffsetStorage) UpdateOffset(ctx context.Context, subscriptionID vsr } // UpdateOffset indicates an expected call of UpdateOffset. -func (mr *MockOffsetStorageMockRecorder) UpdateOffset(ctx, subscriptionID, info interface{}) *gomock.Call { +func (mr *MockOffsetStorageMockRecorder) UpdateOffset(ctx, subscriptionID, info any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateOffset", reflect.TypeOf((*MockOffsetStorage)(nil).UpdateOffset), ctx, subscriptionID, info) } diff --git a/server/controller/trigger/storage/mock_storage.go b/server/controller/trigger/storage/mock_storage.go index 226d45d9f..c2233995c 100644 --- a/server/controller/trigger/storage/mock_storage.go +++ b/server/controller/trigger/storage/mock_storage.go @@ -14,7 +14,7 @@ package storage -import "github.com/golang/mock/gomock" +import "go.uber.org/mock/gomock" type MockStorage struct { *MockOffsetStorage diff --git a/server/controller/trigger/storage/mock_subscription.go b/server/controller/trigger/storage/mock_subscription.go index a6a48b9d6..98eb9051b 100644 --- a/server/controller/trigger/storage/mock_subscription.go +++ b/server/controller/trigger/storage/mock_subscription.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: subscription.go +// +// Generated by this command: +// +// mockgen -source=subscription.go -destination=mock_subscription.go -package=storage +// // Package storage is a generated GoMock package. package storage @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" metadata "github.com/vanus-labs/vanus/server/controller/trigger/metadata" + gomock "go.uber.org/mock/gomock" ) // MockSubscriptionStorage is a mock of SubscriptionStorage interface. @@ -45,7 +50,7 @@ func (m *MockSubscriptionStorage) CreateSubscription(ctx context.Context, sub *m } // CreateSubscription indicates an expected call of CreateSubscription. -func (mr *MockSubscriptionStorageMockRecorder) CreateSubscription(ctx, sub interface{}) *gomock.Call { +func (mr *MockSubscriptionStorageMockRecorder) CreateSubscription(ctx, sub any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSubscription", reflect.TypeOf((*MockSubscriptionStorage)(nil).CreateSubscription), ctx, sub) } @@ -59,7 +64,7 @@ func (m *MockSubscriptionStorage) DeleteSubscription(ctx context.Context, id vsr } // DeleteSubscription indicates an expected call of DeleteSubscription. -func (mr *MockSubscriptionStorageMockRecorder) DeleteSubscription(ctx, id interface{}) *gomock.Call { +func (mr *MockSubscriptionStorageMockRecorder) DeleteSubscription(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSubscription", reflect.TypeOf((*MockSubscriptionStorage)(nil).DeleteSubscription), ctx, id) } @@ -74,7 +79,7 @@ func (m *MockSubscriptionStorage) GetSubscription(ctx context.Context, id vsr.ID } // GetSubscription indicates an expected call of GetSubscription. -func (mr *MockSubscriptionStorageMockRecorder) GetSubscription(ctx, id interface{}) *gomock.Call { +func (mr *MockSubscriptionStorageMockRecorder) GetSubscription(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSubscription", reflect.TypeOf((*MockSubscriptionStorage)(nil).GetSubscription), ctx, id) } @@ -89,7 +94,7 @@ func (m *MockSubscriptionStorage) ListSubscription(ctx context.Context) ([]*meta } // ListSubscription indicates an expected call of ListSubscription. -func (mr *MockSubscriptionStorageMockRecorder) ListSubscription(ctx interface{}) *gomock.Call { +func (mr *MockSubscriptionStorageMockRecorder) ListSubscription(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListSubscription", reflect.TypeOf((*MockSubscriptionStorage)(nil).ListSubscription), ctx) } @@ -103,7 +108,7 @@ func (m *MockSubscriptionStorage) UpdateSubscription(ctx context.Context, sub *m } // UpdateSubscription indicates an expected call of UpdateSubscription. -func (mr *MockSubscriptionStorageMockRecorder) UpdateSubscription(ctx, sub interface{}) *gomock.Call { +func (mr *MockSubscriptionStorageMockRecorder) UpdateSubscription(ctx, sub any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSubscription", reflect.TypeOf((*MockSubscriptionStorage)(nil).UpdateSubscription), ctx, sub) } diff --git a/server/controller/trigger/storage/mock_trigger_worker.go b/server/controller/trigger/storage/mock_trigger_worker.go index 0a3efbc6e..1ddb128ac 100644 --- a/server/controller/trigger/storage/mock_trigger_worker.go +++ b/server/controller/trigger/storage/mock_trigger_worker.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: trigger_worker.go +// +// Generated by this command: +// +// mockgen -source=trigger_worker.go -destination=mock_trigger_worker.go -package=storage +// // Package storage is a generated GoMock package. package storage @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" metadata "github.com/vanus-labs/vanus/server/controller/trigger/metadata" + gomock "go.uber.org/mock/gomock" ) // MockTriggerWorkerStorage is a mock of TriggerWorkerStorage interface. @@ -44,7 +49,7 @@ func (m *MockTriggerWorkerStorage) DeleteTriggerWorker(ctx context.Context, id s } // DeleteTriggerWorker indicates an expected call of DeleteTriggerWorker. -func (mr *MockTriggerWorkerStorageMockRecorder) DeleteTriggerWorker(ctx, id interface{}) *gomock.Call { +func (mr *MockTriggerWorkerStorageMockRecorder) DeleteTriggerWorker(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteTriggerWorker", reflect.TypeOf((*MockTriggerWorkerStorage)(nil).DeleteTriggerWorker), ctx, id) } @@ -59,7 +64,7 @@ func (m *MockTriggerWorkerStorage) GetTriggerWorker(ctx context.Context, id stri } // GetTriggerWorker indicates an expected call of GetTriggerWorker. -func (mr *MockTriggerWorkerStorageMockRecorder) GetTriggerWorker(ctx, id interface{}) *gomock.Call { +func (mr *MockTriggerWorkerStorageMockRecorder) GetTriggerWorker(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTriggerWorker", reflect.TypeOf((*MockTriggerWorkerStorage)(nil).GetTriggerWorker), ctx, id) } @@ -74,7 +79,7 @@ func (m *MockTriggerWorkerStorage) ListTriggerWorker(ctx context.Context) ([]*me } // ListTriggerWorker indicates an expected call of ListTriggerWorker. -func (mr *MockTriggerWorkerStorageMockRecorder) ListTriggerWorker(ctx interface{}) *gomock.Call { +func (mr *MockTriggerWorkerStorageMockRecorder) ListTriggerWorker(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListTriggerWorker", reflect.TypeOf((*MockTriggerWorkerStorage)(nil).ListTriggerWorker), ctx) } @@ -88,7 +93,7 @@ func (m *MockTriggerWorkerStorage) SaveTriggerWorker(arg0 context.Context, arg1 } // SaveTriggerWorker indicates an expected call of SaveTriggerWorker. -func (mr *MockTriggerWorkerStorageMockRecorder) SaveTriggerWorker(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTriggerWorkerStorageMockRecorder) SaveTriggerWorker(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveTriggerWorker", reflect.TypeOf((*MockTriggerWorkerStorage)(nil).SaveTriggerWorker), arg0, arg1) } diff --git a/server/controller/trigger/storage/offset_test.go b/server/controller/trigger/storage/offset_test.go index 1c3a8a7c5..1ccd12762 100644 --- a/server/controller/trigger/storage/offset_test.go +++ b/server/controller/trigger/storage/offset_test.go @@ -19,8 +19,8 @@ import ( "fmt" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" vanus "github.com/vanus-labs/vanus/api/vsr" "github.com/vanus-labs/vanus/pkg/info" diff --git a/server/controller/trigger/storage/secret_test.go b/server/controller/trigger/storage/secret_test.go index 3e9f4b065..2cbcf84cc 100644 --- a/server/controller/trigger/storage/secret_test.go +++ b/server/controller/trigger/storage/secret_test.go @@ -19,8 +19,8 @@ import ( "encoding/json" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" primitive "github.com/vanus-labs/vanus/pkg" "github.com/vanus-labs/vanus/pkg/crypto/aes" diff --git a/server/controller/trigger/storage/subscription_test.go b/server/controller/trigger/storage/subscription_test.go index e63d52cfd..887f283b5 100644 --- a/server/controller/trigger/storage/subscription_test.go +++ b/server/controller/trigger/storage/subscription_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" vanus "github.com/vanus-labs/vanus/api/vsr" diff --git a/server/controller/trigger/storage/trigger_worker_test.go b/server/controller/trigger/storage/trigger_worker_test.go index 142aaae0c..977cbcb2e 100644 --- a/server/controller/trigger/storage/trigger_worker_test.go +++ b/server/controller/trigger/storage/trigger_worker_test.go @@ -19,8 +19,8 @@ import ( "encoding/json" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/pkg/kv" "github.com/vanus-labs/vanus/server/controller/trigger/metadata" diff --git a/server/controller/trigger/subscription/mock_subscription.go b/server/controller/trigger/subscription/mock_subscription.go index 661a3d439..a3b86846a 100644 --- a/server/controller/trigger/subscription/mock_subscription.go +++ b/server/controller/trigger/subscription/mock_subscription.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: subscription.go +// +// Generated by this command: +// +// mockgen -source=subscription.go -destination=mock_subscription.go -package=subscription +// // Package subscription is a generated GoMock package. package subscription @@ -9,10 +14,10 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" info "github.com/vanus-labs/vanus/pkg/info" metadata "github.com/vanus-labs/vanus/server/controller/trigger/metadata" + gomock "go.uber.org/mock/gomock" ) // MockManager is a mock of Manager interface. @@ -47,7 +52,7 @@ func (m *MockManager) AddSubscription(ctx context.Context, subscription *metadat } // AddSubscription indicates an expected call of AddSubscription. -func (mr *MockManagerMockRecorder) AddSubscription(ctx, subscription interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) AddSubscription(ctx, subscription any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddSubscription", reflect.TypeOf((*MockManager)(nil).AddSubscription), ctx, subscription) } @@ -61,7 +66,7 @@ func (m *MockManager) DeleteSubscription(ctx context.Context, id vsr.ID) error { } // DeleteSubscription indicates an expected call of DeleteSubscription. -func (mr *MockManagerMockRecorder) DeleteSubscription(ctx, id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) DeleteSubscription(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSubscription", reflect.TypeOf((*MockManager)(nil).DeleteSubscription), ctx, id) } @@ -76,7 +81,7 @@ func (m *MockManager) GetDeadLetterOffset(ctx context.Context, id vsr.ID) (uint6 } // GetDeadLetterOffset indicates an expected call of GetDeadLetterOffset. -func (mr *MockManagerMockRecorder) GetDeadLetterOffset(ctx, id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetDeadLetterOffset(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDeadLetterOffset", reflect.TypeOf((*MockManager)(nil).GetDeadLetterOffset), ctx, id) } @@ -91,7 +96,7 @@ func (m *MockManager) GetOffset(ctx context.Context, id vsr.ID) (info.ListOffset } // GetOffset indicates an expected call of GetOffset. -func (mr *MockManagerMockRecorder) GetOffset(ctx, id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetOffset(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOffset", reflect.TypeOf((*MockManager)(nil).GetOffset), ctx, id) } @@ -106,7 +111,7 @@ func (m *MockManager) GetOrSaveOffset(ctx context.Context, id vsr.ID) (info.List } // GetOrSaveOffset indicates an expected call of GetOrSaveOffset. -func (mr *MockManagerMockRecorder) GetOrSaveOffset(ctx, id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetOrSaveOffset(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOrSaveOffset", reflect.TypeOf((*MockManager)(nil).GetOrSaveOffset), ctx, id) } @@ -120,7 +125,7 @@ func (m *MockManager) GetSubscription(ctx context.Context, id vsr.ID) *metadata. } // GetSubscription indicates an expected call of GetSubscription. -func (mr *MockManagerMockRecorder) GetSubscription(ctx, id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetSubscription(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSubscription", reflect.TypeOf((*MockManager)(nil).GetSubscription), ctx, id) } @@ -134,7 +139,7 @@ func (m *MockManager) GetSubscriptionByName(ctx context.Context, namespaceID vsr } // GetSubscriptionByName indicates an expected call of GetSubscriptionByName. -func (mr *MockManagerMockRecorder) GetSubscriptionByName(ctx, namespaceID, name interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetSubscriptionByName(ctx, namespaceID, name any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSubscriptionByName", reflect.TypeOf((*MockManager)(nil).GetSubscriptionByName), ctx, namespaceID, name) } @@ -148,7 +153,7 @@ func (m *MockManager) Heartbeat(ctx context.Context, id vsr.ID, addr string, tim } // Heartbeat indicates an expected call of Heartbeat. -func (mr *MockManagerMockRecorder) Heartbeat(ctx, id, addr, time interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Heartbeat(ctx, id, addr, time any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Heartbeat", reflect.TypeOf((*MockManager)(nil).Heartbeat), ctx, id, addr, time) } @@ -162,7 +167,7 @@ func (m *MockManager) Init(ctx context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockManagerMockRecorder) Init(ctx interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Init(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockManager)(nil).Init), ctx) } @@ -176,7 +181,7 @@ func (m *MockManager) ListSubscription(ctx context.Context) []*metadata.Subscrip } // ListSubscription indicates an expected call of ListSubscription. -func (mr *MockManagerMockRecorder) ListSubscription(ctx interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) ListSubscription(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListSubscription", reflect.TypeOf((*MockManager)(nil).ListSubscription), ctx) } @@ -191,7 +196,7 @@ func (m *MockManager) ResetOffsetByTimestamp(ctx context.Context, id vsr.ID, tim } // ResetOffsetByTimestamp indicates an expected call of ResetOffsetByTimestamp. -func (mr *MockManagerMockRecorder) ResetOffsetByTimestamp(ctx, id, timestamp interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) ResetOffsetByTimestamp(ctx, id, timestamp any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResetOffsetByTimestamp", reflect.TypeOf((*MockManager)(nil).ResetOffsetByTimestamp), ctx, id, timestamp) } @@ -205,7 +210,7 @@ func (m *MockManager) SaveDeadLetterOffset(ctx context.Context, id vsr.ID, offse } // SaveDeadLetterOffset indicates an expected call of SaveDeadLetterOffset. -func (mr *MockManagerMockRecorder) SaveDeadLetterOffset(ctx, id, offset interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) SaveDeadLetterOffset(ctx, id, offset any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveDeadLetterOffset", reflect.TypeOf((*MockManager)(nil).SaveDeadLetterOffset), ctx, id, offset) } @@ -219,7 +224,7 @@ func (m *MockManager) SaveOffset(ctx context.Context, id vsr.ID, offsets info.Li } // SaveOffset indicates an expected call of SaveOffset. -func (mr *MockManagerMockRecorder) SaveOffset(ctx, id, offsets, commit interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) SaveOffset(ctx, id, offsets, commit any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveOffset", reflect.TypeOf((*MockManager)(nil).SaveOffset), ctx, id, offsets, commit) } @@ -257,7 +262,7 @@ func (m *MockManager) UpdateSubscription(ctx context.Context, subscription *meta } // UpdateSubscription indicates an expected call of UpdateSubscription. -func (mr *MockManagerMockRecorder) UpdateSubscription(ctx, subscription interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) UpdateSubscription(ctx, subscription any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSubscription", reflect.TypeOf((*MockManager)(nil).UpdateSubscription), ctx, subscription) } diff --git a/server/controller/trigger/subscription/offset/mock_offset.go b/server/controller/trigger/subscription/offset/mock_offset.go index c15ac7650..fb6d297e5 100644 --- a/server/controller/trigger/subscription/offset/mock_offset.go +++ b/server/controller/trigger/subscription/offset/mock_offset.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: offset.go +// +// Generated by this command: +// +// mockgen -source=offset.go -destination=mock_offset.go -package=offset +// // Package offset is a generated GoMock package. package offset @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" info "github.com/vanus-labs/vanus/pkg/info" + gomock "go.uber.org/mock/gomock" ) // MockManager is a mock of Manager interface. @@ -46,7 +51,7 @@ func (m *MockManager) GetOffset(ctx context.Context, subscriptionID vsr.ID) (inf } // GetOffset indicates an expected call of GetOffset. -func (mr *MockManagerMockRecorder) GetOffset(ctx, subscriptionID interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetOffset(ctx, subscriptionID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOffset", reflect.TypeOf((*MockManager)(nil).GetOffset), ctx, subscriptionID) } @@ -60,7 +65,7 @@ func (m *MockManager) Offset(ctx context.Context, subscriptionID vsr.ID, offsets } // Offset indicates an expected call of Offset. -func (mr *MockManagerMockRecorder) Offset(ctx, subscriptionID, offsets, commit interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Offset(ctx, subscriptionID, offsets, commit any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Offset", reflect.TypeOf((*MockManager)(nil).Offset), ctx, subscriptionID, offsets, commit) } @@ -74,7 +79,7 @@ func (m *MockManager) RemoveRegisterSubscription(ctx context.Context, id vsr.ID) } // RemoveRegisterSubscription indicates an expected call of RemoveRegisterSubscription. -func (mr *MockManagerMockRecorder) RemoveRegisterSubscription(ctx, id interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) RemoveRegisterSubscription(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveRegisterSubscription", reflect.TypeOf((*MockManager)(nil).RemoveRegisterSubscription), ctx, id) } diff --git a/server/controller/trigger/subscription/offset/offset_test.go b/server/controller/trigger/subscription/offset/offset_test.go index 83dc340c2..503515207 100644 --- a/server/controller/trigger/subscription/offset/offset_test.go +++ b/server/controller/trigger/subscription/offset/offset_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" vanus "github.com/vanus-labs/vanus/api/vsr" "github.com/vanus-labs/vanus/pkg/info" diff --git a/server/controller/trigger/subscription/offset_test.go b/server/controller/trigger/subscription/offset_test.go index 25f940390..8809d4ff6 100644 --- a/server/controller/trigger/subscription/offset_test.go +++ b/server/controller/trigger/subscription/offset_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/cluster" metapb "github.com/vanus-labs/vanus/api/meta" diff --git a/server/controller/trigger/subscription/subscription_test.go b/server/controller/trigger/subscription/subscription_test.go index 666a7494d..f03339fbd 100644 --- a/server/controller/trigger/subscription/subscription_test.go +++ b/server/controller/trigger/subscription/subscription_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/cluster" metapb "github.com/vanus-labs/vanus/api/meta" diff --git a/server/controller/trigger/worker/manager_test.go b/server/controller/trigger/worker/manager_test.go index cbfa42015..9485cf34c 100644 --- a/server/controller/trigger/worker/manager_test.go +++ b/server/controller/trigger/worker/manager_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/prashantv/gostub" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" vanus "github.com/vanus-labs/vanus/api/vsr" "github.com/vanus-labs/vanus/pkg/observability/log" diff --git a/server/controller/trigger/worker/mock_manager.go b/server/controller/trigger/worker/mock_manager.go index 658d3d43d..7a98f700c 100644 --- a/server/controller/trigger/worker/mock_manager.go +++ b/server/controller/trigger/worker/mock_manager.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: manager.go +// +// Generated by this command: +// +// mockgen -source=manager.go -destination=mock_manager.go -package=worker +// // Package worker is a generated GoMock package. package worker @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" metadata "github.com/vanus-labs/vanus/server/controller/trigger/metadata" + gomock "go.uber.org/mock/gomock" ) // MockManager is a mock of Manager interface. @@ -44,7 +49,7 @@ func (m *MockManager) AddTriggerWorker(ctx context.Context, addr string) error { } // AddTriggerWorker indicates an expected call of AddTriggerWorker. -func (mr *MockManagerMockRecorder) AddTriggerWorker(ctx, addr interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) AddTriggerWorker(ctx, addr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddTriggerWorker", reflect.TypeOf((*MockManager)(nil).AddTriggerWorker), ctx, addr) } @@ -72,7 +77,7 @@ func (m *MockManager) GetTriggerWorker(addr string) TriggerWorker { } // GetTriggerWorker indicates an expected call of GetTriggerWorker. -func (mr *MockManagerMockRecorder) GetTriggerWorker(addr interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetTriggerWorker(addr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTriggerWorker", reflect.TypeOf((*MockManager)(nil).GetTriggerWorker), addr) } @@ -86,7 +91,7 @@ func (m *MockManager) Init(ctx context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockManagerMockRecorder) Init(ctx interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Init(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockManager)(nil).Init), ctx) } @@ -98,7 +103,7 @@ func (m *MockManager) RemoveTriggerWorker(ctx context.Context, addr string) { } // RemoveTriggerWorker indicates an expected call of RemoveTriggerWorker. -func (mr *MockManagerMockRecorder) RemoveTriggerWorker(ctx, addr interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) RemoveTriggerWorker(ctx, addr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveTriggerWorker", reflect.TypeOf((*MockManager)(nil).RemoveTriggerWorker), ctx, addr) } @@ -136,7 +141,7 @@ func (m *MockManager) UpdateTriggerWorkerInfo(ctx context.Context, addr string) } // UpdateTriggerWorkerInfo indicates an expected call of UpdateTriggerWorkerInfo. -func (mr *MockManagerMockRecorder) UpdateTriggerWorkerInfo(ctx, addr interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) UpdateTriggerWorkerInfo(ctx, addr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTriggerWorkerInfo", reflect.TypeOf((*MockManager)(nil).UpdateTriggerWorkerInfo), ctx, addr) } diff --git a/server/controller/trigger/worker/mock_worker.go b/server/controller/trigger/worker/mock_worker.go index c820ed50f..1eaeb2bae 100644 --- a/server/controller/trigger/worker/mock_worker.go +++ b/server/controller/trigger/worker/mock_worker.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: worker.go +// +// Generated by this command: +// +// mockgen -source=worker.go -destination=mock_worker.go -package=worker +// // Package worker is a generated GoMock package. package worker @@ -9,9 +14,9 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" metadata "github.com/vanus-labs/vanus/server/controller/trigger/metadata" + gomock "go.uber.org/mock/gomock" ) // MockTriggerWorker is a mock of TriggerWorker interface. @@ -44,7 +49,7 @@ func (m *MockTriggerWorker) AssignSubscription(id vsr.ID) { } // AssignSubscription indicates an expected call of AssignSubscription. -func (mr *MockTriggerWorkerMockRecorder) AssignSubscription(id interface{}) *gomock.Call { +func (mr *MockTriggerWorkerMockRecorder) AssignSubscription(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AssignSubscription", reflect.TypeOf((*MockTriggerWorker)(nil).AssignSubscription), id) } @@ -182,7 +187,7 @@ func (m *MockTriggerWorker) RemoteStart(ctx context.Context) error { } // RemoteStart indicates an expected call of RemoteStart. -func (mr *MockTriggerWorkerMockRecorder) RemoteStart(ctx interface{}) *gomock.Call { +func (mr *MockTriggerWorkerMockRecorder) RemoteStart(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoteStart", reflect.TypeOf((*MockTriggerWorker)(nil).RemoteStart), ctx) } @@ -196,7 +201,7 @@ func (m *MockTriggerWorker) RemoteStop(ctx context.Context) error { } // RemoteStop indicates an expected call of RemoteStop. -func (mr *MockTriggerWorkerMockRecorder) RemoteStop(ctx interface{}) *gomock.Call { +func (mr *MockTriggerWorkerMockRecorder) RemoteStop(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoteStop", reflect.TypeOf((*MockTriggerWorker)(nil).RemoteStop), ctx) } @@ -220,7 +225,7 @@ func (m *MockTriggerWorker) SetPhase(arg0 metadata.TriggerWorkerPhase) { } // SetPhase indicates an expected call of SetPhase. -func (mr *MockTriggerWorkerMockRecorder) SetPhase(arg0 interface{}) *gomock.Call { +func (mr *MockTriggerWorkerMockRecorder) SetPhase(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetPhase", reflect.TypeOf((*MockTriggerWorker)(nil).SetPhase), arg0) } @@ -234,7 +239,7 @@ func (m *MockTriggerWorker) Start(ctx context.Context) error { } // Start indicates an expected call of Start. -func (mr *MockTriggerWorkerMockRecorder) Start(ctx interface{}) *gomock.Call { +func (mr *MockTriggerWorkerMockRecorder) Start(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockTriggerWorker)(nil).Start), ctx) } @@ -248,7 +253,7 @@ func (m *MockTriggerWorker) UnAssignSubscription(id vsr.ID) error { } // UnAssignSubscription indicates an expected call of UnAssignSubscription. -func (mr *MockTriggerWorkerMockRecorder) UnAssignSubscription(id interface{}) *gomock.Call { +func (mr *MockTriggerWorkerMockRecorder) UnAssignSubscription(id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnAssignSubscription", reflect.TypeOf((*MockTriggerWorker)(nil).UnAssignSubscription), id) } diff --git a/server/controller/trigger/worker/scheduler_test.go b/server/controller/trigger/worker/scheduler_test.go index e881f8491..31b1f5a7e 100644 --- a/server/controller/trigger/worker/scheduler_test.go +++ b/server/controller/trigger/worker/scheduler_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" vanus "github.com/vanus-labs/vanus/api/vsr" diff --git a/server/controller/trigger/worker/worker_test.go b/server/controller/trigger/worker/worker_test.go index 15af07f51..85f258b97 100644 --- a/server/controller/trigger/worker/worker_test.go +++ b/server/controller/trigger/worker/worker_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" pbtrigger "github.com/vanus-labs/vanus/api/trigger" diff --git a/server/gateway/gateway_test.go b/server/gateway/gateway_test.go index bac8806ff..742b5f3f1 100644 --- a/server/gateway/gateway_test.go +++ b/server/gateway/gateway_test.go @@ -24,9 +24,9 @@ import ( ce "github.com/cloudevents/sdk-go/v2" cehttp "github.com/cloudevents/sdk-go/v2/protocol/http" - . "github.com/golang/mock/gomock" . "github.com/prashantv/gostub" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/cluster" metapb "github.com/vanus-labs/vanus/api/meta" diff --git a/server/gateway/proxy/direct_test.go b/server/gateway/proxy/direct_test.go index 23ea2588b..8a194660c 100644 --- a/server/gateway/proxy/direct_test.go +++ b/server/gateway/proxy/direct_test.go @@ -4,8 +4,8 @@ import ( stdCtx "context" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/server/gateway/proxy/proxy_test.go b/server/gateway/proxy/proxy_test.go index ce6b34a6c..58845abc8 100644 --- a/server/gateway/proxy/proxy_test.go +++ b/server/gateway/proxy/proxy_test.go @@ -25,9 +25,9 @@ import ( // third-party libraries. v2 "github.com/cloudevents/sdk-go/v2" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" "github.com/tidwall/gjson" + "go.uber.org/mock/gomock" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/types/known/emptypb" diff --git a/server/store/block/entry_test.go b/server/store/block/entry_test.go index e8a8e952d..bcd562d32 100644 --- a/server/store/block/entry_test.go +++ b/server/store/block/entry_test.go @@ -21,8 +21,8 @@ import ( "time" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. "github.com/vanus-labs/vanus/server/store/block" diff --git a/server/store/block/fragment_test.go b/server/store/block/fragment_test.go index a3dc6183f..50348195e 100644 --- a/server/store/block/fragment_test.go +++ b/server/store/block/fragment_test.go @@ -19,8 +19,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. "github.com/vanus-labs/vanus/server/store/block" diff --git a/server/store/block/testing/mock_block.go b/server/store/block/testing/mock_block.go index 100dc8486..8b95cbc43 100644 --- a/server/store/block/testing/mock_block.go +++ b/server/store/block/testing/mock_block.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: block.go +// +// Generated by this command: +// +// mockgen -source=block.go -destination=testing/mock_block.go -package=testing +// // Package testing is a generated GoMock package. package testing @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" block "github.com/vanus-labs/vanus/server/store/block" + gomock "go.uber.org/mock/gomock" ) // MockSeeker is a mock of Seeker interface. @@ -46,7 +51,7 @@ func (m *MockSeeker) Seek(ctx context.Context, index int64, key block.Entry, fla } // Seek indicates an expected call of Seek. -func (mr *MockSeekerMockRecorder) Seek(ctx, index, key, flag interface{}) *gomock.Call { +func (mr *MockSeekerMockRecorder) Seek(ctx, index, key, flag any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Seek", reflect.TypeOf((*MockSeeker)(nil).Seek), ctx, index, key, flag) } @@ -84,7 +89,7 @@ func (m *MockReader) Read(ctx context.Context, seq int64, num int) ([]block.Entr } // Read indicates an expected call of Read. -func (mr *MockReaderMockRecorder) Read(ctx, seq, num interface{}) *gomock.Call { +func (mr *MockReaderMockRecorder) Read(ctx, seq, num any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockReader)(nil).Read), ctx, seq, num) } @@ -119,7 +124,7 @@ func (m *MockAppender) Append(ctx context.Context, entries []block.Entry, cb blo } // Append indicates an expected call of Append. -func (mr *MockAppenderMockRecorder) Append(ctx, entries, cb interface{}) *gomock.Call { +func (mr *MockAppenderMockRecorder) Append(ctx, entries, cb any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Append", reflect.TypeOf((*MockAppender)(nil).Append), ctx, entries, cb) } @@ -154,7 +159,7 @@ func (m *MockBlock) Append(ctx context.Context, entries []block.Entry, cb block. } // Append indicates an expected call of Append. -func (mr *MockBlockMockRecorder) Append(ctx, entries, cb interface{}) *gomock.Call { +func (mr *MockBlockMockRecorder) Append(ctx, entries, cb any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Append", reflect.TypeOf((*MockBlock)(nil).Append), ctx, entries, cb) } @@ -183,7 +188,7 @@ func (m *MockBlock) Read(ctx context.Context, seq int64, num int) ([]block.Entry } // Read indicates an expected call of Read. -func (mr *MockBlockMockRecorder) Read(ctx, seq, num interface{}) *gomock.Call { +func (mr *MockBlockMockRecorder) Read(ctx, seq, num any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockBlock)(nil).Read), ctx, seq, num) } @@ -198,7 +203,7 @@ func (m *MockBlock) Seek(ctx context.Context, index int64, key block.Entry, flag } // Seek indicates an expected call of Seek. -func (mr *MockBlockMockRecorder) Seek(ctx, index, key, flag interface{}) *gomock.Call { +func (mr *MockBlockMockRecorder) Seek(ctx, index, key, flag any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Seek", reflect.TypeOf((*MockBlock)(nil).Seek), ctx, index, key, flag) } diff --git a/server/store/block/testing/mock_entry.go b/server/store/block/testing/mock_entry.go index 2235eb424..141bfdc46 100644 --- a/server/store/block/testing/mock_entry.go +++ b/server/store/block/testing/mock_entry.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: entry.go +// +// Generated by this command: +// +// mockgen -source=entry.go -destination=testing/mock_entry.go -package=testing +// // Package testing is a generated GoMock package. package testing @@ -8,8 +13,8 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" block "github.com/vanus-labs/vanus/server/store/block" + gomock "go.uber.org/mock/gomock" ) // MockValue is a mock of Value interface. @@ -95,7 +100,7 @@ func (m *MockValueMarshaler) MarshalTo(buf []byte) int { } // MarshalTo indicates an expected call of MarshalTo. -func (mr *MockValueMarshalerMockRecorder) MarshalTo(buf interface{}) *gomock.Call { +func (mr *MockValueMarshalerMockRecorder) MarshalTo(buf any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MarshalTo", reflect.TypeOf((*MockValueMarshaler)(nil).MarshalTo), buf) } @@ -158,7 +163,7 @@ func (m *MockExtensionAttributeCallback) OnAttribute(attr []byte, val block.Valu } // OnAttribute indicates an expected call of OnAttribute. -func (mr *MockExtensionAttributeCallbackMockRecorder) OnAttribute(attr, val interface{}) *gomock.Call { +func (mr *MockExtensionAttributeCallbackMockRecorder) OnAttribute(attr, val any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnAttribute", reflect.TypeOf((*MockExtensionAttributeCallback)(nil).OnAttribute), attr, val) } @@ -187,15 +192,15 @@ func (m *MockEntry) EXPECT() *MockEntryMockRecorder { } // Get mocks base method. -func (m *MockEntry) Get(ordinal int) interface{} { +func (m *MockEntry) Get(ordinal int) any { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Get", ordinal) - ret0, _ := ret[0].(interface{}) + ret0, _ := ret[0].(any) return ret0 } // Get indicates an expected call of Get. -func (mr *MockEntryMockRecorder) Get(ordinal interface{}) *gomock.Call { +func (mr *MockEntryMockRecorder) Get(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockEntry)(nil).Get), ordinal) } @@ -209,7 +214,7 @@ func (m *MockEntry) GetBytes(ordinal int) []byte { } // GetBytes indicates an expected call of GetBytes. -func (mr *MockEntryMockRecorder) GetBytes(ordinal interface{}) *gomock.Call { +func (mr *MockEntryMockRecorder) GetBytes(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBytes", reflect.TypeOf((*MockEntry)(nil).GetBytes), ordinal) } @@ -223,7 +228,7 @@ func (m *MockEntry) GetExtensionAttribute(arg0 []byte) []byte { } // GetExtensionAttribute indicates an expected call of GetExtensionAttribute. -func (mr *MockEntryMockRecorder) GetExtensionAttribute(arg0 interface{}) *gomock.Call { +func (mr *MockEntryMockRecorder) GetExtensionAttribute(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetExtensionAttribute", reflect.TypeOf((*MockEntry)(nil).GetExtensionAttribute), arg0) } @@ -237,7 +242,7 @@ func (m *MockEntry) GetInt64(ordinal int) int64 { } // GetInt64 indicates an expected call of GetInt64. -func (mr *MockEntryMockRecorder) GetInt64(ordinal interface{}) *gomock.Call { +func (mr *MockEntryMockRecorder) GetInt64(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInt64", reflect.TypeOf((*MockEntry)(nil).GetInt64), ordinal) } @@ -251,7 +256,7 @@ func (m *MockEntry) GetString(ordinal int) string { } // GetString indicates an expected call of GetString. -func (mr *MockEntryMockRecorder) GetString(ordinal interface{}) *gomock.Call { +func (mr *MockEntryMockRecorder) GetString(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetString", reflect.TypeOf((*MockEntry)(nil).GetString), ordinal) } @@ -265,7 +270,7 @@ func (m *MockEntry) GetTime(ordinal int) time.Time { } // GetTime indicates an expected call of GetTime. -func (mr *MockEntryMockRecorder) GetTime(ordinal interface{}) *gomock.Call { +func (mr *MockEntryMockRecorder) GetTime(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTime", reflect.TypeOf((*MockEntry)(nil).GetTime), ordinal) } @@ -279,7 +284,7 @@ func (m *MockEntry) GetUint16(ordinal int) uint16 { } // GetUint16 indicates an expected call of GetUint16. -func (mr *MockEntryMockRecorder) GetUint16(ordinal interface{}) *gomock.Call { +func (mr *MockEntryMockRecorder) GetUint16(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUint16", reflect.TypeOf((*MockEntry)(nil).GetUint16), ordinal) } @@ -293,7 +298,7 @@ func (m *MockEntry) GetUint64(ordinal int) uint64 { } // GetUint64 indicates an expected call of GetUint64. -func (mr *MockEntryMockRecorder) GetUint64(ordinal interface{}) *gomock.Call { +func (mr *MockEntryMockRecorder) GetUint64(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUint64", reflect.TypeOf((*MockEntry)(nil).GetUint64), ordinal) } @@ -305,7 +310,7 @@ func (m *MockEntry) RangeExtensionAttributes(cb block.ExtensionAttributeCallback } // RangeExtensionAttributes indicates an expected call of RangeExtensionAttributes. -func (mr *MockEntryMockRecorder) RangeExtensionAttributes(cb interface{}) *gomock.Call { +func (mr *MockEntryMockRecorder) RangeExtensionAttributes(cb any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RangeExtensionAttributes", reflect.TypeOf((*MockEntry)(nil).RangeExtensionAttributes), cb) } @@ -334,13 +339,13 @@ func (m *MockOptionalAttributeCallback) EXPECT() *MockOptionalAttributeCallbackM } // OnAttribute mocks base method. -func (m *MockOptionalAttributeCallback) OnAttribute(ordinal int, val interface{}) { +func (m *MockOptionalAttributeCallback) OnAttribute(ordinal int, val any) { m.ctrl.T.Helper() m.ctrl.Call(m, "OnAttribute", ordinal, val) } // OnAttribute indicates an expected call of OnAttribute. -func (mr *MockOptionalAttributeCallbackMockRecorder) OnAttribute(ordinal, val interface{}) *gomock.Call { +func (mr *MockOptionalAttributeCallbackMockRecorder) OnAttribute(ordinal, val any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnAttribute", reflect.TypeOf((*MockOptionalAttributeCallback)(nil).OnAttribute), ordinal, val) } @@ -352,7 +357,7 @@ func (m *MockOptionalAttributeCallback) OnBytes(ordinal int, val []byte) { } // OnBytes indicates an expected call of OnBytes. -func (mr *MockOptionalAttributeCallbackMockRecorder) OnBytes(ordinal, val interface{}) *gomock.Call { +func (mr *MockOptionalAttributeCallbackMockRecorder) OnBytes(ordinal, val any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnBytes", reflect.TypeOf((*MockOptionalAttributeCallback)(nil).OnBytes), ordinal, val) } @@ -364,7 +369,7 @@ func (m *MockOptionalAttributeCallback) OnInt64(ordinal int, val int64) { } // OnInt64 indicates an expected call of OnInt64. -func (mr *MockOptionalAttributeCallbackMockRecorder) OnInt64(ordinal, val interface{}) *gomock.Call { +func (mr *MockOptionalAttributeCallbackMockRecorder) OnInt64(ordinal, val any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnInt64", reflect.TypeOf((*MockOptionalAttributeCallback)(nil).OnInt64), ordinal, val) } @@ -376,7 +381,7 @@ func (m *MockOptionalAttributeCallback) OnString(ordinal int, val string) { } // OnString indicates an expected call of OnString. -func (mr *MockOptionalAttributeCallbackMockRecorder) OnString(ordinal, val interface{}) *gomock.Call { +func (mr *MockOptionalAttributeCallbackMockRecorder) OnString(ordinal, val any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnString", reflect.TypeOf((*MockOptionalAttributeCallback)(nil).OnString), ordinal, val) } @@ -388,7 +393,7 @@ func (m *MockOptionalAttributeCallback) OnTime(ordinal int, val time.Time) { } // OnTime indicates an expected call of OnTime. -func (mr *MockOptionalAttributeCallbackMockRecorder) OnTime(ordinal, val interface{}) *gomock.Call { +func (mr *MockOptionalAttributeCallbackMockRecorder) OnTime(ordinal, val any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnTime", reflect.TypeOf((*MockOptionalAttributeCallback)(nil).OnTime), ordinal, val) } @@ -400,7 +405,7 @@ func (m *MockOptionalAttributeCallback) OnUint16(ordinal int, val uint16) { } // OnUint16 indicates an expected call of OnUint16. -func (mr *MockOptionalAttributeCallbackMockRecorder) OnUint16(ordinal, val interface{}) *gomock.Call { +func (mr *MockOptionalAttributeCallbackMockRecorder) OnUint16(ordinal, val any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnUint16", reflect.TypeOf((*MockOptionalAttributeCallback)(nil).OnUint16), ordinal, val) } @@ -412,7 +417,7 @@ func (m *MockOptionalAttributeCallback) OnUint64(ordinal int, val uint64) { } // OnUint64 indicates an expected call of OnUint64. -func (mr *MockOptionalAttributeCallbackMockRecorder) OnUint64(ordinal, val interface{}) *gomock.Call { +func (mr *MockOptionalAttributeCallbackMockRecorder) OnUint64(ordinal, val any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnUint64", reflect.TypeOf((*MockOptionalAttributeCallback)(nil).OnUint64), ordinal, val) } @@ -455,15 +460,15 @@ func (mr *MockEntryExtMockRecorder) ExtensionAttributeCount() *gomock.Call { } // Get mocks base method. -func (m *MockEntryExt) Get(ordinal int) interface{} { +func (m *MockEntryExt) Get(ordinal int) any { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Get", ordinal) - ret0, _ := ret[0].(interface{}) + ret0, _ := ret[0].(any) return ret0 } // Get indicates an expected call of Get. -func (mr *MockEntryExtMockRecorder) Get(ordinal interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) Get(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockEntryExt)(nil).Get), ordinal) } @@ -477,7 +482,7 @@ func (m *MockEntryExt) GetBytes(ordinal int) []byte { } // GetBytes indicates an expected call of GetBytes. -func (mr *MockEntryExtMockRecorder) GetBytes(ordinal interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) GetBytes(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBytes", reflect.TypeOf((*MockEntryExt)(nil).GetBytes), ordinal) } @@ -491,7 +496,7 @@ func (m *MockEntryExt) GetExtensionAttribute(arg0 []byte) []byte { } // GetExtensionAttribute indicates an expected call of GetExtensionAttribute. -func (mr *MockEntryExtMockRecorder) GetExtensionAttribute(arg0 interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) GetExtensionAttribute(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetExtensionAttribute", reflect.TypeOf((*MockEntryExt)(nil).GetExtensionAttribute), arg0) } @@ -505,7 +510,7 @@ func (m *MockEntryExt) GetInt64(ordinal int) int64 { } // GetInt64 indicates an expected call of GetInt64. -func (mr *MockEntryExtMockRecorder) GetInt64(ordinal interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) GetInt64(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInt64", reflect.TypeOf((*MockEntryExt)(nil).GetInt64), ordinal) } @@ -519,7 +524,7 @@ func (m *MockEntryExt) GetString(ordinal int) string { } // GetString indicates an expected call of GetString. -func (mr *MockEntryExtMockRecorder) GetString(ordinal interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) GetString(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetString", reflect.TypeOf((*MockEntryExt)(nil).GetString), ordinal) } @@ -533,7 +538,7 @@ func (m *MockEntryExt) GetTime(ordinal int) time.Time { } // GetTime indicates an expected call of GetTime. -func (mr *MockEntryExtMockRecorder) GetTime(ordinal interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) GetTime(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTime", reflect.TypeOf((*MockEntryExt)(nil).GetTime), ordinal) } @@ -547,7 +552,7 @@ func (m *MockEntryExt) GetUint16(ordinal int) uint16 { } // GetUint16 indicates an expected call of GetUint16. -func (mr *MockEntryExtMockRecorder) GetUint16(ordinal interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) GetUint16(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUint16", reflect.TypeOf((*MockEntryExt)(nil).GetUint16), ordinal) } @@ -561,7 +566,7 @@ func (m *MockEntryExt) GetUint64(ordinal int) uint64 { } // GetUint64 indicates an expected call of GetUint64. -func (mr *MockEntryExtMockRecorder) GetUint64(ordinal interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) GetUint64(ordinal any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUint64", reflect.TypeOf((*MockEntryExt)(nil).GetUint64), ordinal) } @@ -587,7 +592,7 @@ func (m *MockEntryExt) RangeExtensionAttributes(cb block.ExtensionAttributeCallb } // RangeExtensionAttributes indicates an expected call of RangeExtensionAttributes. -func (mr *MockEntryExtMockRecorder) RangeExtensionAttributes(cb interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) RangeExtensionAttributes(cb any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RangeExtensionAttributes", reflect.TypeOf((*MockEntryExt)(nil).RangeExtensionAttributes), cb) } @@ -599,7 +604,7 @@ func (m *MockEntryExt) RangeOptionalAttributes(cb block.OptionalAttributeCallbac } // RangeOptionalAttributes indicates an expected call of RangeOptionalAttributes. -func (mr *MockEntryExtMockRecorder) RangeOptionalAttributes(cb interface{}) *gomock.Call { +func (mr *MockEntryExtMockRecorder) RangeOptionalAttributes(cb any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RangeOptionalAttributes", reflect.TypeOf((*MockEntryExt)(nil).RangeOptionalAttributes), cb) } diff --git a/server/store/block/testing/mock_fragment.go b/server/store/block/testing/mock_fragment.go index 39592345a..8ca5c24e6 100644 --- a/server/store/block/testing/mock_fragment.go +++ b/server/store/block/testing/mock_fragment.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: fragment.go +// +// Generated by this command: +// +// mockgen -source=fragment.go -destination=testing/mock_fragment.go -package=testing +// // Package testing is a generated GoMock package. package testing @@ -7,7 +12,7 @@ package testing import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockFragment is a mock of Fragment interface. diff --git a/server/store/raft/storage/mock_snapshot_storage.go b/server/store/raft/storage/mock_snapshot_storage.go index 6262cf78f..2ed191784 100644 --- a/server/store/raft/storage/mock_snapshot_storage.go +++ b/server/store/raft/storage/mock_snapshot_storage.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: snapshot_storage.go +// +// Generated by this command: +// +// mockgen -source=snapshot_storage.go -destination=mock_snapshot_storage.go -package=storage +// // Package storage is a generated GoMock package. package storage @@ -7,7 +12,7 @@ package storage import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockSnapshotOperator is a mock of SnapshotOperator interface. @@ -42,7 +47,7 @@ func (m *MockSnapshotOperator) ApplySnapshot(data []byte) error { } // ApplySnapshot indicates an expected call of ApplySnapshot. -func (mr *MockSnapshotOperatorMockRecorder) ApplySnapshot(data interface{}) *gomock.Call { +func (mr *MockSnapshotOperatorMockRecorder) ApplySnapshot(data any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplySnapshot", reflect.TypeOf((*MockSnapshotOperator)(nil).ApplySnapshot), data) } @@ -57,7 +62,7 @@ func (m *MockSnapshotOperator) GetSnapshot(index uint64) ([]byte, error) { } // GetSnapshot indicates an expected call of GetSnapshot. -func (mr *MockSnapshotOperatorMockRecorder) GetSnapshot(index interface{}) *gomock.Call { +func (mr *MockSnapshotOperatorMockRecorder) GetSnapshot(index any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSnapshot", reflect.TypeOf((*MockSnapshotOperator)(nil).GetSnapshot), index) } diff --git a/server/store/raft/storage/snapshot_storage.go b/server/store/raft/storage/snapshot_storage.go index 0588d9031..05dca2062 100644 --- a/server/store/raft/storage/snapshot_storage.go +++ b/server/store/raft/storage/snapshot_storage.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate mockgen -source=snapshot_storage.go -destination=mock_snapshot_storage.go -package=log +//go:generate mockgen -source=snapshot_storage.go -destination=mock_snapshot_storage.go -package=storage package storage import ( diff --git a/server/store/raft/storage/snapshot_storage_test.go b/server/store/raft/storage/snapshot_storage_test.go index fd2984a00..91900b893 100644 --- a/server/store/raft/storage/snapshot_storage_test.go +++ b/server/store/raft/storage/snapshot_storage_test.go @@ -20,8 +20,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // first-party libraries. "github.com/vanus-labs/vanus/pkg/raft/raftpb" diff --git a/server/store/schema/ce/convert/protobuf_test.go b/server/store/schema/ce/convert/protobuf_test.go index 2317ba5cb..ab98ae362 100644 --- a/server/store/schema/ce/convert/protobuf_test.go +++ b/server/store/schema/ce/convert/protobuf_test.go @@ -19,8 +19,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. cetest "github.com/vanus-labs/vanus/server/store/schema/ce/testing" diff --git a/server/store/schema/ce/field_test.go b/server/store/schema/ce/field_test.go index 20a2561ba..e59274aa6 100644 --- a/server/store/schema/ce/field_test.go +++ b/server/store/schema/ce/field_test.go @@ -20,8 +20,8 @@ import ( "time" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. blktest "github.com/vanus-labs/vanus/server/store/block/testing" diff --git a/server/store/schema/ce/testing/entry.go b/server/store/schema/ce/testing/entry.go index 701ae0da5..85b85ef03 100644 --- a/server/store/schema/ce/testing/entry.go +++ b/server/store/schema/ce/testing/entry.go @@ -19,8 +19,8 @@ import ( "time" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. "github.com/vanus-labs/vanus/server/store/block" diff --git a/server/store/segment/api_test.go b/server/store/segment/api_test.go index ead3aeafe..43280351a 100644 --- a/server/store/segment/api_test.go +++ b/server/store/segment/api_test.go @@ -20,8 +20,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" "google.golang.org/protobuf/types/known/emptypb" // first-party libraries. diff --git a/server/store/segment/mock_polling.go b/server/store/segment/mock_polling.go index 5ee131dca..ef386d31b 100644 --- a/server/store/segment/mock_polling.go +++ b/server/store/segment/mock_polling.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: polling.go +// +// Generated by this command: +// +// mockgen -source=polling.go -destination=mock_polling.go -package=segment +// // Package segment is a generated GoMock package. package segment @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" + gomock "go.uber.org/mock/gomock" ) // MockpollingManager is a mock of pollingManager interface. @@ -44,7 +49,7 @@ func (m *MockpollingManager) Add(ctx context.Context, blockID vsr.ID) <-chan str } // Add indicates an expected call of Add. -func (mr *MockpollingManagerMockRecorder) Add(ctx, blockID interface{}) *gomock.Call { +func (mr *MockpollingManagerMockRecorder) Add(ctx, blockID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockpollingManager)(nil).Add), ctx, blockID) } @@ -68,7 +73,7 @@ func (m *MockpollingManager) NewMessageArrived(blockID vsr.ID) { } // NewMessageArrived indicates an expected call of NewMessageArrived. -func (mr *MockpollingManagerMockRecorder) NewMessageArrived(blockID interface{}) *gomock.Call { +func (mr *MockpollingManagerMockRecorder) NewMessageArrived(blockID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewMessageArrived", reflect.TypeOf((*MockpollingManager)(nil).NewMessageArrived), blockID) } diff --git a/server/store/segment/mock_replica.go b/server/store/segment/mock_replica.go index 396fb99cc..e7a5d7515 100644 --- a/server/store/segment/mock_replica.go +++ b/server/store/segment/mock_replica.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: replica.go +// +// Generated by this command: +// +// mockgen -source=replica.go -destination=mock_replica.go -package=segment +// // Package segment is a generated GoMock package. package segment @@ -8,11 +13,11 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" meta "github.com/vanus-labs/vanus/api/meta" vsr "github.com/vanus-labs/vanus/api/vsr" block "github.com/vanus-labs/vanus/server/store/block" block0 "github.com/vanus-labs/vanus/server/store/raft/block" + gomock "go.uber.org/mock/gomock" ) // MockReplica is a mock of Replica interface. @@ -45,7 +50,7 @@ func (m *MockReplica) Append(ctx context.Context, entries []block.Entry, cb bloc } // Append indicates an expected call of Append. -func (mr *MockReplicaMockRecorder) Append(ctx, entries, cb interface{}) *gomock.Call { +func (mr *MockReplicaMockRecorder) Append(ctx, entries, cb any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Append", reflect.TypeOf((*MockReplica)(nil).Append), ctx, entries, cb) } @@ -59,7 +64,7 @@ func (m *MockReplica) Bootstrap(ctx context.Context, blocks []block0.Peer) error } // Bootstrap indicates an expected call of Bootstrap. -func (mr *MockReplicaMockRecorder) Bootstrap(ctx, blocks interface{}) *gomock.Call { +func (mr *MockReplicaMockRecorder) Bootstrap(ctx, blocks any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Bootstrap", reflect.TypeOf((*MockReplica)(nil).Bootstrap), ctx, blocks) } @@ -73,7 +78,7 @@ func (m *MockReplica) Close(ctx context.Context) error { } // Close indicates an expected call of Close. -func (mr *MockReplicaMockRecorder) Close(ctx interface{}) *gomock.Call { +func (mr *MockReplicaMockRecorder) Close(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockReplica)(nil).Close), ctx) } @@ -87,7 +92,7 @@ func (m *MockReplica) Delete(ctx context.Context) error { } // Delete indicates an expected call of Delete. -func (mr *MockReplicaMockRecorder) Delete(ctx interface{}) *gomock.Call { +func (mr *MockReplicaMockRecorder) Delete(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockReplica)(nil).Delete), ctx) } @@ -130,7 +135,7 @@ func (m *MockReplica) Read(ctx context.Context, seq int64, num int) ([]block.Ent } // Read indicates an expected call of Read. -func (mr *MockReplicaMockRecorder) Read(ctx, seq, num interface{}) *gomock.Call { +func (mr *MockReplicaMockRecorder) Read(ctx, seq, num any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockReplica)(nil).Read), ctx, seq, num) } @@ -145,7 +150,7 @@ func (m *MockReplica) Seek(ctx context.Context, index int64, key block.Entry, fl } // Seek indicates an expected call of Seek. -func (mr *MockReplicaMockRecorder) Seek(ctx, index, key, flag interface{}) *gomock.Call { +func (mr *MockReplicaMockRecorder) Seek(ctx, index, key, flag any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Seek", reflect.TypeOf((*MockReplica)(nil).Seek), ctx, index, key, flag) } diff --git a/server/store/segment/mock_server.go b/server/store/segment/mock_server.go index 9856bde92..c785fca6a 100644 --- a/server/store/segment/mock_server.go +++ b/server/store/segment/mock_server.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: server.go +// +// Generated by this command: +// +// mockgen -source=server.go -destination=mock_server.go -package=segment +// // Package segment is a generated GoMock package. package segment @@ -9,11 +14,11 @@ import ( net "net" reflect "reflect" - gomock "github.com/golang/mock/gomock" cloudevents "github.com/vanus-labs/vanus/api/cloudevents" meta "github.com/vanus-labs/vanus/api/meta" vsr "github.com/vanus-labs/vanus/api/vsr" pkg "github.com/vanus-labs/vanus/pkg" + gomock "go.uber.org/mock/gomock" ) // MockServer is a mock of Server interface. @@ -48,7 +53,7 @@ func (m *MockServer) ActivateSegment(ctx context.Context, logID, segID vsr.ID, r } // ActivateSegment indicates an expected call of ActivateSegment. -func (mr *MockServerMockRecorder) ActivateSegment(ctx, logID, segID, replicas interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) ActivateSegment(ctx, logID, segID, replicas any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ActivateSegment", reflect.TypeOf((*MockServer)(nil).ActivateSegment), ctx, logID, segID, replicas) } @@ -63,7 +68,7 @@ func (m *MockServer) AppendToBlock(ctx context.Context, id vsr.ID, events []*clo } // AppendToBlock indicates an expected call of AppendToBlock. -func (mr *MockServerMockRecorder) AppendToBlock(ctx, id, events interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) AppendToBlock(ctx, id, events any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AppendToBlock", reflect.TypeOf((*MockServer)(nil).AppendToBlock), ctx, id, events) } @@ -77,7 +82,7 @@ func (m *MockServer) CreateBlock(ctx context.Context, id vsr.ID, size int64) err } // CreateBlock indicates an expected call of CreateBlock. -func (mr *MockServerMockRecorder) CreateBlock(ctx, id, size interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) CreateBlock(ctx, id, size any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBlock", reflect.TypeOf((*MockServer)(nil).CreateBlock), ctx, id, size) } @@ -92,7 +97,7 @@ func (m *MockServer) DescribeBlock(ctx context.Context, id vsr.ID) (*meta.Segmen } // DescribeBlock indicates an expected call of DescribeBlock. -func (mr *MockServerMockRecorder) DescribeBlock(ctx, id interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) DescribeBlock(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DescribeBlock", reflect.TypeOf((*MockServer)(nil).DescribeBlock), ctx, id) } @@ -106,7 +111,7 @@ func (m *MockServer) InactivateSegment(ctx context.Context) error { } // InactivateSegment indicates an expected call of InactivateSegment. -func (mr *MockServerMockRecorder) InactivateSegment(ctx interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) InactivateSegment(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InactivateSegment", reflect.TypeOf((*MockServer)(nil).InactivateSegment), ctx) } @@ -120,7 +125,7 @@ func (m *MockServer) Initialize(arg0 context.Context) error { } // Initialize indicates an expected call of Initialize. -func (mr *MockServerMockRecorder) Initialize(arg0 interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) Initialize(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Initialize", reflect.TypeOf((*MockServer)(nil).Initialize), arg0) } @@ -135,7 +140,7 @@ func (m *MockServer) LookupOffsetInBlock(ctx context.Context, id vsr.ID, stime i } // LookupOffsetInBlock indicates an expected call of LookupOffsetInBlock. -func (mr *MockServerMockRecorder) LookupOffsetInBlock(ctx, id, stime interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) LookupOffsetInBlock(ctx, id, stime any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LookupOffsetInBlock", reflect.TypeOf((*MockServer)(nil).LookupOffsetInBlock), ctx, id, stime) } @@ -150,7 +155,7 @@ func (m *MockServer) ReadFromBlock(ctx context.Context, id vsr.ID, seq int64, nu } // ReadFromBlock indicates an expected call of ReadFromBlock. -func (mr *MockServerMockRecorder) ReadFromBlock(ctx, id, seq, num, pollingTimeout interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) ReadFromBlock(ctx, id, seq, num, pollingTimeout any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadFromBlock", reflect.TypeOf((*MockServer)(nil).ReadFromBlock), ctx, id, seq, num, pollingTimeout) } @@ -164,7 +169,7 @@ func (m *MockServer) RegisterToController(ctx context.Context) error { } // RegisterToController indicates an expected call of RegisterToController. -func (mr *MockServerMockRecorder) RegisterToController(ctx interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) RegisterToController(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterToController", reflect.TypeOf((*MockServer)(nil).RegisterToController), ctx) } @@ -178,7 +183,7 @@ func (m *MockServer) RemoveBlock(ctx context.Context, id vsr.ID) error { } // RemoveBlock indicates an expected call of RemoveBlock. -func (mr *MockServerMockRecorder) RemoveBlock(ctx, id interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) RemoveBlock(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveBlock", reflect.TypeOf((*MockServer)(nil).RemoveBlock), ctx, id) } @@ -192,7 +197,7 @@ func (m *MockServer) Serve(lis net.Listener) error { } // Serve indicates an expected call of Serve. -func (mr *MockServerMockRecorder) Serve(lis interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) Serve(lis any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Serve", reflect.TypeOf((*MockServer)(nil).Serve), lis) } @@ -206,7 +211,7 @@ func (m *MockServer) Start(ctx context.Context) error { } // Start indicates an expected call of Start. -func (mr *MockServerMockRecorder) Start(ctx interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) Start(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockServer)(nil).Start), ctx) } @@ -234,7 +239,7 @@ func (m *MockServer) Stop(ctx context.Context) error { } // Stop indicates an expected call of Stop. -func (mr *MockServerMockRecorder) Stop(ctx interface{}) *gomock.Call { +func (mr *MockServerMockRecorder) Stop(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockServer)(nil).Stop), ctx) } diff --git a/server/store/segment/server_init_test.go b/server/store/segment/server_init_test.go index 1600e5c84..77ededd4e 100644 --- a/server/store/segment/server_init_test.go +++ b/server/store/segment/server_init_test.go @@ -20,8 +20,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. "github.com/vanus-labs/vanus/server/store/block/raw" diff --git a/server/store/segment/server_test.go b/server/store/segment/server_test.go index a6373ee72..00b862db6 100644 --- a/server/store/segment/server_test.go +++ b/server/store/segment/server_test.go @@ -22,8 +22,8 @@ import ( "time" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // first-party libraries. "github.com/vanus-labs/vanus/api/errors" diff --git a/server/store/vsb/block_append_test.go b/server/store/vsb/block_append_test.go index 993bec4a7..dca037a83 100644 --- a/server/store/vsb/block_append_test.go +++ b/server/store/vsb/block_append_test.go @@ -21,8 +21,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. "github.com/vanus-labs/vanus/server/store/block" diff --git a/server/store/vsb/block_open_test.go b/server/store/vsb/block_open_test.go index eb4dd9bfd..b76942185 100644 --- a/server/store/vsb/block_open_test.go +++ b/server/store/vsb/block_open_test.go @@ -21,8 +21,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. idxtest "github.com/vanus-labs/vanus/server/store/vsb/index/testing" diff --git a/server/store/vsb/block_read_test.go b/server/store/vsb/block_read_test.go index 79c779925..c0f044c9d 100644 --- a/server/store/vsb/block_read_test.go +++ b/server/store/vsb/block_read_test.go @@ -21,8 +21,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. "github.com/vanus-labs/vanus/server/store/block" diff --git a/server/store/vsb/codec/codec_test.go b/server/store/vsb/codec/codec_test.go index b227cb123..bd9871f13 100644 --- a/server/store/vsb/codec/codec_test.go +++ b/server/store/vsb/codec/codec_test.go @@ -19,8 +19,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. cetest "github.com/vanus-labs/vanus/server/store/schema/ce/testing" diff --git a/server/store/vsb/fragment_test.go b/server/store/vsb/fragment_test.go index c981e9a1d..480c5087f 100644 --- a/server/store/vsb/fragment_test.go +++ b/server/store/vsb/fragment_test.go @@ -21,8 +21,8 @@ import ( "time" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // first-party libraries. cepb "github.com/vanus-labs/vanus/api/cloudevents" diff --git a/server/store/vsb/index/entry_test.go b/server/store/vsb/index/entry_test.go index 595917ebd..506470633 100644 --- a/server/store/vsb/index/entry_test.go +++ b/server/store/vsb/index/entry_test.go @@ -19,8 +19,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. ceschema "github.com/vanus-labs/vanus/server/store/schema/ce" diff --git a/server/store/vsb/index/index_test.go b/server/store/vsb/index/index_test.go index 6b188d3f1..1f34f0925 100644 --- a/server/store/vsb/index/index_test.go +++ b/server/store/vsb/index/index_test.go @@ -19,8 +19,8 @@ import ( "testing" // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. cetest "github.com/vanus-labs/vanus/server/store/schema/ce/testing" diff --git a/server/store/vsb/index/testing/entry.go b/server/store/vsb/index/testing/entry.go index 6f30e85a6..871b3850e 100644 --- a/server/store/vsb/index/testing/entry.go +++ b/server/store/vsb/index/testing/entry.go @@ -16,8 +16,8 @@ package testing import ( // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. "github.com/vanus-labs/vanus/server/store/block" diff --git a/server/store/vsb/index/testing/index.go b/server/store/vsb/index/testing/index.go index 0e67a9894..badf99716 100644 --- a/server/store/vsb/index/testing/index.go +++ b/server/store/vsb/index/testing/index.go @@ -16,8 +16,8 @@ package testing import ( // third-party libraries. - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" // this project. cetest "github.com/vanus-labs/vanus/server/store/schema/ce/testing" diff --git a/server/store/vsb/index/testing/mock_index.go b/server/store/vsb/index/testing/mock_index.go index a6fb3ffa8..9c34116e8 100644 --- a/server/store/vsb/index/testing/mock_index.go +++ b/server/store/vsb/index/testing/mock_index.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: index.go +// +// Generated by this command: +// +// mockgen -source=index.go -destination=testing/mock_index.go -package=testing +// // Package testing is a generated GoMock package. package testing @@ -7,7 +12,7 @@ package testing import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockIndex is a mock of Index interface. diff --git a/server/timer/leaderelection/leaderelection_test.go b/server/timer/leaderelection/leaderelection_test.go index d4b3e59ea..b39cec02c 100644 --- a/server/timer/leaderelection/leaderelection_test.go +++ b/server/timer/leaderelection/leaderelection_test.go @@ -19,10 +19,10 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" . "github.com/prashantv/gostub" . "github.com/smartystreets/goconvey/convey" "go.etcd.io/etcd/client/v3/concurrency" + "go.uber.org/mock/gomock" ) func TestLeaderElection_NewLeaderElection(t *testing.T) { diff --git a/server/timer/leaderelection/mock_leaderelection.go b/server/timer/leaderelection/mock_leaderelection.go index cc59f1c2b..ac1579306 100644 --- a/server/timer/leaderelection/mock_leaderelection.go +++ b/server/timer/leaderelection/mock_leaderelection.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: leaderelection.go +// +// Generated by this command: +// +// mockgen -source=leaderelection.go -destination=mock_leaderelection.go -package=leaderelection +// // Package leaderelection is a generated GoMock package. package leaderelection @@ -8,7 +13,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockManager is a mock of Manager interface. @@ -43,7 +48,7 @@ func (m *MockManager) Start(ctx context.Context, callbacks LeaderCallbacks) erro } // Start indicates an expected call of Start. -func (mr *MockManagerMockRecorder) Start(ctx, callbacks interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Start(ctx, callbacks any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockManager)(nil).Start), ctx, callbacks) } @@ -57,7 +62,7 @@ func (m *MockManager) Stop(ctx context.Context) error { } // Stop indicates an expected call of Stop. -func (mr *MockManagerMockRecorder) Stop(ctx interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Stop(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockManager)(nil).Stop), ctx) } @@ -94,7 +99,7 @@ func (m *MockMutex) TryLock(ctx context.Context) error { } // TryLock indicates an expected call of TryLock. -func (mr *MockMutexMockRecorder) TryLock(ctx interface{}) *gomock.Call { +func (mr *MockMutexMockRecorder) TryLock(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TryLock", reflect.TypeOf((*MockMutex)(nil).TryLock), ctx) } @@ -108,7 +113,7 @@ func (m *MockMutex) Unlock(ctx context.Context) error { } // Unlock indicates an expected call of Unlock. -func (mr *MockMutexMockRecorder) Unlock(ctx interface{}) *gomock.Call { +func (mr *MockMutexMockRecorder) Unlock(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unlock", reflect.TypeOf((*MockMutex)(nil).Unlock), ctx) } diff --git a/server/timer/timingwheel/bucket_test.go b/server/timer/timingwheel/bucket_test.go index 396f79cfe..50233a513 100644 --- a/server/timer/timingwheel/bucket_test.go +++ b/server/timer/timingwheel/bucket_test.go @@ -21,8 +21,8 @@ import ( "time" ce "github.com/cloudevents/sdk-go/v2" - . "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/cloudevents" "github.com/vanus-labs/vanus/api/cluster" diff --git a/server/timer/timingwheel/timingwheel_test.go b/server/timer/timingwheel/timingwheel_test.go index 16dff83da..ad270e659 100644 --- a/server/timer/timingwheel/timingwheel_test.go +++ b/server/timer/timingwheel/timingwheel_test.go @@ -24,9 +24,9 @@ import ( "time" ce "github.com/cloudevents/sdk-go/v2" - . "github.com/golang/mock/gomock" . "github.com/prashantv/gostub" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/cluster" ctrlpb "github.com/vanus-labs/vanus/api/controller" diff --git a/server/trigger/client/mock_interface.go b/server/trigger/client/mock_interface.go index a70bb1c47..cdd9d7133 100644 --- a/server/trigger/client/mock_interface.go +++ b/server/trigger/client/mock_interface.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interface.go +// +// Generated by this command: +// +// mockgen -source=interface.go -destination=mock_interface.go -package=client +// // Package client is a generated GoMock package. package client @@ -9,7 +14,7 @@ import ( reflect "reflect" v2 "github.com/cloudevents/sdk-go/v2" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockSender is a mock of Sender interface. @@ -38,7 +43,7 @@ func (m *MockSender) EXPECT() *MockSenderMockRecorder { // Send mocks base method. func (m *MockSender) Send(ctx context.Context, events ...*v2.Event) Result { m.ctrl.T.Helper() - varargs := []interface{}{ctx} + varargs := []any{ctx} for _, a := range events { varargs = append(varargs, a) } @@ -48,9 +53,9 @@ func (m *MockSender) Send(ctx context.Context, events ...*v2.Event) Result { } // Send indicates an expected call of Send. -func (mr *MockSenderMockRecorder) Send(ctx interface{}, events ...interface{}) *gomock.Call { +func (mr *MockSenderMockRecorder) Send(ctx any, events ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx}, events...) + varargs := append([]any{ctx}, events...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Send", reflect.TypeOf((*MockSender)(nil).Send), varargs...) } @@ -80,7 +85,7 @@ func (m *MockEventClient) EXPECT() *MockEventClientMockRecorder { // Send mocks base method. func (m *MockEventClient) Send(ctx context.Context, events ...*v2.Event) Result { m.ctrl.T.Helper() - varargs := []interface{}{ctx} + varargs := []any{ctx} for _, a := range events { varargs = append(varargs, a) } @@ -90,8 +95,8 @@ func (m *MockEventClient) Send(ctx context.Context, events ...*v2.Event) Result } // Send indicates an expected call of Send. -func (mr *MockEventClientMockRecorder) Send(ctx interface{}, events ...interface{}) *gomock.Call { +func (mr *MockEventClientMockRecorder) Send(ctx any, events ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx}, events...) + varargs := append([]any{ctx}, events...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Send", reflect.TypeOf((*MockEventClient)(nil).Send), varargs...) } diff --git a/server/trigger/mock_worker.go b/server/trigger/mock_worker.go index 1aa62e04e..94f1ed1ac 100644 --- a/server/trigger/mock_worker.go +++ b/server/trigger/mock_worker.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: worker.go +// +// Generated by this command: +// +// mockgen -source=worker.go -destination=mock_worker.go -package=trigger +// // Package trigger is a generated GoMock package. package trigger @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" vsr "github.com/vanus-labs/vanus/api/vsr" pkg "github.com/vanus-labs/vanus/pkg" + gomock "go.uber.org/mock/gomock" ) // MockWorker is a mock of Worker interface. @@ -45,7 +50,7 @@ func (m *MockWorker) AddSubscription(ctx context.Context, subscription *pkg.Subs } // AddSubscription indicates an expected call of AddSubscription. -func (mr *MockWorkerMockRecorder) AddSubscription(ctx, subscription interface{}) *gomock.Call { +func (mr *MockWorkerMockRecorder) AddSubscription(ctx, subscription any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddSubscription", reflect.TypeOf((*MockWorker)(nil).AddSubscription), ctx, subscription) } @@ -59,7 +64,7 @@ func (m *MockWorker) Init(ctx context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockWorkerMockRecorder) Init(ctx interface{}) *gomock.Call { +func (mr *MockWorkerMockRecorder) Init(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockWorker)(nil).Init), ctx) } @@ -73,7 +78,7 @@ func (m *MockWorker) PauseSubscription(ctx context.Context, id vsr.ID) error { } // PauseSubscription indicates an expected call of PauseSubscription. -func (mr *MockWorkerMockRecorder) PauseSubscription(ctx, id interface{}) *gomock.Call { +func (mr *MockWorkerMockRecorder) PauseSubscription(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PauseSubscription", reflect.TypeOf((*MockWorker)(nil).PauseSubscription), ctx, id) } @@ -87,7 +92,7 @@ func (m *MockWorker) Register(ctx context.Context) error { } // Register indicates an expected call of Register. -func (mr *MockWorkerMockRecorder) Register(ctx interface{}) *gomock.Call { +func (mr *MockWorkerMockRecorder) Register(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Register", reflect.TypeOf((*MockWorker)(nil).Register), ctx) } @@ -101,7 +106,7 @@ func (m *MockWorker) RemoveSubscription(ctx context.Context, id vsr.ID) error { } // RemoveSubscription indicates an expected call of RemoveSubscription. -func (mr *MockWorkerMockRecorder) RemoveSubscription(ctx, id interface{}) *gomock.Call { +func (mr *MockWorkerMockRecorder) RemoveSubscription(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveSubscription", reflect.TypeOf((*MockWorker)(nil).RemoveSubscription), ctx, id) } @@ -115,7 +120,7 @@ func (m *MockWorker) Start(ctx context.Context) error { } // Start indicates an expected call of Start. -func (mr *MockWorkerMockRecorder) Start(ctx interface{}) *gomock.Call { +func (mr *MockWorkerMockRecorder) Start(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockWorker)(nil).Start), ctx) } @@ -129,7 +134,7 @@ func (m *MockWorker) StartSubscription(ctx context.Context, id vsr.ID) error { } // StartSubscription indicates an expected call of StartSubscription. -func (mr *MockWorkerMockRecorder) StartSubscription(ctx, id interface{}) *gomock.Call { +func (mr *MockWorkerMockRecorder) StartSubscription(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartSubscription", reflect.TypeOf((*MockWorker)(nil).StartSubscription), ctx, id) } @@ -143,7 +148,7 @@ func (m *MockWorker) Stop(ctx context.Context) error { } // Stop indicates an expected call of Stop. -func (mr *MockWorkerMockRecorder) Stop(ctx interface{}) *gomock.Call { +func (mr *MockWorkerMockRecorder) Stop(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockWorker)(nil).Stop), ctx) } @@ -157,7 +162,7 @@ func (m *MockWorker) Unregister(ctx context.Context) error { } // Unregister indicates an expected call of Unregister. -func (mr *MockWorkerMockRecorder) Unregister(ctx interface{}) *gomock.Call { +func (mr *MockWorkerMockRecorder) Unregister(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unregister", reflect.TypeOf((*MockWorker)(nil).Unregister), ctx) } diff --git a/server/trigger/reader/mock_reader.go b/server/trigger/reader/mock_reader.go index dcc137588..620a010ac 100644 --- a/server/trigger/reader/mock_reader.go +++ b/server/trigger/reader/mock_reader.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: reader.go +// +// Generated by this command: +// +// mockgen -source=reader.go -destination=mock_reader.go -package=reader +// // Package reader is a generated GoMock package. package reader @@ -7,7 +12,7 @@ package reader import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockReader is a mock of Reader interface. diff --git a/server/trigger/reader/reader_test.go b/server/trigger/reader/reader_test.go index c902ee99d..2f9cbea38 100644 --- a/server/trigger/reader/reader_test.go +++ b/server/trigger/reader/reader_test.go @@ -22,9 +22,9 @@ import ( "time" ce "github.com/cloudevents/sdk-go/v2" - . "github.com/golang/mock/gomock" "github.com/google/uuid" . "github.com/smartystreets/goconvey/convey" + . "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/cloudevents" "github.com/vanus-labs/vanus/client" diff --git a/server/trigger/server_test.go b/server/trigger/server_test.go index 79cd8b541..3ae44a775 100644 --- a/server/trigger/server_test.go +++ b/server/trigger/server_test.go @@ -19,8 +19,8 @@ import ( "fmt" "testing" - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" pbtrigger "github.com/vanus-labs/vanus/api/trigger" diff --git a/server/trigger/trigger/mock_trigger.go b/server/trigger/trigger/mock_trigger.go index 76e140738..2a23eae45 100644 --- a/server/trigger/trigger/mock_trigger.go +++ b/server/trigger/trigger/mock_trigger.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: trigger.go +// +// Generated by this command: +// +// mockgen -source=trigger.go -destination=mock_trigger.go -package=trigger +// // Package trigger is a generated GoMock package. package trigger @@ -8,9 +13,9 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" - primitive "github.com/vanus-labs/vanus/pkg" + pkg "github.com/vanus-labs/vanus/pkg" info "github.com/vanus-labs/vanus/pkg/info" + gomock "go.uber.org/mock/gomock" ) // MockTrigger is a mock of Trigger interface. @@ -37,7 +42,7 @@ func (m *MockTrigger) EXPECT() *MockTriggerMockRecorder { } // Change mocks base method. -func (m *MockTrigger) Change(ctx context.Context, subscription *primitive.Subscription) error { +func (m *MockTrigger) Change(ctx context.Context, subscription *pkg.Subscription) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Change", ctx, subscription) ret0, _ := ret[0].(error) @@ -45,7 +50,7 @@ func (m *MockTrigger) Change(ctx context.Context, subscription *primitive.Subscr } // Change indicates an expected call of Change. -func (mr *MockTriggerMockRecorder) Change(ctx, subscription interface{}) *gomock.Call { +func (mr *MockTriggerMockRecorder) Change(ctx, subscription any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Change", reflect.TypeOf((*MockTrigger)(nil).Change), ctx, subscription) } @@ -59,7 +64,7 @@ func (m *MockTrigger) GetOffsets(ctx context.Context) info.ListOffsetInfo { } // GetOffsets indicates an expected call of GetOffsets. -func (mr *MockTriggerMockRecorder) GetOffsets(ctx interface{}) *gomock.Call { +func (mr *MockTriggerMockRecorder) GetOffsets(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOffsets", reflect.TypeOf((*MockTrigger)(nil).GetOffsets), ctx) } @@ -73,7 +78,7 @@ func (m *MockTrigger) Init(ctx context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockTriggerMockRecorder) Init(ctx interface{}) *gomock.Call { +func (mr *MockTriggerMockRecorder) Init(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockTrigger)(nil).Init), ctx) } @@ -87,7 +92,7 @@ func (m *MockTrigger) Start(ctx context.Context) error { } // Start indicates an expected call of Start. -func (mr *MockTriggerMockRecorder) Start(ctx interface{}) *gomock.Call { +func (mr *MockTriggerMockRecorder) Start(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockTrigger)(nil).Start), ctx) } @@ -101,7 +106,7 @@ func (m *MockTrigger) Stop(ctx context.Context) error { } // Stop indicates an expected call of Stop. -func (mr *MockTriggerMockRecorder) Stop(ctx interface{}) *gomock.Call { +func (mr *MockTriggerMockRecorder) Stop(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockTrigger)(nil).Stop), ctx) } diff --git a/server/trigger/trigger/trigger_test.go b/server/trigger/trigger/trigger_test.go index 8df17cb19..da6a57349 100644 --- a/server/trigger/trigger/trigger_test.go +++ b/server/trigger/trigger/trigger_test.go @@ -25,9 +25,9 @@ import ( "time" ce "github.com/cloudevents/sdk-go/v2" - "github.com/golang/mock/gomock" "github.com/google/uuid" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" "github.com/vanus-labs/vanus/api/cloudevents" vanus "github.com/vanus-labs/vanus/api/vsr" diff --git a/server/trigger/worker_test.go b/server/trigger/worker_test.go index f42ae7fc7..517a7d85d 100644 --- a/server/trigger/worker_test.go +++ b/server/trigger/worker_test.go @@ -21,8 +21,8 @@ import ( "testing" // third-party libraries. - "github.com/golang/mock/gomock" . "github.com/smartystreets/goconvey/convey" + "go.uber.org/mock/gomock" // first-party libraries. "github.com/vanus-labs/vanus/api/controller"