diff --git a/go.mod b/go.mod index f7a570e99..6a5dbd394 100644 --- a/go.mod +++ b/go.mod @@ -4,15 +4,15 @@ go 1.25.0 require ( github.com/ProtonMail/go-srp v0.0.7 - github.com/amnezia-vpn/amneziawg-go v0.2.18 + github.com/amnezia-vpn/amneziawg-go v0.2.19 github.com/breml/rootcerts v0.3.4 github.com/fatih/color v1.18.0 - github.com/golang/mock v1.6.0 github.com/jsimonetti/rtnetlink v1.4.2 github.com/klauspost/compress v1.18.4 github.com/klauspost/pgzip v1.2.6 github.com/mdlayher/genetlink v1.4.0 github.com/mdlayher/netlink v1.9.0 + github.com/miekg/dns v1.1.62 github.com/pelletier/go-toml/v2 v2.2.4 github.com/qdm12/dns/v2 v2.0.0-rc9.0.20260421173011-9de8e7fdbe3a github.com/qdm12/gluetun-servers v0.1.0 @@ -27,6 +27,7 @@ require ( github.com/ti-mo/netfilter v0.5.3 github.com/ulikunitz/xz v0.5.15 github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a + go.uber.org/mock v0.6.0 golang.org/x/net v0.55.0 golang.org/x/sys v0.45.0 golang.org/x/text v0.38.0 @@ -47,7 +48,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mdlayher/socket v0.6.0 // indirect - github.com/miekg/dns v1.1.62 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/go.sum b/go.sum index e1b8807b3..adcd7f281 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/ProtonMail/go-crypto v1.3.0-proton h1:tAQKQRZX/73VmzK6yHSCaRUOvS/3OYS github.com/ProtonMail/go-crypto v1.3.0-proton/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE= github.com/ProtonMail/go-srp v0.0.7 h1:Sos3Qk+th4tQR64vsxGIxYpN3rdnG9Wf9K4ZloC1JrI= github.com/ProtonMail/go-srp v0.0.7/go.mod h1:giCp+7qRnMIcCvI6V6U3S1lDDXDQYx2ewJ6F/9wdlJk= -github.com/amnezia-vpn/amneziawg-go v0.2.18 h1:pUn7/P8qdGmHd6JmE3bCQXPblZs3vruWR98nLODQLJg= -github.com/amnezia-vpn/amneziawg-go v0.2.18/go.mod h1:aMgOk9MuX0xI7b5TKAYp8pLM54RlXcOPzDvYw3YEO5A= +github.com/amnezia-vpn/amneziawg-go v0.2.19 h1:l3rOmrA4o5z38kpgnA5iSk1yOm7Cv3AafIi4vxpSEV0= +github.com/amnezia-vpn/amneziawg-go v0.2.19/go.mod h1:aMgOk9MuX0xI7b5TKAYp8pLM54RlXcOPzDvYw3YEO5A= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/breml/rootcerts v0.3.4 h1:9i7WNl/ctd9OEAOaTfLy//Wrlfxq/tRQ7v4okYFN9Ys= @@ -111,12 +111,12 @@ github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY= github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk= github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4= -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= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= @@ -124,7 +124,6 @@ golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= -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.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= @@ -132,14 +131,12 @@ golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= 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-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/sync v0.0.0-20190423024810-112230192c58/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-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM= @@ -147,8 +144,6 @@ golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -173,14 +168,11 @@ golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -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.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8= golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI= golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4= diff --git a/internal/amneziawg/log_mock_test.go b/internal/amneziawg/log_mock_test.go index 1d4153f88..4eca2a536 100644 --- a/internal/amneziawg/log_mock_test.go +++ b/internal/amneziawg/log_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/amneziawg (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=log_mock_test.go -package amneziawg . Logger +// // Package amneziawg is a generated GoMock package. package amneziawg @@ -7,13 +12,14 @@ package amneziawg import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -34,71 +40,71 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { } // Debug mocks base method. -func (m *MockLogger) Debug(arg0 string) { +func (m *MockLogger) Debug(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Debug", arg0) + m.ctrl.Call(m, "Debug", s) } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), s) } // Debugf mocks base method. -func (m *MockLogger) Debugf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Debugf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{format} + for _, a := range args { varargs = append(varargs, a) } m.ctrl.Call(m, "Debugf", varargs...) } // Debugf indicates an expected call of Debugf. -func (mr *MockLoggerMockRecorder) Debugf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockLogger)(nil).Debugf), varargs...) } // Error mocks base method. -func (m *MockLogger) Error(arg0 string) { +func (m *MockLogger) Error(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Error", arg0) + m.ctrl.Call(m, "Error", s) } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), s) } // Errorf mocks base method. -func (m *MockLogger) Errorf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Errorf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{format} + for _, a := range args { varargs = append(varargs, a) } m.ctrl.Call(m, "Errorf", varargs...) } // Errorf indicates an expected call of Errorf. -func (mr *MockLoggerMockRecorder) Errorf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorf", reflect.TypeOf((*MockLogger)(nil).Errorf), varargs...) } // Info mocks base method. -func (m *MockLogger) Info(arg0 string) { +func (m *MockLogger) Info(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Info", arg0) + m.ctrl.Call(m, "Info", s) } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), s) } diff --git a/internal/amneziawg/netlinker_mock_test.go b/internal/amneziawg/netlinker_mock_test.go index 34c9f2c46..4dc6445b8 100644 --- a/internal/amneziawg/netlinker_mock_test.go +++ b/internal/amneziawg/netlinker_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/amneziawg (interfaces: NetLinker) +// +// Generated by this command: +// +// mockgen -destination=netlinker_mock_test.go -package amneziawg . NetLinker +// // Package amneziawg is a generated GoMock package. package amneziawg @@ -8,14 +13,15 @@ import ( netip "net/netip" reflect "reflect" - gomock "github.com/golang/mock/gomock" netlink "github.com/qdm12/gluetun/internal/netlink" + gomock "go.uber.org/mock/gomock" ) // MockNetLinker is a mock of NetLinker interface. type MockNetLinker struct { ctrl *gomock.Controller recorder *MockNetLinkerMockRecorder + isgomock struct{} } // MockNetLinkerMockRecorder is the mock recorder for MockNetLinker. @@ -36,17 +42,17 @@ func (m *MockNetLinker) EXPECT() *MockNetLinkerMockRecorder { } // AddrReplace mocks base method. -func (m *MockNetLinker) AddrReplace(arg0 uint32, arg1 netip.Prefix) error { +func (m *MockNetLinker) AddrReplace(linkIndex uint32, addr netip.Prefix) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AddrReplace", arg0, arg1) + ret := m.ctrl.Call(m, "AddrReplace", linkIndex, addr) ret0, _ := ret[0].(error) return ret0 } // AddrReplace indicates an expected call of AddrReplace. -func (mr *MockNetLinkerMockRecorder) AddrReplace(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) AddrReplace(linkIndex, addr any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrReplace", reflect.TypeOf((*MockNetLinker)(nil).AddrReplace), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrReplace", reflect.TypeOf((*MockNetLinker)(nil).AddrReplace), linkIndex, addr) } // IsWireguardSupported mocks base method. @@ -65,47 +71,47 @@ func (mr *MockNetLinkerMockRecorder) IsWireguardSupported() *gomock.Call { } // LinkAdd mocks base method. -func (m *MockNetLinker) LinkAdd(arg0 netlink.Link) (uint32, error) { +func (m *MockNetLinker) LinkAdd(link netlink.Link) (uint32, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkAdd", arg0) + ret := m.ctrl.Call(m, "LinkAdd", link) ret0, _ := ret[0].(uint32) ret1, _ := ret[1].(error) return ret0, ret1 } // LinkAdd indicates an expected call of LinkAdd. -func (mr *MockNetLinkerMockRecorder) LinkAdd(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkAdd(link any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkAdd", reflect.TypeOf((*MockNetLinker)(nil).LinkAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkAdd", reflect.TypeOf((*MockNetLinker)(nil).LinkAdd), link) } // LinkByName mocks base method. -func (m *MockNetLinker) LinkByName(arg0 string) (netlink.Link, error) { +func (m *MockNetLinker) LinkByName(name string) (netlink.Link, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkByName", arg0) + ret := m.ctrl.Call(m, "LinkByName", name) ret0, _ := ret[0].(netlink.Link) ret1, _ := ret[1].(error) return ret0, ret1 } // LinkByName indicates an expected call of LinkByName. -func (mr *MockNetLinkerMockRecorder) LinkByName(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkByName(name any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkByName", reflect.TypeOf((*MockNetLinker)(nil).LinkByName), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkByName", reflect.TypeOf((*MockNetLinker)(nil).LinkByName), name) } // LinkDel mocks base method. -func (m *MockNetLinker) LinkDel(arg0 uint32) error { +func (m *MockNetLinker) LinkDel(linkIndex uint32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkDel", arg0) + ret := m.ctrl.Call(m, "LinkDel", linkIndex) ret0, _ := ret[0].(error) return ret0 } // LinkDel indicates an expected call of LinkDel. -func (mr *MockNetLinkerMockRecorder) LinkDel(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkDel(linkIndex any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkDel", reflect.TypeOf((*MockNetLinker)(nil).LinkDel), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkDel", reflect.TypeOf((*MockNetLinker)(nil).LinkDel), linkIndex) } // LinkList mocks base method. @@ -124,86 +130,86 @@ func (mr *MockNetLinkerMockRecorder) LinkList() *gomock.Call { } // LinkSetDown mocks base method. -func (m *MockNetLinker) LinkSetDown(arg0 uint32) error { +func (m *MockNetLinker) LinkSetDown(linkIndex uint32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkSetDown", arg0) + ret := m.ctrl.Call(m, "LinkSetDown", linkIndex) ret0, _ := ret[0].(error) return ret0 } // LinkSetDown indicates an expected call of LinkSetDown. -func (mr *MockNetLinkerMockRecorder) LinkSetDown(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkSetDown(linkIndex any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetDown", reflect.TypeOf((*MockNetLinker)(nil).LinkSetDown), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetDown", reflect.TypeOf((*MockNetLinker)(nil).LinkSetDown), linkIndex) } // LinkSetUp mocks base method. -func (m *MockNetLinker) LinkSetUp(arg0 uint32) error { +func (m *MockNetLinker) LinkSetUp(linkIndex uint32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkSetUp", arg0) + ret := m.ctrl.Call(m, "LinkSetUp", linkIndex) ret0, _ := ret[0].(error) return ret0 } // LinkSetUp indicates an expected call of LinkSetUp. -func (mr *MockNetLinkerMockRecorder) LinkSetUp(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkSetUp(linkIndex any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetUp", reflect.TypeOf((*MockNetLinker)(nil).LinkSetUp), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetUp", reflect.TypeOf((*MockNetLinker)(nil).LinkSetUp), linkIndex) } // RouteAdd mocks base method. -func (m *MockNetLinker) RouteAdd(arg0 netlink.Route) error { +func (m *MockNetLinker) RouteAdd(route netlink.Route) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RouteAdd", arg0) + ret := m.ctrl.Call(m, "RouteAdd", route) ret0, _ := ret[0].(error) return ret0 } // RouteAdd indicates an expected call of RouteAdd. -func (mr *MockNetLinkerMockRecorder) RouteAdd(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RouteAdd(route any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteAdd", reflect.TypeOf((*MockNetLinker)(nil).RouteAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteAdd", reflect.TypeOf((*MockNetLinker)(nil).RouteAdd), route) } // RouteList mocks base method. -func (m *MockNetLinker) RouteList(arg0 byte) ([]netlink.Route, error) { +func (m *MockNetLinker) RouteList(family uint8) ([]netlink.Route, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RouteList", arg0) + ret := m.ctrl.Call(m, "RouteList", family) ret0, _ := ret[0].([]netlink.Route) ret1, _ := ret[1].(error) return ret0, ret1 } // RouteList indicates an expected call of RouteList. -func (mr *MockNetLinkerMockRecorder) RouteList(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RouteList(family any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteList", reflect.TypeOf((*MockNetLinker)(nil).RouteList), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteList", reflect.TypeOf((*MockNetLinker)(nil).RouteList), family) } // RuleAdd mocks base method. -func (m *MockNetLinker) RuleAdd(arg0 netlink.Rule) error { +func (m *MockNetLinker) RuleAdd(rule netlink.Rule) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RuleAdd", arg0) + ret := m.ctrl.Call(m, "RuleAdd", rule) ret0, _ := ret[0].(error) return ret0 } // RuleAdd indicates an expected call of RuleAdd. -func (mr *MockNetLinkerMockRecorder) RuleAdd(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RuleAdd(rule any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleAdd", reflect.TypeOf((*MockNetLinker)(nil).RuleAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleAdd", reflect.TypeOf((*MockNetLinker)(nil).RuleAdd), rule) } // RuleDel mocks base method. -func (m *MockNetLinker) RuleDel(arg0 netlink.Rule) error { +func (m *MockNetLinker) RuleDel(rule netlink.Rule) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RuleDel", arg0) + ret := m.ctrl.Call(m, "RuleDel", rule) ret0, _ := ret[0].(error) return ret0 } // RuleDel indicates an expected call of RuleDel. -func (mr *MockNetLinkerMockRecorder) RuleDel(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RuleDel(rule any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleDel", reflect.TypeOf((*MockNetLinker)(nil).RuleDel), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleDel", reflect.TypeOf((*MockNetLinker)(nil).RuleDel), rule) } diff --git a/internal/cleanup/cleanup_test.go b/internal/cleanup/cleanup_test.go index 7871e1941..74ee426d1 100644 --- a/internal/cleanup/cleanup_test.go +++ b/internal/cleanup/cleanup_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func Test_Cleanups(t *testing.T) { diff --git a/internal/cleanup/mocks_test.go b/internal/cleanup/mocks_test.go index 2f4a7b4dd..897b6a76d 100644 --- a/internal/cleanup/mocks_test.go +++ b/internal/cleanup/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/cleanup (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package=cleanup . Logger +// // Package cleanup is a generated GoMock package. package cleanup @@ -7,13 +12,14 @@ package cleanup import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -40,7 +46,7 @@ func (m *MockLogger) Debug(arg0 string) { } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0) } @@ -52,7 +58,7 @@ func (m *MockLogger) Error(arg0 string) { } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0) } diff --git a/internal/command/mocks_local_test.go b/internal/command/mocks_local_test.go index f8400ab7f..7621a5e7a 100644 --- a/internal/command/mocks_local_test.go +++ b/internal/command/mocks_local_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: interfaces_local.go +// +// Generated by this command: +// +// mockgen -destination=mocks_local_test.go -package=command -source=interfaces_local.go +// // Package command is a generated GoMock package. package command @@ -8,13 +13,14 @@ import ( io "io" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockexecCmd is a mock of execCmd interface. type MockexecCmd struct { ctrl *gomock.Controller recorder *MockexecCmdMockRecorder + isgomock struct{} } // MockexecCmdMockRecorder is the mock recorder for MockexecCmd. diff --git a/internal/command/run_test.go b/internal/command/run_test.go index f3047a3cf..ce3be276e 100644 --- a/internal/command/run_test.go +++ b/internal/command/run_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + gomock "go.uber.org/mock/gomock" ) func Test_run(t *testing.T) { diff --git a/internal/command/start_test.go b/internal/command/start_test.go index fb3464584..087674045 100644 --- a/internal/command/start_test.go +++ b/internal/command/start_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + gomock "go.uber.org/mock/gomock" ) func linesToReadCloser(lines []string) io.ReadCloser { diff --git a/internal/configuration/settings/helpers_test.go b/internal/configuration/settings/helpers_test.go index df93cd937..8ad300e41 100644 --- a/internal/configuration/settings/helpers_test.go +++ b/internal/configuration/settings/helpers_test.go @@ -1,6 +1,6 @@ package settings -import gomock "github.com/golang/mock/gomock" +import gomock "go.uber.org/mock/gomock" type sourceKeyValue struct { key string diff --git a/internal/configuration/settings/mocks_reader_test.go b/internal/configuration/settings/mocks_reader_test.go index b7a1e12f7..16ad6b1bf 100644 --- a/internal/configuration/settings/mocks_reader_test.go +++ b/internal/configuration/settings/mocks_reader_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gosettings/reader (interfaces: Source) +// +// Generated by this command: +// +// mockgen -destination=mocks_reader_test.go -package=settings github.com/qdm12/gosettings/reader Source +// // Package settings is a generated GoMock package. package settings @@ -7,13 +12,14 @@ package settings import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockSource is a mock of Source interface. type MockSource struct { ctrl *gomock.Controller recorder *MockSourceMockRecorder + isgomock struct{} } // MockSourceMockRecorder is the mock recorder for MockSource. @@ -34,32 +40,32 @@ func (m *MockSource) EXPECT() *MockSourceMockRecorder { } // Get mocks base method. -func (m *MockSource) Get(arg0 string) (string, bool) { +func (m *MockSource) Get(key string) (string, bool) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Get", arg0) + ret := m.ctrl.Call(m, "Get", key) ret0, _ := ret[0].(string) ret1, _ := ret[1].(bool) return ret0, ret1 } // Get indicates an expected call of Get. -func (mr *MockSourceMockRecorder) Get(arg0 interface{}) *gomock.Call { +func (mr *MockSourceMockRecorder) Get(key any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockSource)(nil).Get), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockSource)(nil).Get), key) } // KeyTransform mocks base method. -func (m *MockSource) KeyTransform(arg0 string) string { +func (m *MockSource) KeyTransform(key string) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "KeyTransform", arg0) + ret := m.ctrl.Call(m, "KeyTransform", key) ret0, _ := ret[0].(string) return ret0 } // KeyTransform indicates an expected call of KeyTransform. -func (mr *MockSourceMockRecorder) KeyTransform(arg0 interface{}) *gomock.Call { +func (mr *MockSourceMockRecorder) KeyTransform(key any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KeyTransform", reflect.TypeOf((*MockSource)(nil).KeyTransform), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KeyTransform", reflect.TypeOf((*MockSource)(nil).KeyTransform), key) } // String mocks base method. diff --git a/internal/configuration/settings/mocks_test.go b/internal/configuration/settings/mocks_test.go index 8a216c336..d86cdf996 100644 --- a/internal/configuration/settings/mocks_test.go +++ b/internal/configuration/settings/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/configuration/settings (interfaces: Warner) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package=settings . Warner +// // Package settings is a generated GoMock package. package settings @@ -7,13 +12,14 @@ package settings import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockWarner is a mock of Warner interface. type MockWarner struct { ctrl *gomock.Controller recorder *MockWarnerMockRecorder + isgomock struct{} } // MockWarnerMockRecorder is the mock recorder for MockWarner. @@ -34,13 +40,13 @@ func (m *MockWarner) EXPECT() *MockWarnerMockRecorder { } // Warn mocks base method. -func (m *MockWarner) Warn(arg0 string) { +func (m *MockWarner) Warn(message string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Warn", arg0) + m.ctrl.Call(m, "Warn", message) } // Warn indicates an expected call of Warn. -func (mr *MockWarnerMockRecorder) Warn(arg0 interface{}) *gomock.Call { +func (mr *MockWarnerMockRecorder) Warn(message any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockWarner)(nil).Warn), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockWarner)(nil).Warn), message) } diff --git a/internal/configuration/settings/publicip_test.go b/internal/configuration/settings/publicip_test.go index a3c278c2f..0c4522b68 100644 --- a/internal/configuration/settings/publicip_test.go +++ b/internal/configuration/settings/publicip_test.go @@ -3,9 +3,9 @@ package settings import ( "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gosettings/reader" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func Test_PublicIP_read(t *testing.T) { diff --git a/internal/firewall/iptables/cmd_matcher_test.go b/internal/firewall/iptables/cmd_matcher_test.go index 3e4ec317f..84feda95b 100644 --- a/internal/firewall/iptables/cmd_matcher_test.go +++ b/internal/firewall/iptables/cmd_matcher_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "regexp" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" ) var _ gomock.Matcher = (*cmdMatcher)(nil) diff --git a/internal/firewall/iptables/delete_test.go b/internal/firewall/iptables/delete_test.go index a68de6341..219dc699d 100644 --- a/internal/firewall/iptables/delete_test.go +++ b/internal/firewall/iptables/delete_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func Test_isDeleteMatchInstruction(t *testing.T) { diff --git a/internal/firewall/iptables/mocks_test.go b/internal/firewall/iptables/mocks_test.go index 7cb5c607d..5e3a7329b 100644 --- a/internal/firewall/iptables/mocks_test.go +++ b/internal/firewall/iptables/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/firewall/iptables (interfaces: CmdRunner,Logger) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package iptables . CmdRunner,Logger +// // Package iptables is a generated GoMock package. package iptables @@ -8,13 +13,14 @@ import ( exec "os/exec" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockCmdRunner is a mock of CmdRunner interface. type MockCmdRunner struct { ctrl *gomock.Controller recorder *MockCmdRunnerMockRecorder + isgomock struct{} } // MockCmdRunnerMockRecorder is the mock recorder for MockCmdRunner. @@ -35,24 +41,25 @@ func (m *MockCmdRunner) EXPECT() *MockCmdRunnerMockRecorder { } // Run mocks base method. -func (m *MockCmdRunner) Run(arg0 *exec.Cmd) (string, error) { +func (m *MockCmdRunner) Run(cmd *exec.Cmd) (string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Run", arg0) + ret := m.ctrl.Call(m, "Run", cmd) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) return ret0, ret1 } // Run indicates an expected call of Run. -func (mr *MockCmdRunnerMockRecorder) Run(arg0 interface{}) *gomock.Call { +func (mr *MockCmdRunnerMockRecorder) Run(cmd any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockCmdRunner)(nil).Run), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockCmdRunner)(nil).Run), cmd) } // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -73,25 +80,25 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { } // Debug mocks base method. -func (m *MockLogger) Debug(arg0 string) { +func (m *MockLogger) Debug(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Debug", arg0) + m.ctrl.Call(m, "Debug", s) } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), s) } // Warn mocks base method. -func (m *MockLogger) Warn(arg0 string) { +func (m *MockLogger) Warn(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Warn", arg0) + m.ctrl.Call(m, "Warn", s) } // Warn indicates an expected call of Warn. -func (mr *MockLoggerMockRecorder) Warn(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warn(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), s) } diff --git a/internal/firewall/iptables/support_test.go b/internal/firewall/iptables/support_test.go index 6740d55d2..da32ea8ab 100644 --- a/internal/firewall/iptables/support_test.go +++ b/internal/firewall/iptables/support_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func newAppendTestRuleMatcher(path string) *cmdMatcher { diff --git a/internal/httpserver/helpers_test.go b/internal/httpserver/helpers_test.go index 6c02bdb1f..dd7dfa3a3 100644 --- a/internal/httpserver/helpers_test.go +++ b/internal/httpserver/helpers_test.go @@ -3,7 +3,7 @@ package httpserver import ( "regexp" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) var _ Logger = (*testLogger)(nil) diff --git a/internal/httpserver/logger_mock_test.go b/internal/httpserver/logger_mock_test.go index 6099c87c5..541aecfe0 100644 --- a/internal/httpserver/logger_mock_test.go +++ b/internal/httpserver/logger_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/httpserver (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=logger_mock_test.go -package httpserver . Logger +// // Package httpserver is a generated GoMock package. package httpserver @@ -7,13 +12,14 @@ package httpserver import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -34,37 +40,37 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { } // Error mocks base method. -func (m *MockLogger) Error(arg0 string) { +func (m *MockLogger) Error(msg string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Error", arg0) + m.ctrl.Call(m, "Error", msg) } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(msg any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), msg) } // Info mocks base method. -func (m *MockLogger) Info(arg0 string) { +func (m *MockLogger) Info(msg string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Info", arg0) + m.ctrl.Call(m, "Info", msg) } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(msg any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), msg) } // Warn mocks base method. -func (m *MockLogger) Warn(arg0 string) { +func (m *MockLogger) Warn(msg string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Warn", arg0) + m.ctrl.Call(m, "Warn", msg) } // Warn indicates an expected call of Warn. -func (mr *MockLoggerMockRecorder) Warn(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warn(msg any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), msg) } diff --git a/internal/httpserver/run_test.go b/internal/httpserver/run_test.go index e546b1127..fdab5e2c3 100644 --- a/internal/httpserver/run_test.go +++ b/internal/httpserver/run_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + gomock "go.uber.org/mock/gomock" ) func Test_Server_Run_success(t *testing.T) { diff --git a/internal/netlink/ipv6_test.go b/internal/netlink/ipv6_test.go index d04d1f971..66d36130f 100644 --- a/internal/netlink/ipv6_test.go +++ b/internal/netlink/ipv6_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + gomock "go.uber.org/mock/gomock" ) func isIPv6LocallySupported() bool { diff --git a/internal/netlink/mocks_test.go b/internal/netlink/mocks_test.go index 353816d8e..73728819f 100644 --- a/internal/netlink/mocks_test.go +++ b/internal/netlink/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/netlink (interfaces: Firewall) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package=netlink . Firewall +// // Package netlink is a generated GoMock package. package netlink @@ -9,13 +14,14 @@ import ( netip "net/netip" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockFirewall is a mock of Firewall interface. type MockFirewall struct { ctrl *gomock.Controller recorder *MockFirewallMockRecorder + isgomock struct{} } // MockFirewallMockRecorder is the mock recorder for MockFirewall. @@ -36,15 +42,15 @@ func (m *MockFirewall) EXPECT() *MockFirewallMockRecorder { } // AcceptOutput mocks base method. -func (m *MockFirewall) AcceptOutput(arg0 context.Context, arg1, arg2 string, arg3 netip.Addr, arg4 uint16, arg5 bool) error { +func (m *MockFirewall) AcceptOutput(ctx context.Context, protocol, intf string, ip netip.Addr, port uint16, remove bool) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AcceptOutput", arg0, arg1, arg2, arg3, arg4, arg5) + ret := m.ctrl.Call(m, "AcceptOutput", ctx, protocol, intf, ip, port, remove) ret0, _ := ret[0].(error) return ret0 } // AcceptOutput indicates an expected call of AcceptOutput. -func (mr *MockFirewallMockRecorder) AcceptOutput(arg0, arg1, arg2, arg3, arg4, arg5 interface{}) *gomock.Call { +func (mr *MockFirewallMockRecorder) AcceptOutput(ctx, protocol, intf, ip, port, remove any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AcceptOutput", reflect.TypeOf((*MockFirewall)(nil).AcceptOutput), arg0, arg1, arg2, arg3, arg4, arg5) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AcceptOutput", reflect.TypeOf((*MockFirewall)(nil).AcceptOutput), ctx, protocol, intf, ip, port, remove) } diff --git a/internal/pmtud/tcp/mocks_test.go b/internal/pmtud/tcp/mocks_test.go index 4766e4f4b..a176b335d 100644 --- a/internal/pmtud/tcp/mocks_test.go +++ b/internal/pmtud/tcp/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/pmtud/tcp (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package=tcp . Logger +// // Package tcp is a generated GoMock package. package tcp @@ -7,13 +12,14 @@ package tcp import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -34,47 +40,47 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { } // Debug mocks base method. -func (m *MockLogger) Debug(arg0 string) { +func (m *MockLogger) Debug(msg string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Debug", arg0) + m.ctrl.Call(m, "Debug", msg) } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(msg any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), msg) } // Debugf mocks base method. -func (m *MockLogger) Debugf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Debugf(msg string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{msg} + for _, a := range args { varargs = append(varargs, a) } m.ctrl.Call(m, "Debugf", varargs...) } // Debugf indicates an expected call of Debugf. -func (mr *MockLoggerMockRecorder) Debugf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugf(msg any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{msg}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockLogger)(nil).Debugf), varargs...) } // Warnf mocks base method. -func (m *MockLogger) Warnf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Warnf(msg string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{msg} + for _, a := range args { varargs = append(varargs, a) } m.ctrl.Call(m, "Warnf", varargs...) } // Warnf indicates an expected call of Warnf. -func (mr *MockLoggerMockRecorder) Warnf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnf(msg any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{msg}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnf", reflect.TypeOf((*MockLogger)(nil).Warnf), varargs...) } diff --git a/internal/pmtud/tcp/tcp_test.go b/internal/pmtud/tcp/tcp_test.go index 2d286c4e0..8c8cf90ec 100644 --- a/internal/pmtud/tcp/tcp_test.go +++ b/internal/pmtud/tcp/tcp_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - gomock "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/netlink" "github.com/qdm12/gluetun/internal/pmtud/constants" "github.com/qdm12/gluetun/internal/pmtud/ip" "github.com/stretchr/testify/require" + gomock "go.uber.org/mock/gomock" ) func Test_runTest(t *testing.T) { diff --git a/internal/portforward/service/command_test.go b/internal/portforward/service/command_test.go index 2e1e719f5..c9943b7b0 100644 --- a/internal/portforward/service/command_test.go +++ b/internal/portforward/service/command_test.go @@ -6,9 +6,9 @@ import ( "context" "testing" - gomock "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/command" "github.com/stretchr/testify/require" + gomock "go.uber.org/mock/gomock" ) func Test_Service_runCommand(t *testing.T) { diff --git a/internal/portforward/service/mocks_test.go b/internal/portforward/service/mocks_test.go index 69fa3a0ce..272ee2eaa 100644 --- a/internal/portforward/service/mocks_test.go +++ b/internal/portforward/service/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/portforward/service (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package=service . Logger +// // Package service is a generated GoMock package. package service @@ -7,13 +12,14 @@ package service import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -34,49 +40,49 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { } // Debug mocks base method. -func (m *MockLogger) Debug(arg0 string) { +func (m *MockLogger) Debug(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Debug", arg0) + m.ctrl.Call(m, "Debug", s) } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), s) } // Error mocks base method. -func (m *MockLogger) Error(arg0 string) { +func (m *MockLogger) Error(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Error", arg0) + m.ctrl.Call(m, "Error", s) } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), s) } // Info mocks base method. -func (m *MockLogger) Info(arg0 string) { +func (m *MockLogger) Info(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Info", arg0) + m.ctrl.Call(m, "Info", s) } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), s) } // Warn mocks base method. -func (m *MockLogger) Warn(arg0 string) { +func (m *MockLogger) Warn(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Warn", arg0) + m.ctrl.Call(m, "Warn", s) } // Warn indicates an expected call of Warn. -func (mr *MockLoggerMockRecorder) Warn(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warn(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), s) } diff --git a/internal/pprof/helpers_test.go b/internal/pprof/helpers_test.go index 740d0a0ce..878a7db55 100644 --- a/internal/pprof/helpers_test.go +++ b/internal/pprof/helpers_test.go @@ -3,7 +3,7 @@ package pprof import ( "regexp" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) func boolPtr(b bool) *bool { return &b } diff --git a/internal/pprof/logger_mock_test.go b/internal/pprof/logger_mock_test.go index 62e8d4a49..37cf3376c 100644 --- a/internal/pprof/logger_mock_test.go +++ b/internal/pprof/logger_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/httpserver (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=logger_mock_test.go -package pprof github.com/qdm12/gluetun/internal/httpserver Logger +// // Package pprof is a generated GoMock package. package pprof @@ -7,13 +12,14 @@ package pprof import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -34,37 +40,37 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { } // Error mocks base method. -func (m *MockLogger) Error(arg0 string) { +func (m *MockLogger) Error(msg string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Error", arg0) + m.ctrl.Call(m, "Error", msg) } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(msg any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), msg) } // Info mocks base method. -func (m *MockLogger) Info(arg0 string) { +func (m *MockLogger) Info(msg string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Info", arg0) + m.ctrl.Call(m, "Info", msg) } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(msg any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), msg) } // Warn mocks base method. -func (m *MockLogger) Warn(arg0 string) { +func (m *MockLogger) Warn(msg string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Warn", arg0) + m.ctrl.Call(m, "Warn", msg) } // Warn indicates an expected call of Warn. -func (mr *MockLoggerMockRecorder) Warn(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warn(msg any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), msg) } diff --git a/internal/pprof/server_test.go b/internal/pprof/server_test.go index 83d3fb9b6..35d607757 100644 --- a/internal/pprof/server_test.go +++ b/internal/pprof/server_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/httpserver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) //go:generate mockgen -destination=logger_mock_test.go -package $GOPACKAGE github.com/qdm12/gluetun/internal/httpserver Logger diff --git a/internal/provider/common/mocks.go b/internal/provider/common/mocks.go index d7ddaa1af..2ae356330 100644 --- a/internal/provider/common/mocks.go +++ b/internal/provider/common/mocks.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/provider/common (interfaces: ParallelResolver,Storage,Unzipper,Warner) +// +// Generated by this command: +// +// mockgen -destination=mocks.go -package common . ParallelResolver,Storage,Unzipper,Warner +// // Package common is a generated GoMock package. package common @@ -9,16 +14,17 @@ import ( netip "net/netip" reflect "reflect" - gomock "github.com/golang/mock/gomock" settings "github.com/qdm12/gluetun/internal/configuration/settings" models "github.com/qdm12/gluetun/internal/models" resolver "github.com/qdm12/gluetun/internal/updater/resolver" + gomock "go.uber.org/mock/gomock" ) // MockParallelResolver is a mock of ParallelResolver interface. type MockParallelResolver struct { ctrl *gomock.Controller recorder *MockParallelResolverMockRecorder + isgomock struct{} } // MockParallelResolverMockRecorder is the mock recorder for MockParallelResolver. @@ -39,9 +45,9 @@ func (m *MockParallelResolver) EXPECT() *MockParallelResolverMockRecorder { } // Resolve mocks base method. -func (m *MockParallelResolver) Resolve(arg0 context.Context, arg1 resolver.ParallelSettings) (map[string][]netip.Addr, []string, error) { +func (m *MockParallelResolver) Resolve(ctx context.Context, arg1 resolver.ParallelSettings) (map[string][]netip.Addr, []string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Resolve", arg0, arg1) + ret := m.ctrl.Call(m, "Resolve", ctx, arg1) ret0, _ := ret[0].(map[string][]netip.Addr) ret1, _ := ret[1].([]string) ret2, _ := ret[2].(error) @@ -49,15 +55,16 @@ func (m *MockParallelResolver) Resolve(arg0 context.Context, arg1 resolver.Paral } // Resolve indicates an expected call of Resolve. -func (mr *MockParallelResolverMockRecorder) Resolve(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockParallelResolverMockRecorder) Resolve(ctx, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Resolve", reflect.TypeOf((*MockParallelResolver)(nil).Resolve), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Resolve", reflect.TypeOf((*MockParallelResolver)(nil).Resolve), ctx, arg1) } // MockStorage is a mock of Storage interface. type MockStorage struct { ctrl *gomock.Controller recorder *MockStorageMockRecorder + isgomock struct{} } // MockStorageMockRecorder is the mock recorder for MockStorage. @@ -78,24 +85,25 @@ func (m *MockStorage) EXPECT() *MockStorageMockRecorder { } // FilterServers mocks base method. -func (m *MockStorage) FilterServers(arg0 string, arg1 settings.ServerSelection) ([]models.Server, error) { +func (m *MockStorage) FilterServers(provider string, selection settings.ServerSelection) ([]models.Server, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "FilterServers", arg0, arg1) + ret := m.ctrl.Call(m, "FilterServers", provider, selection) ret0, _ := ret[0].([]models.Server) ret1, _ := ret[1].(error) return ret0, ret1 } // FilterServers indicates an expected call of FilterServers. -func (mr *MockStorageMockRecorder) FilterServers(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockStorageMockRecorder) FilterServers(provider, selection any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FilterServers", reflect.TypeOf((*MockStorage)(nil).FilterServers), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FilterServers", reflect.TypeOf((*MockStorage)(nil).FilterServers), provider, selection) } // MockUnzipper is a mock of Unzipper interface. type MockUnzipper struct { ctrl *gomock.Controller recorder *MockUnzipperMockRecorder + isgomock struct{} } // MockUnzipperMockRecorder is the mock recorder for MockUnzipper. @@ -116,24 +124,25 @@ func (m *MockUnzipper) EXPECT() *MockUnzipperMockRecorder { } // FetchAndExtract mocks base method. -func (m *MockUnzipper) FetchAndExtract(arg0 context.Context, arg1 string) (map[string][]byte, error) { +func (m *MockUnzipper) FetchAndExtract(ctx context.Context, url string) (map[string][]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "FetchAndExtract", arg0, arg1) + ret := m.ctrl.Call(m, "FetchAndExtract", ctx, url) ret0, _ := ret[0].(map[string][]byte) ret1, _ := ret[1].(error) return ret0, ret1 } // FetchAndExtract indicates an expected call of FetchAndExtract. -func (mr *MockUnzipperMockRecorder) FetchAndExtract(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockUnzipperMockRecorder) FetchAndExtract(ctx, url any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchAndExtract", reflect.TypeOf((*MockUnzipper)(nil).FetchAndExtract), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchAndExtract", reflect.TypeOf((*MockUnzipper)(nil).FetchAndExtract), ctx, url) } // MockWarner is a mock of Warner interface. type MockWarner struct { ctrl *gomock.Controller recorder *MockWarnerMockRecorder + isgomock struct{} } // MockWarnerMockRecorder is the mock recorder for MockWarner. @@ -154,13 +163,13 @@ func (m *MockWarner) EXPECT() *MockWarnerMockRecorder { } // Warn mocks base method. -func (m *MockWarner) Warn(arg0 string) { +func (m *MockWarner) Warn(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Warn", arg0) + m.ctrl.Call(m, "Warn", s) } // Warn indicates an expected call of Warn. -func (mr *MockWarnerMockRecorder) Warn(arg0 interface{}) *gomock.Call { +func (mr *MockWarnerMockRecorder) Warn(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockWarner)(nil).Warn), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockWarner)(nil).Warn), s) } diff --git a/internal/provider/expressvpn/connection_test.go b/internal/provider/expressvpn/connection_test.go index 952876635..1ade5db46 100644 --- a/internal/provider/expressvpn/connection_test.go +++ b/internal/provider/expressvpn/connection_test.go @@ -5,7 +5,6 @@ import ( "net/netip" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants/providers" @@ -13,6 +12,7 @@ import ( "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/common" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func Test_Provider_GetConnection(t *testing.T) { diff --git a/internal/provider/ipvanish/updater/servers_test.go b/internal/provider/ipvanish/updater/servers_test.go index d416a5fec..b50f47c0e 100644 --- a/internal/provider/ipvanish/updater/servers_test.go +++ b/internal/provider/ipvanish/updater/servers_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/constants/vpn" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/common" "github.com/qdm12/gluetun/internal/updater/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) func Test_Updater_GetServers(t *testing.T) { diff --git a/internal/provider/ivpn/connection_test.go b/internal/provider/ivpn/connection_test.go index 10f251b70..5eeaf74ab 100644 --- a/internal/provider/ivpn/connection_test.go +++ b/internal/provider/ivpn/connection_test.go @@ -6,7 +6,6 @@ import ( "net/netip" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants/providers" @@ -14,6 +13,7 @@ import ( "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/common" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func Test_Provider_GetConnection(t *testing.T) { diff --git a/internal/provider/ivpn/updater/servers_test.go b/internal/provider/ivpn/updater/servers_test.go index 68a709e33..a087d258d 100644 --- a/internal/provider/ivpn/updater/servers_test.go +++ b/internal/provider/ivpn/updater/servers_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/constants/vpn" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/common" "github.com/qdm12/gluetun/internal/updater/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) func Test_Updater_GetServers(t *testing.T) { diff --git a/internal/provider/mullvad/connection_test.go b/internal/provider/mullvad/connection_test.go index ccdf4a0dd..bb59e333b 100644 --- a/internal/provider/mullvad/connection_test.go +++ b/internal/provider/mullvad/connection_test.go @@ -6,7 +6,6 @@ import ( "net/netip" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants/providers" @@ -14,6 +13,7 @@ import ( "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/common" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func Test_Provider_GetConnection(t *testing.T) { diff --git a/internal/provider/utils/connection_test.go b/internal/provider/utils/connection_test.go index 94d9392f7..9e0ee346b 100644 --- a/internal/provider/utils/connection_test.go +++ b/internal/provider/utils/connection_test.go @@ -6,7 +6,6 @@ import ( "net/netip" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants/providers" @@ -14,6 +13,7 @@ import ( "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/common" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func Test_GetConnection(t *testing.T) { diff --git a/internal/provider/vpnsecure/updater/website_test.go b/internal/provider/vpnsecure/updater/website_test.go index ac4c0aea1..ea3c620e8 100644 --- a/internal/provider/vpnsecure/updater/website_test.go +++ b/internal/provider/vpnsecure/updater/website_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/common" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" "golang.org/x/net/html" ) diff --git a/internal/provider/windscribe/connection_test.go b/internal/provider/windscribe/connection_test.go index ce4f8cc41..621624723 100644 --- a/internal/provider/windscribe/connection_test.go +++ b/internal/provider/windscribe/connection_test.go @@ -6,7 +6,6 @@ import ( "net/netip" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants/providers" @@ -14,6 +13,7 @@ import ( "github.com/qdm12/gluetun/internal/models" "github.com/qdm12/gluetun/internal/provider/common" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func Test_Provider_GetConnection(t *testing.T) { diff --git a/internal/routing/mocks_test.go b/internal/routing/mocks_test.go index 1eccf1471..f7f9af846 100644 --- a/internal/routing/mocks_test.go +++ b/internal/routing/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/routing (interfaces: NetLinker) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package=routing . NetLinker +// // Package routing is a generated GoMock package. package routing @@ -8,14 +13,15 @@ import ( netip "net/netip" reflect "reflect" - gomock "github.com/golang/mock/gomock" netlink "github.com/qdm12/gluetun/internal/netlink" + gomock "go.uber.org/mock/gomock" ) // MockNetLinker is a mock of NetLinker interface. type MockNetLinker struct { ctrl *gomock.Controller recorder *MockNetLinkerMockRecorder + isgomock struct{} } // MockNetLinkerMockRecorder is the mock recorder for MockNetLinker. @@ -36,91 +42,91 @@ func (m *MockNetLinker) EXPECT() *MockNetLinkerMockRecorder { } // AddrList mocks base method. -func (m *MockNetLinker) AddrList(arg0 uint32, arg1 byte) ([]netip.Prefix, error) { +func (m *MockNetLinker) AddrList(linkIndex uint32, family uint8) ([]netip.Prefix, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AddrList", arg0, arg1) + ret := m.ctrl.Call(m, "AddrList", linkIndex, family) ret0, _ := ret[0].([]netip.Prefix) ret1, _ := ret[1].(error) return ret0, ret1 } // AddrList indicates an expected call of AddrList. -func (mr *MockNetLinkerMockRecorder) AddrList(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) AddrList(linkIndex, family any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrList", reflect.TypeOf((*MockNetLinker)(nil).AddrList), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrList", reflect.TypeOf((*MockNetLinker)(nil).AddrList), linkIndex, family) } // AddrReplace mocks base method. -func (m *MockNetLinker) AddrReplace(arg0 uint32, arg1 netip.Prefix) error { +func (m *MockNetLinker) AddrReplace(linkIndex uint32, prefix netip.Prefix) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AddrReplace", arg0, arg1) + ret := m.ctrl.Call(m, "AddrReplace", linkIndex, prefix) ret0, _ := ret[0].(error) return ret0 } // AddrReplace indicates an expected call of AddrReplace. -func (mr *MockNetLinkerMockRecorder) AddrReplace(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) AddrReplace(linkIndex, prefix any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrReplace", reflect.TypeOf((*MockNetLinker)(nil).AddrReplace), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrReplace", reflect.TypeOf((*MockNetLinker)(nil).AddrReplace), linkIndex, prefix) } // LinkAdd mocks base method. -func (m *MockNetLinker) LinkAdd(arg0 netlink.Link) (uint32, error) { +func (m *MockNetLinker) LinkAdd(link netlink.Link) (uint32, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkAdd", arg0) + ret := m.ctrl.Call(m, "LinkAdd", link) ret0, _ := ret[0].(uint32) ret1, _ := ret[1].(error) return ret0, ret1 } // LinkAdd indicates an expected call of LinkAdd. -func (mr *MockNetLinkerMockRecorder) LinkAdd(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkAdd(link any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkAdd", reflect.TypeOf((*MockNetLinker)(nil).LinkAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkAdd", reflect.TypeOf((*MockNetLinker)(nil).LinkAdd), link) } // LinkByIndex mocks base method. -func (m *MockNetLinker) LinkByIndex(arg0 uint32) (netlink.Link, error) { +func (m *MockNetLinker) LinkByIndex(index uint32) (netlink.Link, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkByIndex", arg0) + ret := m.ctrl.Call(m, "LinkByIndex", index) ret0, _ := ret[0].(netlink.Link) ret1, _ := ret[1].(error) return ret0, ret1 } // LinkByIndex indicates an expected call of LinkByIndex. -func (mr *MockNetLinkerMockRecorder) LinkByIndex(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkByIndex(index any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkByIndex", reflect.TypeOf((*MockNetLinker)(nil).LinkByIndex), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkByIndex", reflect.TypeOf((*MockNetLinker)(nil).LinkByIndex), index) } // LinkByName mocks base method. -func (m *MockNetLinker) LinkByName(arg0 string) (netlink.Link, error) { +func (m *MockNetLinker) LinkByName(name string) (netlink.Link, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkByName", arg0) + ret := m.ctrl.Call(m, "LinkByName", name) ret0, _ := ret[0].(netlink.Link) ret1, _ := ret[1].(error) return ret0, ret1 } // LinkByName indicates an expected call of LinkByName. -func (mr *MockNetLinkerMockRecorder) LinkByName(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkByName(name any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkByName", reflect.TypeOf((*MockNetLinker)(nil).LinkByName), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkByName", reflect.TypeOf((*MockNetLinker)(nil).LinkByName), name) } // LinkDel mocks base method. -func (m *MockNetLinker) LinkDel(arg0 uint32) error { +func (m *MockNetLinker) LinkDel(index uint32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkDel", arg0) + ret := m.ctrl.Call(m, "LinkDel", index) ret0, _ := ret[0].(error) return ret0 } // LinkDel indicates an expected call of LinkDel. -func (mr *MockNetLinkerMockRecorder) LinkDel(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkDel(index any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkDel", reflect.TypeOf((*MockNetLinker)(nil).LinkDel), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkDel", reflect.TypeOf((*MockNetLinker)(nil).LinkDel), index) } // LinkList mocks base method. @@ -139,129 +145,129 @@ func (mr *MockNetLinkerMockRecorder) LinkList() *gomock.Call { } // LinkSetDown mocks base method. -func (m *MockNetLinker) LinkSetDown(arg0 uint32) error { +func (m *MockNetLinker) LinkSetDown(index uint32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkSetDown", arg0) + ret := m.ctrl.Call(m, "LinkSetDown", index) ret0, _ := ret[0].(error) return ret0 } // LinkSetDown indicates an expected call of LinkSetDown. -func (mr *MockNetLinkerMockRecorder) LinkSetDown(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkSetDown(index any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetDown", reflect.TypeOf((*MockNetLinker)(nil).LinkSetDown), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetDown", reflect.TypeOf((*MockNetLinker)(nil).LinkSetDown), index) } // LinkSetUp mocks base method. -func (m *MockNetLinker) LinkSetUp(arg0 uint32) error { +func (m *MockNetLinker) LinkSetUp(index uint32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkSetUp", arg0) + ret := m.ctrl.Call(m, "LinkSetUp", index) ret0, _ := ret[0].(error) return ret0 } // LinkSetUp indicates an expected call of LinkSetUp. -func (mr *MockNetLinkerMockRecorder) LinkSetUp(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkSetUp(index any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetUp", reflect.TypeOf((*MockNetLinker)(nil).LinkSetUp), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetUp", reflect.TypeOf((*MockNetLinker)(nil).LinkSetUp), index) } // RouteAdd mocks base method. -func (m *MockNetLinker) RouteAdd(arg0 netlink.Route) error { +func (m *MockNetLinker) RouteAdd(route netlink.Route) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RouteAdd", arg0) + ret := m.ctrl.Call(m, "RouteAdd", route) ret0, _ := ret[0].(error) return ret0 } // RouteAdd indicates an expected call of RouteAdd. -func (mr *MockNetLinkerMockRecorder) RouteAdd(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RouteAdd(route any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteAdd", reflect.TypeOf((*MockNetLinker)(nil).RouteAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteAdd", reflect.TypeOf((*MockNetLinker)(nil).RouteAdd), route) } // RouteDel mocks base method. -func (m *MockNetLinker) RouteDel(arg0 netlink.Route) error { +func (m *MockNetLinker) RouteDel(route netlink.Route) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RouteDel", arg0) + ret := m.ctrl.Call(m, "RouteDel", route) ret0, _ := ret[0].(error) return ret0 } // RouteDel indicates an expected call of RouteDel. -func (mr *MockNetLinkerMockRecorder) RouteDel(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RouteDel(route any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteDel", reflect.TypeOf((*MockNetLinker)(nil).RouteDel), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteDel", reflect.TypeOf((*MockNetLinker)(nil).RouteDel), route) } // RouteList mocks base method. -func (m *MockNetLinker) RouteList(arg0 byte) ([]netlink.Route, error) { +func (m *MockNetLinker) RouteList(family uint8) ([]netlink.Route, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RouteList", arg0) + ret := m.ctrl.Call(m, "RouteList", family) ret0, _ := ret[0].([]netlink.Route) ret1, _ := ret[1].(error) return ret0, ret1 } // RouteList indicates an expected call of RouteList. -func (mr *MockNetLinkerMockRecorder) RouteList(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RouteList(family any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteList", reflect.TypeOf((*MockNetLinker)(nil).RouteList), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteList", reflect.TypeOf((*MockNetLinker)(nil).RouteList), family) } // RouteReplace mocks base method. -func (m *MockNetLinker) RouteReplace(arg0 netlink.Route) error { +func (m *MockNetLinker) RouteReplace(route netlink.Route) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RouteReplace", arg0) + ret := m.ctrl.Call(m, "RouteReplace", route) ret0, _ := ret[0].(error) return ret0 } // RouteReplace indicates an expected call of RouteReplace. -func (mr *MockNetLinkerMockRecorder) RouteReplace(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RouteReplace(route any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteReplace", reflect.TypeOf((*MockNetLinker)(nil).RouteReplace), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteReplace", reflect.TypeOf((*MockNetLinker)(nil).RouteReplace), route) } // RuleAdd mocks base method. -func (m *MockNetLinker) RuleAdd(arg0 netlink.Rule) error { +func (m *MockNetLinker) RuleAdd(rule netlink.Rule) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RuleAdd", arg0) + ret := m.ctrl.Call(m, "RuleAdd", rule) ret0, _ := ret[0].(error) return ret0 } // RuleAdd indicates an expected call of RuleAdd. -func (mr *MockNetLinkerMockRecorder) RuleAdd(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RuleAdd(rule any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleAdd", reflect.TypeOf((*MockNetLinker)(nil).RuleAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleAdd", reflect.TypeOf((*MockNetLinker)(nil).RuleAdd), rule) } // RuleDel mocks base method. -func (m *MockNetLinker) RuleDel(arg0 netlink.Rule) error { +func (m *MockNetLinker) RuleDel(rule netlink.Rule) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RuleDel", arg0) + ret := m.ctrl.Call(m, "RuleDel", rule) ret0, _ := ret[0].(error) return ret0 } // RuleDel indicates an expected call of RuleDel. -func (mr *MockNetLinkerMockRecorder) RuleDel(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RuleDel(rule any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleDel", reflect.TypeOf((*MockNetLinker)(nil).RuleDel), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleDel", reflect.TypeOf((*MockNetLinker)(nil).RuleDel), rule) } // RuleList mocks base method. -func (m *MockNetLinker) RuleList(arg0 byte) ([]netlink.Rule, error) { +func (m *MockNetLinker) RuleList(family uint8) ([]netlink.Rule, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RuleList", arg0) + ret := m.ctrl.Call(m, "RuleList", family) ret0, _ := ret[0].([]netlink.Rule) ret1, _ := ret[1].(error) return ret0, ret1 } // RuleList indicates an expected call of RuleList. -func (mr *MockNetLinkerMockRecorder) RuleList(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RuleList(family any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleList", reflect.TypeOf((*MockNetLinker)(nil).RuleList), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleList", reflect.TypeOf((*MockNetLinker)(nil).RuleList), family) } diff --git a/internal/routing/rules_test.go b/internal/routing/rules_test.go index 49d7369e3..7b8fc3f74 100644 --- a/internal/routing/rules_test.go +++ b/internal/routing/rules_test.go @@ -5,10 +5,10 @@ import ( "net/netip" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/netlink" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) func makeNetipPrefix(n byte) netip.Prefix { diff --git a/internal/server/middlewares/auth/middleware_test.go b/internal/server/middlewares/auth/middleware_test.go index badd768bc..c8eda3b2a 100644 --- a/internal/server/middlewares/auth/middleware_test.go +++ b/internal/server/middlewares/auth/middleware_test.go @@ -8,9 +8,9 @@ import ( "net/url" "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) func Test_authHandler_ServeHTTP(t *testing.T) { diff --git a/internal/server/middlewares/auth/mocks_test.go b/internal/server/middlewares/auth/mocks_test.go index 37538c5bf..c0f249f5a 100644 --- a/internal/server/middlewares/auth/mocks_test.go +++ b/internal/server/middlewares/auth/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/server/middlewares/auth (interfaces: DebugLogger) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package=auth . DebugLogger +// // Package auth is a generated GoMock package. package auth @@ -7,13 +12,14 @@ package auth import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockDebugLogger is a mock of DebugLogger interface. type MockDebugLogger struct { ctrl *gomock.Controller recorder *MockDebugLoggerMockRecorder + isgomock struct{} } // MockDebugLoggerMockRecorder is the mock recorder for MockDebugLogger. @@ -34,35 +40,35 @@ func (m *MockDebugLogger) EXPECT() *MockDebugLoggerMockRecorder { } // Debugf mocks base method. -func (m *MockDebugLogger) Debugf(arg0 string, arg1 ...interface{}) { +func (m *MockDebugLogger) Debugf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{format} + for _, a := range args { varargs = append(varargs, a) } m.ctrl.Call(m, "Debugf", varargs...) } // Debugf indicates an expected call of Debugf. -func (mr *MockDebugLoggerMockRecorder) Debugf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockDebugLoggerMockRecorder) Debugf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockDebugLogger)(nil).Debugf), varargs...) } // Warnf mocks base method. -func (m *MockDebugLogger) Warnf(arg0 string, arg1 ...interface{}) { +func (m *MockDebugLogger) Warnf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{format} + for _, a := range args { varargs = append(varargs, a) } m.ctrl.Call(m, "Warnf", varargs...) } // Warnf indicates an expected call of Warnf. -func (mr *MockDebugLoggerMockRecorder) Warnf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockDebugLoggerMockRecorder) Warnf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnf", reflect.TypeOf((*MockDebugLogger)(nil).Warnf), varargs...) } diff --git a/internal/socks5/mocks_test.go b/internal/socks5/mocks_test.go index 79aaa8e24..a605a52bc 100644 --- a/internal/socks5/mocks_test.go +++ b/internal/socks5/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/socks5 (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package=socks5 . Logger +// // Package socks5 is a generated GoMock package. package socks5 @@ -7,13 +12,14 @@ package socks5 import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -34,35 +40,35 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { } // Infof mocks base method. -func (m *MockLogger) Infof(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Infof(format string, a ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { - varargs = append(varargs, a) + varargs := []any{format} + for _, a_2 := range a { + varargs = append(varargs, a_2) } m.ctrl.Call(m, "Infof", varargs...) } // Infof indicates an expected call of Infof. -func (mr *MockLoggerMockRecorder) Infof(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infof(format any, a ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{format}, a...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infof", reflect.TypeOf((*MockLogger)(nil).Infof), varargs...) } // Warnf mocks base method. -func (m *MockLogger) Warnf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Warnf(format string, a ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { - varargs = append(varargs, a) + varargs := []any{format} + for _, a_2 := range a { + varargs = append(varargs, a_2) } m.ctrl.Call(m, "Warnf", varargs...) } // Warnf indicates an expected call of Warnf. -func (mr *MockLoggerMockRecorder) Warnf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warnf(format any, a ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{format}, a...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warnf", reflect.TypeOf((*MockLogger)(nil).Warnf), varargs...) } diff --git a/internal/socks5/socks5_test.go b/internal/socks5/socks5_test.go index 0bc5487ae..982dace35 100644 --- a/internal/socks5/socks5_test.go +++ b/internal/socks5/socks5_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) type noopLogger struct{} diff --git a/internal/socks5/udp_router_integration_test.go b/internal/socks5/udp_router_integration_test.go index 2785567fd..e16201d36 100644 --- a/internal/socks5/udp_router_integration_test.go +++ b/internal/socks5/udp_router_integration_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/miekg/dns" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) func Test_udpRouter_ResolveGithubFromCloudflareDNS(t *testing.T) { diff --git a/internal/storage/mocks_test.go b/internal/storage/mocks_test.go index 09fbcc5d0..64bb05f0b 100644 --- a/internal/storage/mocks_test.go +++ b/internal/storage/mocks_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/storage (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=mocks_test.go -package storage . Logger +// // Package storage is a generated GoMock package. package storage @@ -7,13 +12,14 @@ package storage import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -34,42 +40,42 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { } // Info mocks base method. -func (m *MockLogger) Info(arg0 string) { +func (m *MockLogger) Info(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Info", arg0) + m.ctrl.Call(m, "Info", s) } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), s) } // Infof mocks base method. -func (m *MockLogger) Infof(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Infof(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{format} + for _, a := range args { varargs = append(varargs, a) } m.ctrl.Call(m, "Infof", varargs...) } // Infof indicates an expected call of Infof. -func (mr *MockLoggerMockRecorder) Infof(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Infof(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Infof", reflect.TypeOf((*MockLogger)(nil).Infof), varargs...) } // Warn mocks base method. -func (m *MockLogger) Warn(arg0 string) { +func (m *MockLogger) Warn(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Warn", arg0) + m.ctrl.Call(m, "Warn", s) } // Warn indicates an expected call of Warn. -func (mr *MockLoggerMockRecorder) Warn(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Warn(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Warn", reflect.TypeOf((*MockLogger)(nil).Warn), s) } diff --git a/internal/storage/read_test.go b/internal/storage/read_test.go index d7fd915e6..45e7fc6b6 100644 --- a/internal/storage/read_test.go +++ b/internal/storage/read_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/constants/providers" "github.com/qdm12/gluetun/internal/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) func populateProviderToVersion(providerToVersion map[string]uint16) map[string]uint16 { diff --git a/internal/wireguard/address_test.go b/internal/wireguard/address_test.go index 8c3647c95..5623a8fd0 100644 --- a/internal/wireguard/address_test.go +++ b/internal/wireguard/address_test.go @@ -5,9 +5,9 @@ import ( "net/netip" "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) func Test_AddAddresses(t *testing.T) { diff --git a/internal/wireguard/log_mock_test.go b/internal/wireguard/log_mock_test.go index 24b2878b2..4a90e161b 100644 --- a/internal/wireguard/log_mock_test.go +++ b/internal/wireguard/log_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/wireguard (interfaces: Logger) +// +// Generated by this command: +// +// mockgen -destination=log_mock_test.go -package wireguard . Logger +// // Package wireguard is a generated GoMock package. package wireguard @@ -7,13 +12,14 @@ package wireguard import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockLogger is a mock of Logger interface. type MockLogger struct { ctrl *gomock.Controller recorder *MockLoggerMockRecorder + isgomock struct{} } // MockLoggerMockRecorder is the mock recorder for MockLogger. @@ -34,71 +40,71 @@ func (m *MockLogger) EXPECT() *MockLoggerMockRecorder { } // Debug mocks base method. -func (m *MockLogger) Debug(arg0 string) { +func (m *MockLogger) Debug(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Debug", arg0) + m.ctrl.Call(m, "Debug", s) } // Debug indicates an expected call of Debug. -func (mr *MockLoggerMockRecorder) Debug(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debug(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockLogger)(nil).Debug), s) } // Debugf mocks base method. -func (m *MockLogger) Debugf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Debugf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{format} + for _, a := range args { varargs = append(varargs, a) } m.ctrl.Call(m, "Debugf", varargs...) } // Debugf indicates an expected call of Debugf. -func (mr *MockLoggerMockRecorder) Debugf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Debugf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debugf", reflect.TypeOf((*MockLogger)(nil).Debugf), varargs...) } // Error mocks base method. -func (m *MockLogger) Error(arg0 string) { +func (m *MockLogger) Error(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Error", arg0) + m.ctrl.Call(m, "Error", s) } // Error indicates an expected call of Error. -func (mr *MockLoggerMockRecorder) Error(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Error(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Error", reflect.TypeOf((*MockLogger)(nil).Error), s) } // Errorf mocks base method. -func (m *MockLogger) Errorf(arg0 string, arg1 ...interface{}) { +func (m *MockLogger) Errorf(format string, args ...any) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} - for _, a := range arg1 { + varargs := []any{format} + for _, a := range args { varargs = append(varargs, a) } m.ctrl.Call(m, "Errorf", varargs...) } // Errorf indicates an expected call of Errorf. -func (mr *MockLoggerMockRecorder) Errorf(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Errorf(format any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{format}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Errorf", reflect.TypeOf((*MockLogger)(nil).Errorf), varargs...) } // Info mocks base method. -func (m *MockLogger) Info(arg0 string) { +func (m *MockLogger) Info(s string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Info", arg0) + m.ctrl.Call(m, "Info", s) } // Info indicates an expected call of Info. -func (mr *MockLoggerMockRecorder) Info(arg0 interface{}) *gomock.Call { +func (mr *MockLoggerMockRecorder) Info(s any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Info", reflect.TypeOf((*MockLogger)(nil).Info), s) } diff --git a/internal/wireguard/log_test.go b/internal/wireguard/log_test.go index 1491dd348..548586cfb 100644 --- a/internal/wireguard/log_test.go +++ b/internal/wireguard/log_test.go @@ -3,7 +3,7 @@ package wireguard import ( "testing" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" ) func Test_makeDeviceLogger(t *testing.T) { diff --git a/internal/wireguard/netlinker_mock_test.go b/internal/wireguard/netlinker_mock_test.go index 5fc76bf05..68d547bcd 100644 --- a/internal/wireguard/netlinker_mock_test.go +++ b/internal/wireguard/netlinker_mock_test.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/qdm12/gluetun/internal/wireguard (interfaces: NetLinker) +// +// Generated by this command: +// +// mockgen -destination=netlinker_mock_test.go -package wireguard . NetLinker +// // Package wireguard is a generated GoMock package. package wireguard @@ -8,14 +13,15 @@ import ( netip "net/netip" reflect "reflect" - gomock "github.com/golang/mock/gomock" netlink "github.com/qdm12/gluetun/internal/netlink" + gomock "go.uber.org/mock/gomock" ) // MockNetLinker is a mock of NetLinker interface. type MockNetLinker struct { ctrl *gomock.Controller recorder *MockNetLinkerMockRecorder + isgomock struct{} } // MockNetLinkerMockRecorder is the mock recorder for MockNetLinker. @@ -36,17 +42,17 @@ func (m *MockNetLinker) EXPECT() *MockNetLinkerMockRecorder { } // AddrReplace mocks base method. -func (m *MockNetLinker) AddrReplace(arg0 uint32, arg1 netip.Prefix) error { +func (m *MockNetLinker) AddrReplace(linkIndex uint32, addr netip.Prefix) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AddrReplace", arg0, arg1) + ret := m.ctrl.Call(m, "AddrReplace", linkIndex, addr) ret0, _ := ret[0].(error) return ret0 } // AddrReplace indicates an expected call of AddrReplace. -func (mr *MockNetLinkerMockRecorder) AddrReplace(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) AddrReplace(linkIndex, addr any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrReplace", reflect.TypeOf((*MockNetLinker)(nil).AddrReplace), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrReplace", reflect.TypeOf((*MockNetLinker)(nil).AddrReplace), linkIndex, addr) } // IsWireguardSupported mocks base method. @@ -65,47 +71,47 @@ func (mr *MockNetLinkerMockRecorder) IsWireguardSupported() *gomock.Call { } // LinkAdd mocks base method. -func (m *MockNetLinker) LinkAdd(arg0 netlink.Link) (uint32, error) { +func (m *MockNetLinker) LinkAdd(link netlink.Link) (uint32, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkAdd", arg0) + ret := m.ctrl.Call(m, "LinkAdd", link) ret0, _ := ret[0].(uint32) ret1, _ := ret[1].(error) return ret0, ret1 } // LinkAdd indicates an expected call of LinkAdd. -func (mr *MockNetLinkerMockRecorder) LinkAdd(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkAdd(link any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkAdd", reflect.TypeOf((*MockNetLinker)(nil).LinkAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkAdd", reflect.TypeOf((*MockNetLinker)(nil).LinkAdd), link) } // LinkByName mocks base method. -func (m *MockNetLinker) LinkByName(arg0 string) (netlink.Link, error) { +func (m *MockNetLinker) LinkByName(name string) (netlink.Link, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkByName", arg0) + ret := m.ctrl.Call(m, "LinkByName", name) ret0, _ := ret[0].(netlink.Link) ret1, _ := ret[1].(error) return ret0, ret1 } // LinkByName indicates an expected call of LinkByName. -func (mr *MockNetLinkerMockRecorder) LinkByName(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkByName(name any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkByName", reflect.TypeOf((*MockNetLinker)(nil).LinkByName), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkByName", reflect.TypeOf((*MockNetLinker)(nil).LinkByName), name) } // LinkDel mocks base method. -func (m *MockNetLinker) LinkDel(arg0 uint32) error { +func (m *MockNetLinker) LinkDel(linkIndex uint32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkDel", arg0) + ret := m.ctrl.Call(m, "LinkDel", linkIndex) ret0, _ := ret[0].(error) return ret0 } // LinkDel indicates an expected call of LinkDel. -func (mr *MockNetLinkerMockRecorder) LinkDel(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkDel(linkIndex any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkDel", reflect.TypeOf((*MockNetLinker)(nil).LinkDel), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkDel", reflect.TypeOf((*MockNetLinker)(nil).LinkDel), linkIndex) } // LinkList mocks base method. @@ -124,86 +130,86 @@ func (mr *MockNetLinkerMockRecorder) LinkList() *gomock.Call { } // LinkSetDown mocks base method. -func (m *MockNetLinker) LinkSetDown(arg0 uint32) error { +func (m *MockNetLinker) LinkSetDown(linkIndex uint32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkSetDown", arg0) + ret := m.ctrl.Call(m, "LinkSetDown", linkIndex) ret0, _ := ret[0].(error) return ret0 } // LinkSetDown indicates an expected call of LinkSetDown. -func (mr *MockNetLinkerMockRecorder) LinkSetDown(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkSetDown(linkIndex any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetDown", reflect.TypeOf((*MockNetLinker)(nil).LinkSetDown), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetDown", reflect.TypeOf((*MockNetLinker)(nil).LinkSetDown), linkIndex) } // LinkSetUp mocks base method. -func (m *MockNetLinker) LinkSetUp(arg0 uint32) error { +func (m *MockNetLinker) LinkSetUp(linkIndex uint32) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LinkSetUp", arg0) + ret := m.ctrl.Call(m, "LinkSetUp", linkIndex) ret0, _ := ret[0].(error) return ret0 } // LinkSetUp indicates an expected call of LinkSetUp. -func (mr *MockNetLinkerMockRecorder) LinkSetUp(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) LinkSetUp(linkIndex any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetUp", reflect.TypeOf((*MockNetLinker)(nil).LinkSetUp), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LinkSetUp", reflect.TypeOf((*MockNetLinker)(nil).LinkSetUp), linkIndex) } // RouteAdd mocks base method. -func (m *MockNetLinker) RouteAdd(arg0 netlink.Route) error { +func (m *MockNetLinker) RouteAdd(route netlink.Route) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RouteAdd", arg0) + ret := m.ctrl.Call(m, "RouteAdd", route) ret0, _ := ret[0].(error) return ret0 } // RouteAdd indicates an expected call of RouteAdd. -func (mr *MockNetLinkerMockRecorder) RouteAdd(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RouteAdd(route any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteAdd", reflect.TypeOf((*MockNetLinker)(nil).RouteAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteAdd", reflect.TypeOf((*MockNetLinker)(nil).RouteAdd), route) } // RouteList mocks base method. -func (m *MockNetLinker) RouteList(arg0 byte) ([]netlink.Route, error) { +func (m *MockNetLinker) RouteList(family uint8) ([]netlink.Route, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RouteList", arg0) + ret := m.ctrl.Call(m, "RouteList", family) ret0, _ := ret[0].([]netlink.Route) ret1, _ := ret[1].(error) return ret0, ret1 } // RouteList indicates an expected call of RouteList. -func (mr *MockNetLinkerMockRecorder) RouteList(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RouteList(family any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteList", reflect.TypeOf((*MockNetLinker)(nil).RouteList), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RouteList", reflect.TypeOf((*MockNetLinker)(nil).RouteList), family) } // RuleAdd mocks base method. -func (m *MockNetLinker) RuleAdd(arg0 netlink.Rule) error { +func (m *MockNetLinker) RuleAdd(rule netlink.Rule) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RuleAdd", arg0) + ret := m.ctrl.Call(m, "RuleAdd", rule) ret0, _ := ret[0].(error) return ret0 } // RuleAdd indicates an expected call of RuleAdd. -func (mr *MockNetLinkerMockRecorder) RuleAdd(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RuleAdd(rule any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleAdd", reflect.TypeOf((*MockNetLinker)(nil).RuleAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleAdd", reflect.TypeOf((*MockNetLinker)(nil).RuleAdd), rule) } // RuleDel mocks base method. -func (m *MockNetLinker) RuleDel(arg0 netlink.Rule) error { +func (m *MockNetLinker) RuleDel(rule netlink.Rule) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RuleDel", arg0) + ret := m.ctrl.Call(m, "RuleDel", rule) ret0, _ := ret[0].(error) return ret0 } // RuleDel indicates an expected call of RuleDel. -func (mr *MockNetLinkerMockRecorder) RuleDel(arg0 interface{}) *gomock.Call { +func (mr *MockNetLinkerMockRecorder) RuleDel(rule any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleDel", reflect.TypeOf((*MockNetLinker)(nil).RuleDel), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RuleDel", reflect.TypeOf((*MockNetLinker)(nil).RuleDel), rule) } diff --git a/internal/wireguard/route_test.go b/internal/wireguard/route_test.go index 0fc37832a..972fb06c9 100644 --- a/internal/wireguard/route_test.go +++ b/internal/wireguard/route_test.go @@ -5,10 +5,10 @@ import ( "net/netip" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/netlink" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) func Test_addRoute(t *testing.T) { diff --git a/internal/wireguard/rule_test.go b/internal/wireguard/rule_test.go index 8b8f45033..223589889 100644 --- a/internal/wireguard/rule_test.go +++ b/internal/wireguard/rule_test.go @@ -4,10 +4,10 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" "github.com/qdm12/gluetun/internal/netlink" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" ) func Test_AddRule(t *testing.T) {