From e017b2f407f846e27079cc283947da48913a4562 Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Fri, 2 Sep 2022 13:40:38 +0200 Subject: [PATCH] (#1802) support passing the inbox prefix to nats cli Signed-off-by: R.I.Pienaar --- aagent/watchers/watcher/watcher.go | 2 +- broker/federation/federation_test.go | 2 + choria/connection.go | 15 ++- cmd/broker.go | 2 + cmd/governor_add.go | 2 +- cmd/governor_api.go | 2 +- cmd/governor_delete.go | 2 +- cmd/governor_evict.go | 2 +- cmd/governor_reset.go | 2 +- cmd/governor_run.go | 2 +- cmd/governor_view.go | 2 +- go.mod | 6 +- go.sum | 12 +-- inter/connector.go | 1 + inter/connector_info.go | 1 + inter/imocks/connector.go | 38 ++++--- inter/imocks/connector_info.go | 14 +++ inter/imocks/ddl_resolver.go | 8 +- inter/imocks/framework.go | 152 +++++++++++++-------------- inter/imocks/request_signer.go | 2 +- inter/imocks/security.go | 30 +++--- 21 files changed, 170 insertions(+), 129 deletions(-) diff --git a/aagent/watchers/watcher/watcher.go b/aagent/watchers/watcher/watcher.go index 21be2696e..2e41bae73 100644 --- a/aagent/watchers/watcher/watcher.go +++ b/aagent/watchers/watcher/watcher.go @@ -18,7 +18,7 @@ import ( "github.com/choria-io/go-choria/backoff" "github.com/choria-io/go-choria/internal/util" "github.com/choria-io/go-choria/lifecycle" - "github.com/nats-io/jsm.go/governor" + "github.com/nats-io/jsm.go/governor" //lint:ignore SA1019 Will vendor "github.com/tidwall/gjson" ) diff --git a/broker/federation/federation_test.go b/broker/federation/federation_test.go index 90d689f43..567bf4357 100644 --- a/broker/federation/federation_test.go +++ b/broker/federation/federation_test.go @@ -87,6 +87,8 @@ func (s *stubConnection) ConnectionStats() nats.Statistics { return nats.Statistics{} } +func (s *stubConnection) InboxPrefix() string { return "_INBOX.>" } + func (s *stubConnection) IsConnected() bool { return true } func (s *stubConnection) Unsubscribe(name string) error { diff --git a/choria/connection.go b/choria/connection.go index 84b9a9bd1..eca67f4ad 100644 --- a/choria/connection.go +++ b/choria/connection.go @@ -637,13 +637,11 @@ func (conn *Connection) Connect(ctx context.Context) (err error) { }), } + prefix := conn.InboxPrefix() if conn.uniqueId != "" { - prefix := fmt.Sprintf("%s.reply.%s", conn.config.MainCollective, conn.uniqueId) conn.log.Infof("Setting custom inbox prefix based on unique ID to %s", prefix) - options = append(options, nats.CustomInboxPrefix(prefix)) - } else { - options = append(options, nats.CustomInboxPrefix(fmt.Sprintf("%s.reply", conn.config.MainCollective))) } + options = append(options, nats.CustomInboxPrefix(prefix)) if !conn.fw.Config.InitiatedByServer { options = append(options, nats.PingInterval(30*time.Second)) @@ -735,6 +733,15 @@ func (conn *Connection) Flush() { conn.nats.Flush() } +// InboxPrefix is the subject prefix used for replies +func (conn *Connection) InboxPrefix() string { + if conn.uniqueId != "" { + return fmt.Sprintf("%s.reply.%s", conn.config.MainCollective, conn.uniqueId) + } else { + return fmt.Sprintf("%s.reply", conn.config.MainCollective) + } +} + // Close closes the NATS connection after flushing what needed to be sent func (conn *Connection) Close() { subs := []string{} diff --git a/cmd/broker.go b/cmd/broker.go index a61f15958..dc78c5e15 100644 --- a/cmd/broker.go +++ b/cmd/broker.go @@ -89,6 +89,8 @@ func (b *brokerCommand) prepareNatsCli(pc *fisk.ParseContext, opts *natscli.Opti natscli.SetLogger(logger) opts.Conn = conn.Nats() + opts.InboxPrefix = conn.InboxPrefix() + opts.JSc, err = opts.Conn.JetStream() if err != nil { return err diff --git a/cmd/governor_add.go b/cmd/governor_add.go index e05d10c0a..f348d0441 100644 --- a/cmd/governor_add.go +++ b/cmd/governor_add.go @@ -11,7 +11,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/nats-io/jsm.go" - "github.com/nats-io/jsm.go/governor" + "github.com/nats-io/jsm.go/governor" //lint:ignore SA1019 Will vendor ) type tGovAddCommand struct { diff --git a/cmd/governor_api.go b/cmd/governor_api.go index 4175d2ca9..0e28a8d99 100644 --- a/cmd/governor_api.go +++ b/cmd/governor_api.go @@ -15,7 +15,7 @@ import ( "github.com/choria-io/go-choria/config" "github.com/choria-io/go-choria/internal/util" "github.com/nats-io/jsm.go" - "github.com/nats-io/jsm.go/governor" + "github.com/nats-io/jsm.go/governor" //lint:ignore SA1019 Will vendor ) type tGovAPICommand struct { diff --git a/cmd/governor_delete.go b/cmd/governor_delete.go index a8f65b12a..43a6cd578 100644 --- a/cmd/governor_delete.go +++ b/cmd/governor_delete.go @@ -10,7 +10,7 @@ import ( "github.com/choria-io/go-choria/internal/util" "github.com/nats-io/jsm.go" - "github.com/nats-io/jsm.go/governor" + "github.com/nats-io/jsm.go/governor" //lint:ignore SA1019 Will vendor ) type tGovDeleteCommand struct { diff --git a/cmd/governor_evict.go b/cmd/governor_evict.go index dd7e8dd6d..6debe494d 100644 --- a/cmd/governor_evict.go +++ b/cmd/governor_evict.go @@ -11,7 +11,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/choria-io/go-choria/lifecycle" "github.com/nats-io/jsm.go" - "github.com/nats-io/jsm.go/governor" + "github.com/nats-io/jsm.go/governor" //lint:ignore SA1019 Will vendor ) type tGovEvictCommand struct { diff --git a/cmd/governor_reset.go b/cmd/governor_reset.go index 8e5761ccd..918b4da2c 100644 --- a/cmd/governor_reset.go +++ b/cmd/governor_reset.go @@ -10,7 +10,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/nats-io/jsm.go" - "github.com/nats-io/jsm.go/governor" + "github.com/nats-io/jsm.go/governor" //lint:ignore SA1019 Will vendor ) type tGovResetCommand struct { diff --git a/cmd/governor_run.go b/cmd/governor_run.go index e4ad1c0ca..360717e6f 100644 --- a/cmd/governor_run.go +++ b/cmd/governor_run.go @@ -18,7 +18,7 @@ import ( "github.com/choria-io/go-choria/lifecycle" "github.com/kballard/go-shellquote" "github.com/nats-io/jsm.go" - "github.com/nats-io/jsm.go/governor" + "github.com/nats-io/jsm.go/governor" //lint:ignore SA1019 Will vendor ) type tGovRunCommand struct { diff --git a/cmd/governor_view.go b/cmd/governor_view.go index eb3c470a4..aa05cebbb 100644 --- a/cmd/governor_view.go +++ b/cmd/governor_view.go @@ -12,7 +12,7 @@ import ( "github.com/choria-io/go-choria/choria" "github.com/choria-io/go-choria/internal/util" "github.com/nats-io/jsm.go" - "github.com/nats-io/jsm.go/governor" + "github.com/nats-io/jsm.go/governor" //lint:ignore SA1019 Will vendor ) type tGovViewCommand struct { diff --git a/go.mod b/go.mod index 6ccfa5dc6..f119addbb 100644 --- a/go.mod +++ b/go.mod @@ -28,10 +28,10 @@ require ( github.com/looplab/fsm v0.3.0 github.com/miekg/pkcs11 v1.1.1 github.com/mitchellh/mapstructure v1.5.0 - github.com/nats-io/jsm.go v0.0.34-0.20220819130354-30ace5d49ea8 - github.com/nats-io/nats-server/v2 v2.8.5-0.20220831135813-4b9db05a0cba + github.com/nats-io/jsm.go v0.0.34-0.20220902100732-f238d2edcd1f + github.com/nats-io/nats-server/v2 v2.8.5-0.20220901192829-c4b5ca7cff77 github.com/nats-io/nats.go v1.16.1-0.20220901120628-84e2c74b56da - github.com/nats-io/natscli v0.0.34-0.20220824061610-7c31f06231d3 + github.com/nats-io/natscli v0.0.34-0.20220902113825-755db5fe7ed9 github.com/olekukonko/tablewriter v0.0.5 github.com/onsi/ginkgo/v2 v2.1.6 github.com/onsi/gomega v1.20.2 diff --git a/go.sum b/go.sum index 54161ce52..7eeb625b3 100644 --- a/go.sum +++ b/go.sum @@ -837,16 +837,16 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nats-io/jsm.go v0.0.34-0.20220819130354-30ace5d49ea8 h1:k7lZgjWPxY7Kyjwuc0AF9I3iaEPq3ccAJiwIydmT8zs= -github.com/nats-io/jsm.go v0.0.34-0.20220819130354-30ace5d49ea8/go.mod h1:77Om9glk747jR7WeG9DgDCpWC2h88s2O9w5lVud4lUk= +github.com/nats-io/jsm.go v0.0.34-0.20220902100732-f238d2edcd1f h1:i0d4TugIh+1RBBxv3x/gJ6Gwsocj6CzfqSKQUkI5BC0= +github.com/nats-io/jsm.go v0.0.34-0.20220902100732-f238d2edcd1f/go.mod h1:ueH1xXyvo90DD3dhNswKCcjB6MGvnj2HeMn/dimskck= github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI= github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= -github.com/nats-io/nats-server/v2 v2.8.5-0.20220831135813-4b9db05a0cba h1:mSl+YL/a0MIeWaedIZZgJBgr8XWY+SHP36S8LyTTy3E= -github.com/nats-io/nats-server/v2 v2.8.5-0.20220831135813-4b9db05a0cba/go.mod h1:+f++B/5jpr71JATt7b5KCX+G7bt43iWx1OYWGkpE/Kk= +github.com/nats-io/nats-server/v2 v2.8.5-0.20220901192829-c4b5ca7cff77 h1:BsOzAZ/yTUQKQxVVTjwLtM7T0j2XXkPICBjgOPY6bfU= +github.com/nats-io/nats-server/v2 v2.8.5-0.20220901192829-c4b5ca7cff77/go.mod h1:+f++B/5jpr71JATt7b5KCX+G7bt43iWx1OYWGkpE/Kk= github.com/nats-io/nats.go v1.16.1-0.20220901120628-84e2c74b56da h1:VAeFGKLEHSiVb1nPowftbJCF7YQYXHyOsr+Mun0i4+c= github.com/nats-io/nats.go v1.16.1-0.20220901120628-84e2c74b56da/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= -github.com/nats-io/natscli v0.0.34-0.20220824061610-7c31f06231d3 h1:r1Swk5S8clYZ7hh0S8ZRJlmLZxBbk+awBrIvo9cqPwA= -github.com/nats-io/natscli v0.0.34-0.20220824061610-7c31f06231d3/go.mod h1:qBdPIG5pYttk3UPjZ+c+tyTIowoA+2cEpEsc2UUWB9Q= +github.com/nats-io/natscli v0.0.34-0.20220902113825-755db5fe7ed9 h1:imCC8XkB9sXUfHiRH+DbjcdOD/WPM0fgHtCY80T3mXw= +github.com/nats-io/natscli v0.0.34-0.20220902113825-755db5fe7ed9/go.mod h1:ZabDo4FZlKm5eFUR5LD3W0+aNA0U+iBh5jnIOBxMhs8= github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= diff --git a/inter/connector.go b/inter/connector.go index cefb42435..94eae88d2 100644 --- a/inter/connector.go +++ b/inter/connector.go @@ -19,6 +19,7 @@ type Connector interface { ConnectedServer() string ConnectionOptions() nats.Options ConnectionStats() nats.Statistics + InboxPrefix() string IsConnected() bool Nats() *nats.Conn NodeDirectedTarget(collective string, identity string) string diff --git a/inter/connector_info.go b/inter/connector_info.go index 2c1ebec34..68160e4e8 100644 --- a/inter/connector_info.go +++ b/inter/connector_info.go @@ -13,4 +13,5 @@ type ConnectorInfo interface { ConnectedServer() string ConnectionOptions() nats.Options ConnectionStats() nats.Statistics + InboxPrefix() string } diff --git a/inter/imocks/connector.go b/inter/imocks/connector.go index a7488806a..53bbc4e7e 100644 --- a/inter/imocks/connector.go +++ b/inter/imocks/connector.go @@ -45,7 +45,7 @@ func (m *MockConnector) AgentBroadcastTarget(collective, agent string) string { } // AgentBroadcastTarget indicates an expected call of AgentBroadcastTarget. -func (mr *MockConnectorMockRecorder) AgentBroadcastTarget(collective, agent any) *gomock.Call { +func (mr *MockConnectorMockRecorder) AgentBroadcastTarget(collective, agent interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AgentBroadcastTarget", reflect.TypeOf((*MockConnector)(nil).AgentBroadcastTarget), collective, agent) } @@ -60,7 +60,7 @@ func (m *MockConnector) ChanQueueSubscribe(name, subject, group string, capacity } // ChanQueueSubscribe indicates an expected call of ChanQueueSubscribe. -func (mr *MockConnectorMockRecorder) ChanQueueSubscribe(name, subject, group, capacity any) *gomock.Call { +func (mr *MockConnectorMockRecorder) ChanQueueSubscribe(name, subject, group, capacity interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChanQueueSubscribe", reflect.TypeOf((*MockConnector)(nil).ChanQueueSubscribe), name, subject, group, capacity) } @@ -86,7 +86,7 @@ func (m *MockConnector) Connect(ctx context.Context) error { } // Connect indicates an expected call of Connect. -func (mr *MockConnectorMockRecorder) Connect(ctx any) *gomock.Call { +func (mr *MockConnectorMockRecorder) Connect(ctx interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Connect", reflect.TypeOf((*MockConnector)(nil).Connect), ctx) } @@ -133,6 +133,20 @@ func (mr *MockConnectorMockRecorder) ConnectionStats() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConnectionStats", reflect.TypeOf((*MockConnector)(nil).ConnectionStats)) } +// InboxPrefix mocks base method. +func (m *MockConnector) InboxPrefix() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "InboxPrefix") + ret0, _ := ret[0].(string) + return ret0 +} + +// InboxPrefix indicates an expected call of InboxPrefix. +func (mr *MockConnectorMockRecorder) InboxPrefix() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InboxPrefix", reflect.TypeOf((*MockConnector)(nil).InboxPrefix)) +} + // IsConnected mocks base method. func (m *MockConnector) IsConnected() bool { m.ctrl.T.Helper() @@ -170,7 +184,7 @@ func (m *MockConnector) NodeDirectedTarget(collective, identity string) string { } // NodeDirectedTarget indicates an expected call of NodeDirectedTarget. -func (mr *MockConnectorMockRecorder) NodeDirectedTarget(collective, identity any) *gomock.Call { +func (mr *MockConnectorMockRecorder) NodeDirectedTarget(collective, identity interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodeDirectedTarget", reflect.TypeOf((*MockConnector)(nil).NodeDirectedTarget), collective, identity) } @@ -184,7 +198,7 @@ func (m *MockConnector) Publish(msg inter.Message) error { } // Publish indicates an expected call of Publish. -func (mr *MockConnectorMockRecorder) Publish(msg any) *gomock.Call { +func (mr *MockConnectorMockRecorder) Publish(msg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Publish", reflect.TypeOf((*MockConnector)(nil).Publish), msg) } @@ -198,7 +212,7 @@ func (m *MockConnector) PublishRaw(target string, data []byte) error { } // PublishRaw indicates an expected call of PublishRaw. -func (mr *MockConnectorMockRecorder) PublishRaw(target, data any) *gomock.Call { +func (mr *MockConnectorMockRecorder) PublishRaw(target, data interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PublishRaw", reflect.TypeOf((*MockConnector)(nil).PublishRaw), target, data) } @@ -212,7 +226,7 @@ func (m *MockConnector) PublishRawMsg(msg *nats.Msg) error { } // PublishRawMsg indicates an expected call of PublishRawMsg. -func (mr *MockConnectorMockRecorder) PublishRawMsg(msg any) *gomock.Call { +func (mr *MockConnectorMockRecorder) PublishRawMsg(msg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PublishRawMsg", reflect.TypeOf((*MockConnector)(nil).PublishRawMsg), msg) } @@ -226,7 +240,7 @@ func (m *MockConnector) QueueSubscribe(ctx context.Context, name, subject, group } // QueueSubscribe indicates an expected call of QueueSubscribe. -func (mr *MockConnectorMockRecorder) QueueSubscribe(ctx, name, subject, group, output any) *gomock.Call { +func (mr *MockConnectorMockRecorder) QueueSubscribe(ctx, name, subject, group, output interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueueSubscribe", reflect.TypeOf((*MockConnector)(nil).QueueSubscribe), ctx, name, subject, group, output) } @@ -241,7 +255,7 @@ func (m *MockConnector) ReplyTarget(msg inter.Message) (string, error) { } // ReplyTarget indicates an expected call of ReplyTarget. -func (mr *MockConnectorMockRecorder) ReplyTarget(msg any) *gomock.Call { +func (mr *MockConnectorMockRecorder) ReplyTarget(msg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReplyTarget", reflect.TypeOf((*MockConnector)(nil).ReplyTarget), msg) } @@ -256,7 +270,7 @@ func (m *MockConnector) RequestRawMsgWithContext(ctx context.Context, msg *nats. } // RequestRawMsgWithContext indicates an expected call of RequestRawMsgWithContext. -func (mr *MockConnectorMockRecorder) RequestRawMsgWithContext(ctx, msg any) *gomock.Call { +func (mr *MockConnectorMockRecorder) RequestRawMsgWithContext(ctx, msg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequestRawMsgWithContext", reflect.TypeOf((*MockConnector)(nil).RequestRawMsgWithContext), ctx, msg) } @@ -270,7 +284,7 @@ func (m *MockConnector) ServiceBroadcastTarget(collective, agent string) string } // ServiceBroadcastTarget indicates an expected call of ServiceBroadcastTarget. -func (mr *MockConnectorMockRecorder) ServiceBroadcastTarget(collective, agent any) *gomock.Call { +func (mr *MockConnectorMockRecorder) ServiceBroadcastTarget(collective, agent interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ServiceBroadcastTarget", reflect.TypeOf((*MockConnector)(nil).ServiceBroadcastTarget), collective, agent) } @@ -284,7 +298,7 @@ func (m *MockConnector) Unsubscribe(name string) error { } // Unsubscribe indicates an expected call of Unsubscribe. -func (mr *MockConnectorMockRecorder) Unsubscribe(name any) *gomock.Call { +func (mr *MockConnectorMockRecorder) Unsubscribe(name interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unsubscribe", reflect.TypeOf((*MockConnector)(nil).Unsubscribe), name) } diff --git a/inter/imocks/connector_info.go b/inter/imocks/connector_info.go index b903f2352..d21e011bb 100644 --- a/inter/imocks/connector_info.go +++ b/inter/imocks/connector_info.go @@ -75,3 +75,17 @@ func (mr *MockConnectorInfoMockRecorder) ConnectionStats() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConnectionStats", reflect.TypeOf((*MockConnectorInfo)(nil).ConnectionStats)) } + +// InboxPrefix mocks base method. +func (m *MockConnectorInfo) InboxPrefix() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "InboxPrefix") + ret0, _ := ret[0].(string) + return ret0 +} + +// InboxPrefix indicates an expected call of InboxPrefix. +func (mr *MockConnectorInfoMockRecorder) InboxPrefix() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InboxPrefix", reflect.TypeOf((*MockConnectorInfo)(nil).InboxPrefix)) +} diff --git a/inter/imocks/ddl_resolver.go b/inter/imocks/ddl_resolver.go index 10ca5652c..49fba0a6d 100644 --- a/inter/imocks/ddl_resolver.go +++ b/inter/imocks/ddl_resolver.go @@ -36,7 +36,7 @@ func (m *MockDDLResolver) EXPECT() *MockDDLResolverMockRecorder { } // DDL mocks base method. -func (m *MockDDLResolver) DDL(arg0 context.Context, arg1, arg2 string, arg3 any, arg4 inter.Framework) error { +func (m *MockDDLResolver) DDL(arg0 context.Context, arg1, arg2 string, arg3 interface{}, arg4 inter.Framework) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DDL", arg0, arg1, arg2, arg3, arg4) ret0, _ := ret[0].(error) @@ -44,7 +44,7 @@ func (m *MockDDLResolver) DDL(arg0 context.Context, arg1, arg2 string, arg3 any, } // DDL indicates an expected call of DDL. -func (mr *MockDDLResolverMockRecorder) DDL(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockDDLResolverMockRecorder) DDL(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DDL", reflect.TypeOf((*MockDDLResolver)(nil).DDL), arg0, arg1, arg2, arg3, arg4) } @@ -59,7 +59,7 @@ func (m *MockDDLResolver) DDLBytes(arg0 context.Context, arg1, arg2 string, arg3 } // DDLBytes indicates an expected call of DDLBytes. -func (mr *MockDDLResolverMockRecorder) DDLBytes(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockDDLResolverMockRecorder) DDLBytes(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DDLBytes", reflect.TypeOf((*MockDDLResolver)(nil).DDLBytes), arg0, arg1, arg2, arg3) } @@ -74,7 +74,7 @@ func (m *MockDDLResolver) DDLNames(arg0 context.Context, arg1 string, arg2 inter } // DDLNames indicates an expected call of DDLNames. -func (mr *MockDDLResolverMockRecorder) DDLNames(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockDDLResolverMockRecorder) DDLNames(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DDLNames", reflect.TypeOf((*MockDDLResolver)(nil).DDLNames), arg0, arg1, arg2) } diff --git a/inter/imocks/framework.go b/inter/imocks/framework.go index d322a87cf..d0019a27b 100644 --- a/inter/imocks/framework.go +++ b/inter/imocks/framework.go @@ -95,7 +95,7 @@ func (m *MockProtocolConstructor) NewMessage(arg0, arg1, arg2, arg3 string, arg4 } // NewMessage indicates an expected call of NewMessage. -func (mr *MockProtocolConstructorMockRecorder) NewMessage(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewMessage(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewMessage", reflect.TypeOf((*MockProtocolConstructor)(nil).NewMessage), arg0, arg1, arg2, arg3, arg4) } @@ -110,7 +110,7 @@ func (m *MockProtocolConstructor) NewMessageFromRequest(arg0 protocol.Request, a } // NewMessageFromRequest indicates an expected call of NewMessageFromRequest. -func (mr *MockProtocolConstructorMockRecorder) NewMessageFromRequest(arg0, arg1 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewMessageFromRequest(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewMessageFromRequest", reflect.TypeOf((*MockProtocolConstructor)(nil).NewMessageFromRequest), arg0, arg1) } @@ -125,7 +125,7 @@ func (m *MockProtocolConstructor) NewReply(arg0 protocol.Request) (protocol.Repl } // NewReply indicates an expected call of NewReply. -func (mr *MockProtocolConstructorMockRecorder) NewReply(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewReply(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReply", reflect.TypeOf((*MockProtocolConstructor)(nil).NewReply), arg0) } @@ -140,7 +140,7 @@ func (m *MockProtocolConstructor) NewReplyFromMessage(arg0 string, arg1 inter.Me } // NewReplyFromMessage indicates an expected call of NewReplyFromMessage. -func (mr *MockProtocolConstructorMockRecorder) NewReplyFromMessage(arg0, arg1 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewReplyFromMessage(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReplyFromMessage", reflect.TypeOf((*MockProtocolConstructor)(nil).NewReplyFromMessage), arg0, arg1) } @@ -155,7 +155,7 @@ func (m *MockProtocolConstructor) NewReplyFromSecureReply(arg0 protocol.SecureRe } // NewReplyFromSecureReply indicates an expected call of NewReplyFromSecureReply. -func (mr *MockProtocolConstructorMockRecorder) NewReplyFromSecureReply(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewReplyFromSecureReply(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReplyFromSecureReply", reflect.TypeOf((*MockProtocolConstructor)(nil).NewReplyFromSecureReply), arg0) } @@ -170,7 +170,7 @@ func (m *MockProtocolConstructor) NewReplyFromTransportJSON(arg0 []byte, arg1 bo } // NewReplyFromTransportJSON indicates an expected call of NewReplyFromTransportJSON. -func (mr *MockProtocolConstructorMockRecorder) NewReplyFromTransportJSON(arg0, arg1 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewReplyFromTransportJSON(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReplyFromTransportJSON", reflect.TypeOf((*MockProtocolConstructor)(nil).NewReplyFromTransportJSON), arg0, arg1) } @@ -185,7 +185,7 @@ func (m *MockProtocolConstructor) NewReplyTransportForMessage(arg0 inter.Message } // NewReplyTransportForMessage indicates an expected call of NewReplyTransportForMessage. -func (mr *MockProtocolConstructorMockRecorder) NewReplyTransportForMessage(arg0, arg1 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewReplyTransportForMessage(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReplyTransportForMessage", reflect.TypeOf((*MockProtocolConstructor)(nil).NewReplyTransportForMessage), arg0, arg1) } @@ -200,7 +200,7 @@ func (m *MockProtocolConstructor) NewRequest(arg0, arg1, arg2, arg3 string, arg4 } // NewRequest indicates an expected call of NewRequest. -func (mr *MockProtocolConstructorMockRecorder) NewRequest(arg0, arg1, arg2, arg3, arg4, arg5, arg6 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewRequest(arg0, arg1, arg2, arg3, arg4, arg5, arg6 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequest", reflect.TypeOf((*MockProtocolConstructor)(nil).NewRequest), arg0, arg1, arg2, arg3, arg4, arg5, arg6) } @@ -215,7 +215,7 @@ func (m *MockProtocolConstructor) NewRequestFromMessage(arg0 string, arg1 inter. } // NewRequestFromMessage indicates an expected call of NewRequestFromMessage. -func (mr *MockProtocolConstructorMockRecorder) NewRequestFromMessage(arg0, arg1 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewRequestFromMessage(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestFromMessage", reflect.TypeOf((*MockProtocolConstructor)(nil).NewRequestFromMessage), arg0, arg1) } @@ -230,7 +230,7 @@ func (m *MockProtocolConstructor) NewRequestFromSecureRequest(arg0 protocol.Secu } // NewRequestFromSecureRequest indicates an expected call of NewRequestFromSecureRequest. -func (mr *MockProtocolConstructorMockRecorder) NewRequestFromSecureRequest(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewRequestFromSecureRequest(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestFromSecureRequest", reflect.TypeOf((*MockProtocolConstructor)(nil).NewRequestFromSecureRequest), arg0) } @@ -245,7 +245,7 @@ func (m *MockProtocolConstructor) NewRequestFromTransportJSON(arg0 []byte, arg1 } // NewRequestFromTransportJSON indicates an expected call of NewRequestFromTransportJSON. -func (mr *MockProtocolConstructorMockRecorder) NewRequestFromTransportJSON(arg0, arg1 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewRequestFromTransportJSON(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestFromTransportJSON", reflect.TypeOf((*MockProtocolConstructor)(nil).NewRequestFromTransportJSON), arg0, arg1) } @@ -275,7 +275,7 @@ func (m *MockProtocolConstructor) NewRequestMessageFromTransportJSON(arg0 []byte } // NewRequestMessageFromTransportJSON indicates an expected call of NewRequestMessageFromTransportJSON. -func (mr *MockProtocolConstructorMockRecorder) NewRequestMessageFromTransportJSON(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewRequestMessageFromTransportJSON(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestMessageFromTransportJSON", reflect.TypeOf((*MockProtocolConstructor)(nil).NewRequestMessageFromTransportJSON), arg0) } @@ -290,7 +290,7 @@ func (m *MockProtocolConstructor) NewRequestTransportForMessage(arg0 inter.Messa } // NewRequestTransportForMessage indicates an expected call of NewRequestTransportForMessage. -func (mr *MockProtocolConstructorMockRecorder) NewRequestTransportForMessage(arg0, arg1 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewRequestTransportForMessage(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestTransportForMessage", reflect.TypeOf((*MockProtocolConstructor)(nil).NewRequestTransportForMessage), arg0, arg1) } @@ -305,7 +305,7 @@ func (m *MockProtocolConstructor) NewSecureReply(arg0 protocol.Reply) (protocol. } // NewSecureReply indicates an expected call of NewSecureReply. -func (mr *MockProtocolConstructorMockRecorder) NewSecureReply(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewSecureReply(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewSecureReply", reflect.TypeOf((*MockProtocolConstructor)(nil).NewSecureReply), arg0) } @@ -320,7 +320,7 @@ func (m *MockProtocolConstructor) NewSecureReplyFromTransport(arg0 protocol.Tran } // NewSecureReplyFromTransport indicates an expected call of NewSecureReplyFromTransport. -func (mr *MockProtocolConstructorMockRecorder) NewSecureReplyFromTransport(arg0, arg1 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewSecureReplyFromTransport(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewSecureReplyFromTransport", reflect.TypeOf((*MockProtocolConstructor)(nil).NewSecureReplyFromTransport), arg0, arg1) } @@ -335,7 +335,7 @@ func (m *MockProtocolConstructor) NewSecureRequest(arg0 protocol.Request) (proto } // NewSecureRequest indicates an expected call of NewSecureRequest. -func (mr *MockProtocolConstructorMockRecorder) NewSecureRequest(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewSecureRequest(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewSecureRequest", reflect.TypeOf((*MockProtocolConstructor)(nil).NewSecureRequest), arg0) } @@ -350,7 +350,7 @@ func (m *MockProtocolConstructor) NewSecureRequestFromTransport(arg0 protocol.Tr } // NewSecureRequestFromTransport indicates an expected call of NewSecureRequestFromTransport. -func (mr *MockProtocolConstructorMockRecorder) NewSecureRequestFromTransport(arg0, arg1 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewSecureRequestFromTransport(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewSecureRequestFromTransport", reflect.TypeOf((*MockProtocolConstructor)(nil).NewSecureRequestFromTransport), arg0, arg1) } @@ -365,7 +365,7 @@ func (m *MockProtocolConstructor) NewTransportForSecureReply(arg0 protocol.Secur } // NewTransportForSecureReply indicates an expected call of NewTransportForSecureReply. -func (mr *MockProtocolConstructorMockRecorder) NewTransportForSecureReply(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewTransportForSecureReply(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTransportForSecureReply", reflect.TypeOf((*MockProtocolConstructor)(nil).NewTransportForSecureReply), arg0) } @@ -380,7 +380,7 @@ func (m *MockProtocolConstructor) NewTransportForSecureRequest(arg0 protocol.Sec } // NewTransportForSecureRequest indicates an expected call of NewTransportForSecureRequest. -func (mr *MockProtocolConstructorMockRecorder) NewTransportForSecureRequest(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewTransportForSecureRequest(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTransportForSecureRequest", reflect.TypeOf((*MockProtocolConstructor)(nil).NewTransportForSecureRequest), arg0) } @@ -395,7 +395,7 @@ func (m *MockProtocolConstructor) NewTransportFromJSON(arg0 string) (protocol.Tr } // NewTransportFromJSON indicates an expected call of NewTransportFromJSON. -func (mr *MockProtocolConstructorMockRecorder) NewTransportFromJSON(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewTransportFromJSON(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTransportFromJSON", reflect.TypeOf((*MockProtocolConstructor)(nil).NewTransportFromJSON), arg0) } @@ -410,7 +410,7 @@ func (m *MockProtocolConstructor) NewTransportMessage(arg0 string) (protocol.Tra } // NewTransportMessage indicates an expected call of NewTransportMessage. -func (mr *MockProtocolConstructorMockRecorder) NewTransportMessage(arg0 any) *gomock.Call { +func (mr *MockProtocolConstructorMockRecorder) NewTransportMessage(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTransportMessage", reflect.TypeOf((*MockProtocolConstructor)(nil).NewTransportMessage), arg0) } @@ -448,7 +448,7 @@ func (m *MockConnectionManager) NewConnector(arg0 context.Context, arg1 func() ( } // NewConnector indicates an expected call of NewConnector. -func (mr *MockConnectionManagerMockRecorder) NewConnector(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockConnectionManagerMockRecorder) NewConnector(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnector", reflect.TypeOf((*MockConnectionManager)(nil).NewConnector), arg0, arg1, arg2, arg3) } @@ -534,9 +534,9 @@ func (mr *MockFrameworkMockRecorder) ClientTLSConfig() *gomock.Call { } // Colorize mocks base method. -func (m *MockFramework) Colorize(arg0, arg1 string, arg2 ...any) string { +func (m *MockFramework) Colorize(arg0, arg1 string, arg2 ...interface{}) string { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} + varargs := []interface{}{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -546,9 +546,9 @@ func (m *MockFramework) Colorize(arg0, arg1 string, arg2 ...any) string { } // Colorize indicates an expected call of Colorize. -func (mr *MockFrameworkMockRecorder) Colorize(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) Colorize(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Colorize", reflect.TypeOf((*MockFramework)(nil).Colorize), varargs...) } @@ -616,7 +616,7 @@ func (m *MockFramework) Enroll(arg0 context.Context, arg1 time.Duration, arg2 fu } // Enroll indicates an expected call of Enroll. -func (mr *MockFrameworkMockRecorder) Enroll(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) Enroll(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Enroll", reflect.TypeOf((*MockFramework)(nil).Enroll), arg0, arg1, arg2) } @@ -675,7 +675,7 @@ func (m *MockFramework) FacterStringFact(arg0 string) (string, error) { } // FacterStringFact indicates an expected call of FacterStringFact. -func (mr *MockFrameworkMockRecorder) FacterStringFact(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) FacterStringFact(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FacterStringFact", reflect.TypeOf((*MockFramework)(nil).FacterStringFact), arg0) } @@ -732,7 +732,7 @@ func (m *MockFramework) GovernorSubject(arg0 string) string { } // GovernorSubject indicates an expected call of GovernorSubject. -func (mr *MockFrameworkMockRecorder) GovernorSubject(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) GovernorSubject(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GovernorSubject", reflect.TypeOf((*MockFramework)(nil).GovernorSubject), arg0) } @@ -747,7 +747,7 @@ func (m *MockFramework) HTTPClient(arg0 bool) (*http.Client, error) { } // HTTPClient indicates an expected call of HTTPClient. -func (mr *MockFrameworkMockRecorder) HTTPClient(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) HTTPClient(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HTTPClient", reflect.TypeOf((*MockFramework)(nil).HTTPClient), arg0) } @@ -761,7 +761,7 @@ func (m *MockFramework) HasCollective(arg0 string) bool { } // HasCollective indicates an expected call of HasCollective. -func (mr *MockFrameworkMockRecorder) HasCollective(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) HasCollective(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasCollective", reflect.TypeOf((*MockFramework)(nil).HasCollective), arg0) } @@ -783,7 +783,7 @@ func (mr *MockFrameworkMockRecorder) IsFederated() *gomock.Call { // KV mocks base method. func (m *MockFramework) KV(arg0 context.Context, arg1 inter.Connector, arg2 string, arg3 bool, arg4 ...kv.Option) (nats.KeyValue, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3} + varargs := []interface{}{arg0, arg1, arg2, arg3} for _, a := range arg4 { varargs = append(varargs, a) } @@ -794,16 +794,16 @@ func (m *MockFramework) KV(arg0 context.Context, arg1 inter.Connector, arg2 stri } // KV indicates an expected call of KV. -func (mr *MockFrameworkMockRecorder) KV(arg0, arg1, arg2, arg3 any, arg4 ...any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) KV(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KV", reflect.TypeOf((*MockFramework)(nil).KV), varargs...) } // KVWithConn mocks base method. func (m *MockFramework) KVWithConn(arg0 context.Context, arg1 inter.Connector, arg2 string, arg3 bool, arg4 ...kv.Option) (nats.KeyValue, inter.Connector, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3} + varargs := []interface{}{arg0, arg1, arg2, arg3} for _, a := range arg4 { varargs = append(varargs, a) } @@ -815,9 +815,9 @@ func (m *MockFramework) KVWithConn(arg0 context.Context, arg1 inter.Connector, a } // KVWithConn indicates an expected call of KVWithConn. -func (mr *MockFrameworkMockRecorder) KVWithConn(arg0, arg1, arg2, arg3 any, arg4 ...any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) KVWithConn(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KVWithConn", reflect.TypeOf((*MockFramework)(nil).KVWithConn), varargs...) } @@ -830,7 +830,7 @@ func (m *MockFramework) Logger(arg0 string) *logrus.Entry { } // Logger indicates an expected call of Logger. -func (mr *MockFrameworkMockRecorder) Logger(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) Logger(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Logger", reflect.TypeOf((*MockFramework)(nil).Logger), arg0) } @@ -875,7 +875,7 @@ func (m *MockFramework) NewConnector(arg0 context.Context, arg1 func() (srvcache } // NewConnector indicates an expected call of NewConnector. -func (mr *MockFrameworkMockRecorder) NewConnector(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewConnector(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnector", reflect.TypeOf((*MockFramework)(nil).NewConnector), arg0, arg1, arg2, arg3) } @@ -883,7 +883,7 @@ func (mr *MockFrameworkMockRecorder) NewConnector(arg0, arg1, arg2, arg3 any) *g // NewElection mocks base method. func (m *MockFramework) NewElection(arg0 context.Context, arg1 inter.Connector, arg2 string, arg3 bool, arg4 ...election.Option) (inter.Election, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3} + varargs := []interface{}{arg0, arg1, arg2, arg3} for _, a := range arg4 { varargs = append(varargs, a) } @@ -894,16 +894,16 @@ func (m *MockFramework) NewElection(arg0 context.Context, arg1 inter.Connector, } // NewElection indicates an expected call of NewElection. -func (mr *MockFrameworkMockRecorder) NewElection(arg0, arg1, arg2, arg3 any, arg4 ...any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewElection(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewElection", reflect.TypeOf((*MockFramework)(nil).NewElection), varargs...) } // NewElectionWithConn mocks base method. func (m *MockFramework) NewElectionWithConn(arg0 context.Context, arg1 inter.Connector, arg2 string, arg3 bool, arg4 ...election.Option) (inter.Election, inter.Connector, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3} + varargs := []interface{}{arg0, arg1, arg2, arg3} for _, a := range arg4 { varargs = append(varargs, a) } @@ -915,9 +915,9 @@ func (m *MockFramework) NewElectionWithConn(arg0 context.Context, arg1 inter.Con } // NewElectionWithConn indicates an expected call of NewElectionWithConn. -func (mr *MockFrameworkMockRecorder) NewElectionWithConn(arg0, arg1, arg2, arg3 any, arg4 ...any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewElectionWithConn(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewElectionWithConn", reflect.TypeOf((*MockFramework)(nil).NewElectionWithConn), varargs...) } @@ -931,7 +931,7 @@ func (m *MockFramework) NewMessage(arg0, arg1, arg2, arg3 string, arg4 inter.Mes } // NewMessage indicates an expected call of NewMessage. -func (mr *MockFrameworkMockRecorder) NewMessage(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewMessage(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewMessage", reflect.TypeOf((*MockFramework)(nil).NewMessage), arg0, arg1, arg2, arg3, arg4) } @@ -946,7 +946,7 @@ func (m *MockFramework) NewMessageFromRequest(arg0 protocol.Request, arg1 string } // NewMessageFromRequest indicates an expected call of NewMessageFromRequest. -func (mr *MockFrameworkMockRecorder) NewMessageFromRequest(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewMessageFromRequest(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewMessageFromRequest", reflect.TypeOf((*MockFramework)(nil).NewMessageFromRequest), arg0, arg1) } @@ -961,7 +961,7 @@ func (m *MockFramework) NewReply(arg0 protocol.Request) (protocol.Reply, error) } // NewReply indicates an expected call of NewReply. -func (mr *MockFrameworkMockRecorder) NewReply(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewReply(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReply", reflect.TypeOf((*MockFramework)(nil).NewReply), arg0) } @@ -976,7 +976,7 @@ func (m *MockFramework) NewReplyFromMessage(arg0 string, arg1 inter.Message) (pr } // NewReplyFromMessage indicates an expected call of NewReplyFromMessage. -func (mr *MockFrameworkMockRecorder) NewReplyFromMessage(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewReplyFromMessage(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReplyFromMessage", reflect.TypeOf((*MockFramework)(nil).NewReplyFromMessage), arg0, arg1) } @@ -991,7 +991,7 @@ func (m *MockFramework) NewReplyFromSecureReply(arg0 protocol.SecureReply) (prot } // NewReplyFromSecureReply indicates an expected call of NewReplyFromSecureReply. -func (mr *MockFrameworkMockRecorder) NewReplyFromSecureReply(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewReplyFromSecureReply(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReplyFromSecureReply", reflect.TypeOf((*MockFramework)(nil).NewReplyFromSecureReply), arg0) } @@ -1006,7 +1006,7 @@ func (m *MockFramework) NewReplyFromTransportJSON(arg0 []byte, arg1 bool) (proto } // NewReplyFromTransportJSON indicates an expected call of NewReplyFromTransportJSON. -func (mr *MockFrameworkMockRecorder) NewReplyFromTransportJSON(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewReplyFromTransportJSON(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReplyFromTransportJSON", reflect.TypeOf((*MockFramework)(nil).NewReplyFromTransportJSON), arg0, arg1) } @@ -1021,7 +1021,7 @@ func (m *MockFramework) NewReplyTransportForMessage(arg0 inter.Message, arg1 pro } // NewReplyTransportForMessage indicates an expected call of NewReplyTransportForMessage. -func (mr *MockFrameworkMockRecorder) NewReplyTransportForMessage(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewReplyTransportForMessage(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewReplyTransportForMessage", reflect.TypeOf((*MockFramework)(nil).NewReplyTransportForMessage), arg0, arg1) } @@ -1036,7 +1036,7 @@ func (m *MockFramework) NewRequest(arg0, arg1, arg2, arg3 string, arg4 int, arg5 } // NewRequest indicates an expected call of NewRequest. -func (mr *MockFrameworkMockRecorder) NewRequest(arg0, arg1, arg2, arg3, arg4, arg5, arg6 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewRequest(arg0, arg1, arg2, arg3, arg4, arg5, arg6 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequest", reflect.TypeOf((*MockFramework)(nil).NewRequest), arg0, arg1, arg2, arg3, arg4, arg5, arg6) } @@ -1051,7 +1051,7 @@ func (m *MockFramework) NewRequestFromMessage(arg0 string, arg1 inter.Message) ( } // NewRequestFromMessage indicates an expected call of NewRequestFromMessage. -func (mr *MockFrameworkMockRecorder) NewRequestFromMessage(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewRequestFromMessage(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestFromMessage", reflect.TypeOf((*MockFramework)(nil).NewRequestFromMessage), arg0, arg1) } @@ -1066,7 +1066,7 @@ func (m *MockFramework) NewRequestFromSecureRequest(arg0 protocol.SecureRequest) } // NewRequestFromSecureRequest indicates an expected call of NewRequestFromSecureRequest. -func (mr *MockFrameworkMockRecorder) NewRequestFromSecureRequest(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewRequestFromSecureRequest(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestFromSecureRequest", reflect.TypeOf((*MockFramework)(nil).NewRequestFromSecureRequest), arg0) } @@ -1081,7 +1081,7 @@ func (m *MockFramework) NewRequestFromTransportJSON(arg0 []byte, arg1 bool) (pro } // NewRequestFromTransportJSON indicates an expected call of NewRequestFromTransportJSON. -func (mr *MockFrameworkMockRecorder) NewRequestFromTransportJSON(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewRequestFromTransportJSON(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestFromTransportJSON", reflect.TypeOf((*MockFramework)(nil).NewRequestFromTransportJSON), arg0, arg1) } @@ -1111,7 +1111,7 @@ func (m *MockFramework) NewRequestMessageFromTransportJSON(arg0 []byte) (inter.M } // NewRequestMessageFromTransportJSON indicates an expected call of NewRequestMessageFromTransportJSON. -func (mr *MockFrameworkMockRecorder) NewRequestMessageFromTransportJSON(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewRequestMessageFromTransportJSON(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestMessageFromTransportJSON", reflect.TypeOf((*MockFramework)(nil).NewRequestMessageFromTransportJSON), arg0) } @@ -1126,7 +1126,7 @@ func (m *MockFramework) NewRequestTransportForMessage(arg0 inter.Message, arg1 s } // NewRequestTransportForMessage indicates an expected call of NewRequestTransportForMessage. -func (mr *MockFrameworkMockRecorder) NewRequestTransportForMessage(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewRequestTransportForMessage(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRequestTransportForMessage", reflect.TypeOf((*MockFramework)(nil).NewRequestTransportForMessage), arg0, arg1) } @@ -1141,7 +1141,7 @@ func (m *MockFramework) NewSecureReply(arg0 protocol.Reply) (protocol.SecureRepl } // NewSecureReply indicates an expected call of NewSecureReply. -func (mr *MockFrameworkMockRecorder) NewSecureReply(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewSecureReply(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewSecureReply", reflect.TypeOf((*MockFramework)(nil).NewSecureReply), arg0) } @@ -1156,7 +1156,7 @@ func (m *MockFramework) NewSecureReplyFromTransport(arg0 protocol.TransportMessa } // NewSecureReplyFromTransport indicates an expected call of NewSecureReplyFromTransport. -func (mr *MockFrameworkMockRecorder) NewSecureReplyFromTransport(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewSecureReplyFromTransport(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewSecureReplyFromTransport", reflect.TypeOf((*MockFramework)(nil).NewSecureReplyFromTransport), arg0, arg1) } @@ -1171,7 +1171,7 @@ func (m *MockFramework) NewSecureRequest(arg0 protocol.Request) (protocol.Secure } // NewSecureRequest indicates an expected call of NewSecureRequest. -func (mr *MockFrameworkMockRecorder) NewSecureRequest(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewSecureRequest(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewSecureRequest", reflect.TypeOf((*MockFramework)(nil).NewSecureRequest), arg0) } @@ -1186,7 +1186,7 @@ func (m *MockFramework) NewSecureRequestFromTransport(arg0 protocol.TransportMes } // NewSecureRequestFromTransport indicates an expected call of NewSecureRequestFromTransport. -func (mr *MockFrameworkMockRecorder) NewSecureRequestFromTransport(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewSecureRequestFromTransport(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewSecureRequestFromTransport", reflect.TypeOf((*MockFramework)(nil).NewSecureRequestFromTransport), arg0, arg1) } @@ -1201,7 +1201,7 @@ func (m *MockFramework) NewTransportForSecureReply(arg0 protocol.SecureReply) (p } // NewTransportForSecureReply indicates an expected call of NewTransportForSecureReply. -func (mr *MockFrameworkMockRecorder) NewTransportForSecureReply(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewTransportForSecureReply(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTransportForSecureReply", reflect.TypeOf((*MockFramework)(nil).NewTransportForSecureReply), arg0) } @@ -1216,7 +1216,7 @@ func (m *MockFramework) NewTransportForSecureRequest(arg0 protocol.SecureRequest } // NewTransportForSecureRequest indicates an expected call of NewTransportForSecureRequest. -func (mr *MockFrameworkMockRecorder) NewTransportForSecureRequest(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewTransportForSecureRequest(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTransportForSecureRequest", reflect.TypeOf((*MockFramework)(nil).NewTransportForSecureRequest), arg0) } @@ -1231,7 +1231,7 @@ func (m *MockFramework) NewTransportFromJSON(arg0 string) (protocol.TransportMes } // NewTransportFromJSON indicates an expected call of NewTransportFromJSON. -func (mr *MockFrameworkMockRecorder) NewTransportFromJSON(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewTransportFromJSON(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTransportFromJSON", reflect.TypeOf((*MockFramework)(nil).NewTransportFromJSON), arg0) } @@ -1246,7 +1246,7 @@ func (m *MockFramework) NewTransportMessage(arg0 string) (protocol.TransportMess } // NewTransportMessage indicates an expected call of NewTransportMessage. -func (mr *MockFrameworkMockRecorder) NewTransportMessage(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) NewTransportMessage(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTransportMessage", reflect.TypeOf((*MockFramework)(nil).NewTransportMessage), arg0) } @@ -1275,7 +1275,7 @@ func (m *MockFramework) PQLQuery(arg0 string) ([]byte, error) { } // PQLQuery indicates an expected call of PQLQuery. -func (mr *MockFrameworkMockRecorder) PQLQuery(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) PQLQuery(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PQLQuery", reflect.TypeOf((*MockFramework)(nil).PQLQuery), arg0) } @@ -1290,7 +1290,7 @@ func (m *MockFramework) PQLQueryCertNames(arg0 string) ([]string, error) { } // PQLQueryCertNames indicates an expected call of PQLQueryCertNames. -func (mr *MockFrameworkMockRecorder) PQLQueryCertNames(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) PQLQueryCertNames(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PQLQueryCertNames", reflect.TypeOf((*MockFramework)(nil).PQLQueryCertNames), arg0) } @@ -1347,7 +1347,7 @@ func (m *MockFramework) ProvisioningServers(arg0 context.Context) (srvcache.Serv } // ProvisioningServers indicates an expected call of ProvisioningServers. -func (mr *MockFrameworkMockRecorder) ProvisioningServers(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) ProvisioningServers(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProvisioningServers", reflect.TypeOf((*MockFramework)(nil).ProvisioningServers), arg0) } @@ -1376,7 +1376,7 @@ func (m *MockFramework) PuppetAIOCmd(arg0, arg1 string) string { } // PuppetAIOCmd indicates an expected call of PuppetAIOCmd. -func (mr *MockFrameworkMockRecorder) PuppetAIOCmd(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) PuppetAIOCmd(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PuppetAIOCmd", reflect.TypeOf((*MockFramework)(nil).PuppetAIOCmd), arg0, arg1) } @@ -1406,7 +1406,7 @@ func (m *MockFramework) PuppetSetting(arg0 string) (string, error) { } // PuppetSetting indicates an expected call of PuppetSetting. -func (mr *MockFrameworkMockRecorder) PuppetSetting(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) PuppetSetting(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PuppetSetting", reflect.TypeOf((*MockFramework)(nil).PuppetSetting), arg0) } @@ -1421,7 +1421,7 @@ func (m *MockFramework) QuerySrvRecords(arg0 []string) (srvcache.Servers, error) } // QuerySrvRecords indicates an expected call of QuerySrvRecords. -func (mr *MockFrameworkMockRecorder) QuerySrvRecords(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) QuerySrvRecords(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QuerySrvRecords", reflect.TypeOf((*MockFramework)(nil).QuerySrvRecords), arg0) } @@ -1433,7 +1433,7 @@ func (m *MockFramework) SetLogWriter(arg0 io.Writer) { } // SetLogWriter indicates an expected call of SetLogWriter. -func (mr *MockFrameworkMockRecorder) SetLogWriter(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) SetLogWriter(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogWriter", reflect.TypeOf((*MockFramework)(nil).SetLogWriter), arg0) } @@ -1445,7 +1445,7 @@ func (m *MockFramework) SetLogger(arg0 *logrus.Logger) { } // SetLogger indicates an expected call of SetLogger. -func (mr *MockFrameworkMockRecorder) SetLogger(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) SetLogger(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetLogger", reflect.TypeOf((*MockFramework)(nil).SetLogger), arg0) } @@ -1459,7 +1459,7 @@ func (m *MockFramework) SetupLogging(arg0 bool) error { } // SetupLogging indicates an expected call of SetupLogging. -func (mr *MockFrameworkMockRecorder) SetupLogging(arg0 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) SetupLogging(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetupLogging", reflect.TypeOf((*MockFramework)(nil).SetupLogging), arg0) } @@ -1562,7 +1562,7 @@ func (m *MockFramework) TrySrvLookup(arg0 []string, arg1 srvcache.Server) (srvca } // TrySrvLookup indicates an expected call of TrySrvLookup. -func (mr *MockFrameworkMockRecorder) TrySrvLookup(arg0, arg1 any) *gomock.Call { +func (mr *MockFrameworkMockRecorder) TrySrvLookup(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TrySrvLookup", reflect.TypeOf((*MockFramework)(nil).TrySrvLookup), arg0, arg1) } diff --git a/inter/imocks/request_signer.go b/inter/imocks/request_signer.go index 420a1e8ba..929d412f3 100644 --- a/inter/imocks/request_signer.go +++ b/inter/imocks/request_signer.go @@ -113,7 +113,7 @@ func (m *MockRequestSigner) Sign(ctx context.Context, request []byte, cfg inter. } // Sign indicates an expected call of Sign. -func (mr *MockRequestSignerMockRecorder) Sign(ctx, request, cfg any) *gomock.Call { +func (mr *MockRequestSignerMockRecorder) Sign(ctx, request, cfg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sign", reflect.TypeOf((*MockRequestSigner)(nil).Sign), ctx, request, cfg) } diff --git a/inter/imocks/security.go b/inter/imocks/security.go index a92e74244..9f46721bf 100644 --- a/inter/imocks/security.go +++ b/inter/imocks/security.go @@ -48,7 +48,7 @@ func (m *MockSecurityProvider) CachePublicData(arg0 []byte, arg1 string) error { } // CachePublicData indicates an expected call of CachePublicData. -func (mr *MockSecurityProviderMockRecorder) CachePublicData(arg0, arg1 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) CachePublicData(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CachePublicData", reflect.TypeOf((*MockSecurityProvider)(nil).CachePublicData), arg0, arg1) } @@ -63,7 +63,7 @@ func (m *MockSecurityProvider) CachedPublicData(arg0 string) ([]byte, error) { } // CachedPublicData indicates an expected call of CachedPublicData. -func (mr *MockSecurityProviderMockRecorder) CachedPublicData(arg0 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) CachedPublicData(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CachedPublicData", reflect.TypeOf((*MockSecurityProvider)(nil).CachedPublicData), arg0) } @@ -78,7 +78,7 @@ func (m *MockSecurityProvider) CallerIdentity(arg0 string) (string, error) { } // CallerIdentity indicates an expected call of CallerIdentity. -func (mr *MockSecurityProviderMockRecorder) CallerIdentity(arg0 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) CallerIdentity(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CallerIdentity", reflect.TypeOf((*MockSecurityProvider)(nil).CallerIdentity), arg0) } @@ -106,7 +106,7 @@ func (m *MockSecurityProvider) ChecksumBytes(arg0 []byte) []byte { } // ChecksumBytes indicates an expected call of ChecksumBytes. -func (mr *MockSecurityProviderMockRecorder) ChecksumBytes(arg0 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) ChecksumBytes(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChecksumBytes", reflect.TypeOf((*MockSecurityProvider)(nil).ChecksumBytes), arg0) } @@ -120,7 +120,7 @@ func (m *MockSecurityProvider) ChecksumString(arg0 string) []byte { } // ChecksumString indicates an expected call of ChecksumString. -func (mr *MockSecurityProviderMockRecorder) ChecksumString(arg0 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) ChecksumString(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChecksumString", reflect.TypeOf((*MockSecurityProvider)(nil).ChecksumString), arg0) } @@ -149,7 +149,7 @@ func (m *MockSecurityProvider) Enroll(arg0 context.Context, arg1 time.Duration, } // Enroll indicates an expected call of Enroll. -func (mr *MockSecurityProviderMockRecorder) Enroll(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) Enroll(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Enroll", reflect.TypeOf((*MockSecurityProvider)(nil).Enroll), arg0, arg1, arg2) } @@ -164,7 +164,7 @@ func (m *MockSecurityProvider) HTTPClient(arg0 bool) (*http.Client, error) { } // HTTPClient indicates an expected call of HTTPClient. -func (mr *MockSecurityProviderMockRecorder) HTTPClient(arg0 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) HTTPClient(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HTTPClient", reflect.TypeOf((*MockSecurityProvider)(nil).HTTPClient), arg0) } @@ -206,7 +206,7 @@ func (m *MockSecurityProvider) PrivilegedVerifyByteSignature(arg0, arg1 []byte, } // PrivilegedVerifyByteSignature indicates an expected call of PrivilegedVerifyByteSignature. -func (mr *MockSecurityProviderMockRecorder) PrivilegedVerifyByteSignature(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) PrivilegedVerifyByteSignature(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PrivilegedVerifyByteSignature", reflect.TypeOf((*MockSecurityProvider)(nil).PrivilegedVerifyByteSignature), arg0, arg1, arg2) } @@ -220,7 +220,7 @@ func (m *MockSecurityProvider) PrivilegedVerifyStringSignature(arg0 string, arg1 } // PrivilegedVerifyStringSignature indicates an expected call of PrivilegedVerifyStringSignature. -func (mr *MockSecurityProviderMockRecorder) PrivilegedVerifyStringSignature(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) PrivilegedVerifyStringSignature(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PrivilegedVerifyStringSignature", reflect.TypeOf((*MockSecurityProvider)(nil).PrivilegedVerifyStringSignature), arg0, arg1, arg2) } @@ -294,7 +294,7 @@ func (m *MockSecurityProvider) RemoteSignRequest(arg0 context.Context, arg1 []by } // RemoteSignRequest indicates an expected call of RemoteSignRequest. -func (mr *MockSecurityProviderMockRecorder) RemoteSignRequest(arg0, arg1 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) RemoteSignRequest(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoteSignRequest", reflect.TypeOf((*MockSecurityProvider)(nil).RemoteSignRequest), arg0, arg1) } @@ -324,7 +324,7 @@ func (m *MockSecurityProvider) SignBytes(arg0 []byte) ([]byte, error) { } // SignBytes indicates an expected call of SignBytes. -func (mr *MockSecurityProviderMockRecorder) SignBytes(arg0 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) SignBytes(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SignBytes", reflect.TypeOf((*MockSecurityProvider)(nil).SignBytes), arg0) } @@ -339,7 +339,7 @@ func (m *MockSecurityProvider) SignString(arg0 string) ([]byte, error) { } // SignString indicates an expected call of SignString. -func (mr *MockSecurityProviderMockRecorder) SignString(arg0 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) SignString(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SignString", reflect.TypeOf((*MockSecurityProvider)(nil).SignString), arg0) } @@ -383,7 +383,7 @@ func (m *MockSecurityProvider) VerifyByteSignature(arg0, arg1 []byte, arg2 strin } // VerifyByteSignature indicates an expected call of VerifyByteSignature. -func (mr *MockSecurityProviderMockRecorder) VerifyByteSignature(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) VerifyByteSignature(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VerifyByteSignature", reflect.TypeOf((*MockSecurityProvider)(nil).VerifyByteSignature), arg0, arg1, arg2) } @@ -397,7 +397,7 @@ func (m *MockSecurityProvider) VerifyCertificate(arg0 []byte, arg1 string) error } // VerifyCertificate indicates an expected call of VerifyCertificate. -func (mr *MockSecurityProviderMockRecorder) VerifyCertificate(arg0, arg1 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) VerifyCertificate(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VerifyCertificate", reflect.TypeOf((*MockSecurityProvider)(nil).VerifyCertificate), arg0, arg1) } @@ -411,7 +411,7 @@ func (m *MockSecurityProvider) VerifyStringSignature(arg0 string, arg1 []byte, a } // VerifyStringSignature indicates an expected call of VerifyStringSignature. -func (mr *MockSecurityProviderMockRecorder) VerifyStringSignature(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockSecurityProviderMockRecorder) VerifyStringSignature(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VerifyStringSignature", reflect.TypeOf((*MockSecurityProvider)(nil).VerifyStringSignature), arg0, arg1, arg2) }