From b8bdb15aad22d30906a08e6f6be60853d3e35e88 Mon Sep 17 00:00:00 2001 From: Caleb Doxsey Date: Tue, 16 Apr 2024 12:05:02 -0600 Subject: [PATCH] merge main --- pkg/health/deduplicate_test.go | 4 ++-- pkg/health/provider_mock_test.go | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) 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...) }