From fab2181be4be6064fc560950f8eef8c61ff08ccb Mon Sep 17 00:00:00 2001 From: Caleb Doxsey Date: Tue, 16 Apr 2024 12:23:00 -0600 Subject: [PATCH] core/mock: switch to uber mock (#5073) * core/mock: switch to uber mock * merge main --- Makefile | 6 - authenticate/handlers_test.go | 2 +- go.mod | 2 +- go.sum | 11 +- internal/authenticateflow/stateful_test.go | 2 +- internal/identity/manager/manager_test.go | 2 +- pkg/grpc/databroker/databroker.go | 4 +- pkg/grpc/databroker/leaser_test.go | 2 +- .../mock_databroker/databroker.pb.go | 127 +++++++++--------- pkg/grpc/databroker/mock_databroker/leaser.go | 9 +- pkg/grpc/session/session_test.go | 2 +- pkg/health/deduplicate_test.go | 4 +- pkg/health/provider_mock_test.go | 19 ++- pkg/zero/connect/connect.pb.go | 2 +- 14 files changed, 98 insertions(+), 96 deletions(-) diff --git a/Makefile b/Makefile index 1515fa204..9864ee5fd 100644 --- a/Makefile +++ b/Makefile @@ -37,12 +37,6 @@ GORELEASER_VERSION = v0.174.2 .PHONY: all all: clean build-deps test lint build ## Runs a clean, build, fmt, lint, test, and vet. - -.PHONY: generate-mocks -generate-mocks: ## Generate mocks - @echo "==> $@" - @go run github.com/golang/mock/mockgen@v1.6.0 -destination internal/directory/auth0/mock_auth0/mock.go github.com/pomerium/pomerium/internal/directory/auth0 RoleManager - .PHONY: get-envoy get-envoy: ## Fetch envoy binaries @echo "==> $@" diff --git a/authenticate/handlers_test.go b/authenticate/handlers_test.go index e4ad33733..ad5eab915 100644 --- a/authenticate/handlers_test.go +++ b/authenticate/handlers_test.go @@ -13,10 +13,10 @@ import ( "time" "github.com/go-jose/go-jose/v3/jwt" - "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/oauth2" "google.golang.org/grpc" diff --git a/go.mod b/go.mod index ba8db368d..7c286d0ad 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,6 @@ require ( github.com/envoyproxy/protoc-gen-validate v1.0.4 github.com/go-chi/chi/v5 v5.0.12 github.com/go-jose/go-jose/v3 v3.0.3 - github.com/golang/mock v1.6.0 github.com/google/btree v1.1.2 github.com/google/go-cmp v0.6.0 github.com/google/go-jsonnet v0.20.0 @@ -73,6 +72,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.24.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/automaxprocs v1.5.3 + go.uber.org/mock v0.4.0 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.21.0 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa diff --git a/go.sum b/go.sum index a498e7673..e5c6533f9 100644 --- a/go.sum +++ b/go.sum @@ -282,8 +282,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= @@ -697,7 +695,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= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= @@ -747,6 +744,8 @@ go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= @@ -796,7 +795,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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= @@ -836,7 +834,6 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -864,7 +861,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ 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-20201207232520-09787c993a3a/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.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -913,9 +909,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/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-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1003,7 +997,6 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= 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/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= diff --git a/internal/authenticateflow/stateful_test.go b/internal/authenticateflow/stateful_test.go index 8d4aae270..5ab1ead7a 100644 --- a/internal/authenticateflow/stateful_test.go +++ b/internal/authenticateflow/stateful_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "golang.org/x/oauth2" "google.golang.org/grpc" "google.golang.org/protobuf/proto" diff --git a/internal/identity/manager/manager_test.go b/internal/identity/manager/manager_test.go index 1f7d0d14a..9e4704d23 100644 --- a/internal/identity/manager/manager_test.go +++ b/internal/identity/manager/manager_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "golang.org/x/oauth2" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/grpc/databroker/databroker.go b/pkg/grpc/databroker/databroker.go index 214164093..4bb027b37 100644 --- a/pkg/grpc/databroker/databroker.go +++ b/pkg/grpc/databroker/databroker.go @@ -18,8 +18,8 @@ import ( "github.com/pomerium/pomerium/pkg/protoutil" ) -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -source=databroker.pb.go -destination ./mock_databroker/databroker.pb.go DataBrokerServiceClient -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -source=leaser.go -destination ./mock_databroker/leaser.go LeaserHandler +//go:generate go run go.uber.org/mock/mockgen -source=databroker.pb.go -destination ./mock_databroker/databroker.pb.go DataBrokerServiceClient +//go:generate go run go.uber.org/mock/mockgen -source=leaser.go -destination ./mock_databroker/leaser.go LeaserHandler type recordObject interface { proto.Message diff --git a/pkg/grpc/databroker/leaser_test.go b/pkg/grpc/databroker/leaser_test.go index 6261d7c00..7f2ef75ff 100644 --- a/pkg/grpc/databroker/leaser_test.go +++ b/pkg/grpc/databroker/leaser_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/durationpb" diff --git a/pkg/grpc/databroker/mock_databroker/databroker.pb.go b/pkg/grpc/databroker/mock_databroker/databroker.pb.go index 66e184030..6aa1a95b6 100644 --- a/pkg/grpc/databroker/mock_databroker/databroker.pb.go +++ b/pkg/grpc/databroker/mock_databroker/databroker.pb.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: databroker.pb.go +// +// Generated by this command: +// +// mockgen -source=databroker.pb.go -destination ./mock_databroker/databroker.pb.go DataBrokerServiceClient +// // Package mock_databroker is a generated GoMock package. package mock_databroker @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" databroker "github.com/pomerium/pomerium/pkg/grpc/databroker" + 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" @@ -76,7 +81,7 @@ func (m *MockDataBrokerServiceClient) EXPECT() *MockDataBrokerServiceClientMockR // AcquireLease mocks base method. func (m *MockDataBrokerServiceClient) AcquireLease(ctx context.Context, in *databroker.AcquireLeaseRequest, opts ...grpc.CallOption) (*databroker.AcquireLeaseResponse, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -87,16 +92,16 @@ func (m *MockDataBrokerServiceClient) AcquireLease(ctx context.Context, in *data } // AcquireLease indicates an expected call of AcquireLease. -func (mr *MockDataBrokerServiceClientMockRecorder) AcquireLease(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) AcquireLease(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AcquireLease", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).AcquireLease), varargs...) } // Get mocks base method. func (m *MockDataBrokerServiceClient) Get(ctx context.Context, in *databroker.GetRequest, opts ...grpc.CallOption) (*databroker.GetResponse, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -107,16 +112,16 @@ func (m *MockDataBrokerServiceClient) Get(ctx context.Context, in *databroker.Ge } // Get indicates an expected call of Get. -func (mr *MockDataBrokerServiceClientMockRecorder) Get(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) Get(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).Get), varargs...) } // ListTypes mocks base method. func (m *MockDataBrokerServiceClient) ListTypes(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*databroker.ListTypesResponse, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -127,16 +132,16 @@ func (m *MockDataBrokerServiceClient) ListTypes(ctx context.Context, in *emptypb } // ListTypes indicates an expected call of ListTypes. -func (mr *MockDataBrokerServiceClientMockRecorder) ListTypes(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) ListTypes(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListTypes", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).ListTypes), varargs...) } // Patch mocks base method. func (m *MockDataBrokerServiceClient) Patch(ctx context.Context, in *databroker.PatchRequest, opts ...grpc.CallOption) (*databroker.PatchResponse, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -147,16 +152,16 @@ func (m *MockDataBrokerServiceClient) Patch(ctx context.Context, in *databroker. } // Patch indicates an expected call of Patch. -func (mr *MockDataBrokerServiceClientMockRecorder) Patch(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) Patch(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Patch", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).Patch), varargs...) } // Put mocks base method. func (m *MockDataBrokerServiceClient) Put(ctx context.Context, in *databroker.PutRequest, opts ...grpc.CallOption) (*databroker.PutResponse, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -167,16 +172,16 @@ func (m *MockDataBrokerServiceClient) Put(ctx context.Context, in *databroker.Pu } // Put indicates an expected call of Put. -func (mr *MockDataBrokerServiceClientMockRecorder) Put(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) Put(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Put", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).Put), varargs...) } // Query mocks base method. func (m *MockDataBrokerServiceClient) Query(ctx context.Context, in *databroker.QueryRequest, opts ...grpc.CallOption) (*databroker.QueryResponse, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -187,16 +192,16 @@ func (m *MockDataBrokerServiceClient) Query(ctx context.Context, in *databroker. } // Query indicates an expected call of Query. -func (mr *MockDataBrokerServiceClientMockRecorder) Query(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) Query(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).Query), varargs...) } // ReleaseLease mocks base method. func (m *MockDataBrokerServiceClient) ReleaseLease(ctx context.Context, in *databroker.ReleaseLeaseRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -207,16 +212,16 @@ func (m *MockDataBrokerServiceClient) ReleaseLease(ctx context.Context, in *data } // ReleaseLease indicates an expected call of ReleaseLease. -func (mr *MockDataBrokerServiceClientMockRecorder) ReleaseLease(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) ReleaseLease(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReleaseLease", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).ReleaseLease), varargs...) } // RenewLease mocks base method. func (m *MockDataBrokerServiceClient) RenewLease(ctx context.Context, in *databroker.RenewLeaseRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -227,16 +232,16 @@ func (m *MockDataBrokerServiceClient) RenewLease(ctx context.Context, in *databr } // RenewLease indicates an expected call of RenewLease. -func (mr *MockDataBrokerServiceClientMockRecorder) RenewLease(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) RenewLease(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenewLease", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).RenewLease), varargs...) } // SetOptions mocks base method. func (m *MockDataBrokerServiceClient) SetOptions(ctx context.Context, in *databroker.SetOptionsRequest, opts ...grpc.CallOption) (*databroker.SetOptionsResponse, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -247,16 +252,16 @@ func (m *MockDataBrokerServiceClient) SetOptions(ctx context.Context, in *databr } // SetOptions indicates an expected call of SetOptions. -func (mr *MockDataBrokerServiceClientMockRecorder) SetOptions(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) SetOptions(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetOptions", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).SetOptions), varargs...) } // Sync mocks base method. func (m *MockDataBrokerServiceClient) Sync(ctx context.Context, in *databroker.SyncRequest, opts ...grpc.CallOption) (databroker.DataBrokerService_SyncClient, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -267,16 +272,16 @@ func (m *MockDataBrokerServiceClient) Sync(ctx context.Context, in *databroker.S } // Sync indicates an expected call of Sync. -func (mr *MockDataBrokerServiceClientMockRecorder) Sync(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) Sync(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).Sync), varargs...) } // SyncLatest mocks base method. func (m *MockDataBrokerServiceClient) SyncLatest(ctx context.Context, in *databroker.SyncLatestRequest, opts ...grpc.CallOption) (databroker.DataBrokerService_SyncLatestClient, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, in} + varargs := []any{ctx, in} for _, a := range opts { varargs = append(varargs, a) } @@ -287,9 +292,9 @@ func (m *MockDataBrokerServiceClient) SyncLatest(ctx context.Context, in *databr } // SyncLatest indicates an expected call of SyncLatest. -func (mr *MockDataBrokerServiceClientMockRecorder) SyncLatest(ctx, in interface{}, opts ...interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceClientMockRecorder) SyncLatest(ctx, in any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, in}, opts...) + varargs := append([]any{ctx, in}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncLatest", reflect.TypeOf((*MockDataBrokerServiceClient)(nil).SyncLatest), varargs...) } @@ -383,7 +388,7 @@ func (m_2 *MockDataBrokerService_SyncClient) RecvMsg(m any) error { } // RecvMsg indicates an expected call of RecvMsg. -func (mr *MockDataBrokerService_SyncClientMockRecorder) RecvMsg(m interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncClientMockRecorder) RecvMsg(m any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockDataBrokerService_SyncClient)(nil).RecvMsg), m) } @@ -397,7 +402,7 @@ func (m_2 *MockDataBrokerService_SyncClient) SendMsg(m any) error { } // SendMsg indicates an expected call of SendMsg. -func (mr *MockDataBrokerService_SyncClientMockRecorder) SendMsg(m interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncClientMockRecorder) SendMsg(m any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockDataBrokerService_SyncClient)(nil).SendMsg), m) } @@ -506,7 +511,7 @@ func (m_2 *MockDataBrokerService_SyncLatestClient) RecvMsg(m any) error { } // RecvMsg indicates an expected call of RecvMsg. -func (mr *MockDataBrokerService_SyncLatestClientMockRecorder) RecvMsg(m interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncLatestClientMockRecorder) RecvMsg(m any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockDataBrokerService_SyncLatestClient)(nil).RecvMsg), m) } @@ -520,7 +525,7 @@ func (m_2 *MockDataBrokerService_SyncLatestClient) SendMsg(m any) error { } // SendMsg indicates an expected call of SendMsg. -func (mr *MockDataBrokerService_SyncLatestClientMockRecorder) SendMsg(m interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncLatestClientMockRecorder) SendMsg(m any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockDataBrokerService_SyncLatestClient)(nil).SendMsg), m) } @@ -572,7 +577,7 @@ func (m *MockDataBrokerServiceServer) AcquireLease(arg0 context.Context, arg1 *d } // AcquireLease indicates an expected call of AcquireLease. -func (mr *MockDataBrokerServiceServerMockRecorder) AcquireLease(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) AcquireLease(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AcquireLease", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).AcquireLease), arg0, arg1) } @@ -587,7 +592,7 @@ func (m *MockDataBrokerServiceServer) Get(arg0 context.Context, arg1 *databroker } // Get indicates an expected call of Get. -func (mr *MockDataBrokerServiceServerMockRecorder) Get(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) Get(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).Get), arg0, arg1) } @@ -602,7 +607,7 @@ func (m *MockDataBrokerServiceServer) ListTypes(arg0 context.Context, arg1 *empt } // ListTypes indicates an expected call of ListTypes. -func (mr *MockDataBrokerServiceServerMockRecorder) ListTypes(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) ListTypes(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListTypes", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).ListTypes), arg0, arg1) } @@ -617,7 +622,7 @@ func (m *MockDataBrokerServiceServer) Patch(arg0 context.Context, arg1 *databrok } // Patch indicates an expected call of Patch. -func (mr *MockDataBrokerServiceServerMockRecorder) Patch(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) Patch(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Patch", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).Patch), arg0, arg1) } @@ -632,7 +637,7 @@ func (m *MockDataBrokerServiceServer) Put(arg0 context.Context, arg1 *databroker } // Put indicates an expected call of Put. -func (mr *MockDataBrokerServiceServerMockRecorder) Put(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) Put(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Put", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).Put), arg0, arg1) } @@ -647,7 +652,7 @@ func (m *MockDataBrokerServiceServer) Query(arg0 context.Context, arg1 *databrok } // Query indicates an expected call of Query. -func (mr *MockDataBrokerServiceServerMockRecorder) Query(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) Query(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).Query), arg0, arg1) } @@ -662,7 +667,7 @@ func (m *MockDataBrokerServiceServer) ReleaseLease(arg0 context.Context, arg1 *d } // ReleaseLease indicates an expected call of ReleaseLease. -func (mr *MockDataBrokerServiceServerMockRecorder) ReleaseLease(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) ReleaseLease(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReleaseLease", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).ReleaseLease), arg0, arg1) } @@ -677,7 +682,7 @@ func (m *MockDataBrokerServiceServer) RenewLease(arg0 context.Context, arg1 *dat } // RenewLease indicates an expected call of RenewLease. -func (mr *MockDataBrokerServiceServerMockRecorder) RenewLease(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) RenewLease(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenewLease", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).RenewLease), arg0, arg1) } @@ -692,7 +697,7 @@ func (m *MockDataBrokerServiceServer) SetOptions(arg0 context.Context, arg1 *dat } // SetOptions indicates an expected call of SetOptions. -func (mr *MockDataBrokerServiceServerMockRecorder) SetOptions(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) SetOptions(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetOptions", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).SetOptions), arg0, arg1) } @@ -706,7 +711,7 @@ func (m *MockDataBrokerServiceServer) Sync(arg0 *databroker.SyncRequest, arg1 da } // Sync indicates an expected call of Sync. -func (mr *MockDataBrokerServiceServerMockRecorder) Sync(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) Sync(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).Sync), arg0, arg1) } @@ -720,7 +725,7 @@ func (m *MockDataBrokerServiceServer) SyncLatest(arg0 *databroker.SyncLatestRequ } // SyncLatest indicates an expected call of SyncLatest. -func (mr *MockDataBrokerServiceServerMockRecorder) SyncLatest(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDataBrokerServiceServerMockRecorder) SyncLatest(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncLatest", reflect.TypeOf((*MockDataBrokerServiceServer)(nil).SyncLatest), arg0, arg1) } @@ -771,7 +776,7 @@ func (m_2 *MockDataBrokerService_SyncServer) RecvMsg(m any) error { } // RecvMsg indicates an expected call of RecvMsg. -func (mr *MockDataBrokerService_SyncServerMockRecorder) RecvMsg(m interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncServerMockRecorder) RecvMsg(m any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockDataBrokerService_SyncServer)(nil).RecvMsg), m) } @@ -785,7 +790,7 @@ func (m *MockDataBrokerService_SyncServer) Send(arg0 *databroker.SyncResponse) e } // Send indicates an expected call of Send. -func (mr *MockDataBrokerService_SyncServerMockRecorder) Send(arg0 interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncServerMockRecorder) Send(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Send", reflect.TypeOf((*MockDataBrokerService_SyncServer)(nil).Send), arg0) } @@ -799,7 +804,7 @@ func (m *MockDataBrokerService_SyncServer) SendHeader(arg0 metadata.MD) error { } // SendHeader indicates an expected call of SendHeader. -func (mr *MockDataBrokerService_SyncServerMockRecorder) SendHeader(arg0 interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncServerMockRecorder) SendHeader(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendHeader", reflect.TypeOf((*MockDataBrokerService_SyncServer)(nil).SendHeader), arg0) } @@ -813,7 +818,7 @@ func (m_2 *MockDataBrokerService_SyncServer) SendMsg(m any) error { } // SendMsg indicates an expected call of SendMsg. -func (mr *MockDataBrokerService_SyncServerMockRecorder) SendMsg(m interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncServerMockRecorder) SendMsg(m any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockDataBrokerService_SyncServer)(nil).SendMsg), m) } @@ -827,7 +832,7 @@ func (m *MockDataBrokerService_SyncServer) SetHeader(arg0 metadata.MD) error { } // SetHeader indicates an expected call of SetHeader. -func (mr *MockDataBrokerService_SyncServerMockRecorder) SetHeader(arg0 interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncServerMockRecorder) SetHeader(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHeader", reflect.TypeOf((*MockDataBrokerService_SyncServer)(nil).SetHeader), arg0) } @@ -839,7 +844,7 @@ func (m *MockDataBrokerService_SyncServer) SetTrailer(arg0 metadata.MD) { } // SetTrailer indicates an expected call of SetTrailer. -func (mr *MockDataBrokerService_SyncServerMockRecorder) SetTrailer(arg0 interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncServerMockRecorder) SetTrailer(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTrailer", reflect.TypeOf((*MockDataBrokerService_SyncServer)(nil).SetTrailer), arg0) } @@ -890,7 +895,7 @@ func (m_2 *MockDataBrokerService_SyncLatestServer) RecvMsg(m any) error { } // RecvMsg indicates an expected call of RecvMsg. -func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) RecvMsg(m interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) RecvMsg(m any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockDataBrokerService_SyncLatestServer)(nil).RecvMsg), m) } @@ -904,7 +909,7 @@ func (m *MockDataBrokerService_SyncLatestServer) Send(arg0 *databroker.SyncLates } // Send indicates an expected call of Send. -func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) Send(arg0 interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) Send(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Send", reflect.TypeOf((*MockDataBrokerService_SyncLatestServer)(nil).Send), arg0) } @@ -918,7 +923,7 @@ func (m *MockDataBrokerService_SyncLatestServer) SendHeader(arg0 metadata.MD) er } // SendHeader indicates an expected call of SendHeader. -func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) SendHeader(arg0 interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) SendHeader(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendHeader", reflect.TypeOf((*MockDataBrokerService_SyncLatestServer)(nil).SendHeader), arg0) } @@ -932,7 +937,7 @@ func (m_2 *MockDataBrokerService_SyncLatestServer) SendMsg(m any) error { } // SendMsg indicates an expected call of SendMsg. -func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) SendMsg(m interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) SendMsg(m any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockDataBrokerService_SyncLatestServer)(nil).SendMsg), m) } @@ -946,7 +951,7 @@ func (m *MockDataBrokerService_SyncLatestServer) SetHeader(arg0 metadata.MD) err } // SetHeader indicates an expected call of SetHeader. -func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) SetHeader(arg0 interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) SetHeader(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHeader", reflect.TypeOf((*MockDataBrokerService_SyncLatestServer)(nil).SetHeader), arg0) } @@ -958,7 +963,7 @@ func (m *MockDataBrokerService_SyncLatestServer) SetTrailer(arg0 metadata.MD) { } // SetTrailer indicates an expected call of SetTrailer. -func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) SetTrailer(arg0 interface{}) *gomock.Call { +func (mr *MockDataBrokerService_SyncLatestServerMockRecorder) SetTrailer(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTrailer", reflect.TypeOf((*MockDataBrokerService_SyncLatestServer)(nil).SetTrailer), arg0) } diff --git a/pkg/grpc/databroker/mock_databroker/leaser.go b/pkg/grpc/databroker/mock_databroker/leaser.go index cd0cb412c..239f60b7b 100644 --- a/pkg/grpc/databroker/mock_databroker/leaser.go +++ b/pkg/grpc/databroker/mock_databroker/leaser.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: leaser.go +// +// Generated by this command: +// +// mockgen -source=leaser.go -destination ./mock_databroker/leaser.go LeaserHandler +// // Package mock_databroker is a generated GoMock package. package mock_databroker @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" databroker "github.com/pomerium/pomerium/pkg/grpc/databroker" + gomock "go.uber.org/mock/gomock" ) // MockLeaserHandler is a mock of LeaserHandler interface. @@ -58,7 +63,7 @@ func (m *MockLeaserHandler) RunLeased(ctx context.Context) error { } // RunLeased indicates an expected call of RunLeased. -func (mr *MockLeaserHandlerMockRecorder) RunLeased(ctx interface{}) *gomock.Call { +func (mr *MockLeaserHandlerMockRecorder) RunLeased(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RunLeased", reflect.TypeOf((*MockLeaserHandler)(nil).RunLeased), ctx) } diff --git a/pkg/grpc/session/session_test.go b/pkg/grpc/session/session_test.go index 9a91ca6a8..e9e97892c 100644 --- a/pkg/grpc/session/session_test.go +++ b/pkg/grpc/session/session_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/health/deduplicate_test.go b/pkg/health/deduplicate_test.go index cf8864a74..173bf634c 100644 --- a/pkg/health/deduplicate_test.go +++ b/pkg/health/deduplicate_test.go @@ -4,12 +4,12 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" health "github.com/pomerium/pomerium/pkg/health" ) -//go:generate go run github.com/golang/mock/mockgen -package health_test -destination provider_mock_test.go github.com/pomerium/pomerium/pkg/health Provider +//go:generate go run go.uber.org/mock/mockgen -package health_test -destination provider_mock_test.go github.com/pomerium/pomerium/pkg/health Provider func TestDeduplicate(t *testing.T) { t.Parallel() diff --git a/pkg/health/provider_mock_test.go b/pkg/health/provider_mock_test.go index 1ab30622f..fc311176d 100644 --- a/pkg/health/provider_mock_test.go +++ b/pkg/health/provider_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/pomerium/pomerium/pkg/health (interfaces: Provider) +// +// Generated by this command: +// +// mockgen -package health_test -destination provider_mock_test.go github.com/pomerium/pomerium/pkg/health Provider +// // Package health_test is a generated GoMock package. package health_test @@ -7,8 +12,8 @@ package health_test import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" health "github.com/pomerium/pomerium/pkg/health" + gomock "go.uber.org/mock/gomock" ) // MockProvider is a mock of Provider interface. @@ -37,7 +42,7 @@ func (m *MockProvider) EXPECT() *MockProviderMockRecorder { // ReportError mocks base method. func (m *MockProvider) ReportError(arg0 health.Check, arg1 error, arg2 ...health.Attr) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -45,16 +50,16 @@ func (m *MockProvider) ReportError(arg0 health.Check, arg1 error, arg2 ...health } // ReportError indicates an expected call of ReportError. -func (mr *MockProviderMockRecorder) ReportError(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockProviderMockRecorder) ReportError(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReportError", reflect.TypeOf((*MockProvider)(nil).ReportError), varargs...) } // ReportOK mocks base method. func (m *MockProvider) ReportOK(arg0 health.Check, arg1 ...health.Attr) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -62,8 +67,8 @@ func (m *MockProvider) ReportOK(arg0 health.Check, arg1 ...health.Attr) { } // ReportOK indicates an expected call of ReportOK. -func (mr *MockProviderMockRecorder) ReportOK(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockProviderMockRecorder) ReportOK(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReportOK", reflect.TypeOf((*MockProvider)(nil).ReportOK), varargs...) } diff --git a/pkg/zero/connect/connect.pb.go b/pkg/zero/connect/connect.pb.go index d60bbe32e..db90f89e0 100644 --- a/pkg/zero/connect/connect.pb.go +++ b/pkg/zero/connect/connect.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: connect.proto