diff --git a/CHANGELOG.md b/CHANGELOG.md index d18686cc..d2861aee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## To be released +## [2021-07-30] 2.0.0 + * chore(Dependabot): Update various dependencies * Bump github.com/sirupsen/logrus from 1.8.0 to 1.8.1 * Bump github.com/golang/mock from 1.5.0 to 1.6.0 diff --git a/README.md b/README.md index 38176944..67f205d3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# LinK v1.9.3 +# LinK v2.0.0 [![Build Status](https://travis-ci.org/Scalingo/link.svg?branch=master)](https://travis-ci.org/Scalingo/link) > Link is not Keepalived @@ -147,8 +147,8 @@ Commit, tag and create a new release: ```sh git add CHANGELOG.md README.md -git commit -m "Bump v1.9.3" -git tag v1.9.3 -git push origin master v1.9.3 -hub release create v1.9.3 +git commit -m "Bump v2.0.0" +git tag v2.0.0 +git push origin master v2.0.0 +hub release create v2.0.0 ``` diff --git a/api/apimock/client_mock.go b/api/apimock/client_mock.go index c7cffff3..5e1fd947 100644 --- a/api/apimock/client_mock.go +++ b/api/apimock/client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/link/api (interfaces: Client) +// Source: github.com/Scalingo/link/v2/api (interfaces: Client) // Package apimock is a generated GoMock package. package apimock @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - api "github.com/Scalingo/link/api" + api "github.com/Scalingo/link/v2/api" gomock "github.com/golang/mock/gomock" ) diff --git a/api/http_client.go b/api/http_client.go index 9f920fa0..bf391fab 100644 --- a/api/http_client.go +++ b/api/http_client.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "github.com/Scalingo/link/models" + "github.com/Scalingo/link/v2/models" ) type HTTPClient struct { diff --git a/api/types.go b/api/types.go index 82196560..f2e2d1fd 100644 --- a/api/types.go +++ b/api/types.go @@ -1,6 +1,6 @@ package api -import "github.com/Scalingo/link/models" +import "github.com/Scalingo/link/v2/models" const ( Activated = "ACTIVATED" diff --git a/cmd/link-client/formatter.go b/cmd/link-client/formatter.go index ef422f82..533abc64 100644 --- a/cmd/link-client/formatter.go +++ b/cmd/link-client/formatter.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/Scalingo/link/api" + "github.com/Scalingo/link/v2/api" "github.com/logrusorgru/aurora" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/link-client/main.go b/cmd/link-client/main.go index 0c80cefb..55eed8f4 100644 --- a/cmd/link-client/main.go +++ b/cmd/link-client/main.go @@ -7,8 +7,8 @@ import ( "os" "strconv" - "github.com/Scalingo/link/api" - "github.com/Scalingo/link/models" + "github.com/Scalingo/link/v2/api" + "github.com/Scalingo/link/v2/models" "github.com/logrusorgru/aurora" "github.com/pkg/errors" "github.com/urfave/cli" diff --git a/go.mod b/go.mod index 0ec94f6f..caf6c998 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Scalingo/link +module github.com/Scalingo/link/v2 go 1.15 @@ -9,8 +9,6 @@ require ( github.com/Scalingo/go-utils/etcd v1.0.1 github.com/Scalingo/go-utils/logger v1.0.0 github.com/Scalingo/go-utils/retry v1.0.0 - github.com/coreos/go-systemd/v22 v22.1.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/gofrs/uuid v3.4.0+incompatible github.com/golang/mock v1.6.0 github.com/gorilla/mux v1.8.0 @@ -18,7 +16,6 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e github.com/looplab/fsm v0.0.0-20180515091235-f980bdb68a89 - github.com/mattn/go-runewidth v0.0.3 // indirect github.com/olekukonko/tablewriter v0.0.0-20180912035003-be2c049b30cc github.com/pkg/errors v0.9.1 github.com/satori/go.uuid v0.0.0-20180103174451-36e9d2ebbde5 @@ -27,7 +24,4 @@ require ( github.com/urfave/cli v1.22.5 github.com/vishvananda/netlink v1.1.0 go.etcd.io/etcd/v3 v3.3.0-rc.0.0.20200826232710-c20cc05fc548 - golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 // indirect - golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect - google.golang.org/genproto v0.0.0-20201117123952-62d171c70ae1 // indirect ) diff --git a/go.sum b/go.sum index d5210e96..95e143fa 100644 --- a/go.sum +++ b/go.sum @@ -66,13 +66,11 @@ github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmf github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.1.0 h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg= -github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -246,9 +244,8 @@ github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0Q github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.2 h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4= -github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= @@ -433,9 +430,8 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o= -golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= @@ -445,9 +441,8 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= @@ -520,7 +515,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -546,7 +540,6 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs= @@ -569,9 +562,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6 h1:iRN4+t0lvZX/l9gH14ARF9i58tsVa5a97k6aH95rC3Y= google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201117123952-62d171c70ae1 h1:EVow1AaDgdoMjdO64/fntn4+RGTVor8YE/mkmIYsqFM= -google.golang.org/genproto v0.0.0-20201117123952-62d171c70ae1/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= diff --git a/healthcheck/checker.go b/healthcheck/checker.go index 016701c1..f156af2f 100644 --- a/healthcheck/checker.go +++ b/healthcheck/checker.go @@ -5,8 +5,8 @@ import ( "github.com/Scalingo/go-philae/v4/prober" "github.com/Scalingo/go-philae/v4/tcpprobe" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/models" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/models" ) type Checker interface { diff --git a/healthcheck/cheker_test.go b/healthcheck/cheker_test.go index 9044a903..ab4eb4f8 100644 --- a/healthcheck/cheker_test.go +++ b/healthcheck/cheker_test.go @@ -7,8 +7,8 @@ import ( "github.com/Scalingo/go-philae/v4/prober" "github.com/Scalingo/go-philae/v4/sampleprobe" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/models" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/healthcheck/healthcheckmock/checker_mock.go b/healthcheck/healthcheckmock/checker_mock.go index 02b058ea..6c8fc683 100644 --- a/healthcheck/healthcheckmock/checker_mock.go +++ b/healthcheck/healthcheckmock/checker_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/link/healthcheck (interfaces: Checker) +// Source: github.com/Scalingo/link/v2/healthcheck (interfaces: Checker) // Package healthcheckmock is a generated GoMock package. package healthcheckmock @@ -11,30 +11,30 @@ import ( gomock "github.com/golang/mock/gomock" ) -// MockChecker is a mock of Checker interface +// MockChecker is a mock of Checker interface. type MockChecker struct { ctrl *gomock.Controller recorder *MockCheckerMockRecorder } -// MockCheckerMockRecorder is the mock recorder for MockChecker +// MockCheckerMockRecorder is the mock recorder for MockChecker. type MockCheckerMockRecorder struct { mock *MockChecker } -// NewMockChecker creates a new mock instance +// NewMockChecker creates a new mock instance. func NewMockChecker(ctrl *gomock.Controller) *MockChecker { mock := &MockChecker{ctrl: ctrl} mock.recorder = &MockCheckerMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockChecker) EXPECT() *MockCheckerMockRecorder { return m.recorder } -// IsHealthy mocks base method +// IsHealthy mocks base method. func (m *MockChecker) IsHealthy(arg0 context.Context) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsHealthy", arg0) @@ -43,7 +43,7 @@ func (m *MockChecker) IsHealthy(arg0 context.Context) (bool, error) { return ret0, ret1 } -// IsHealthy indicates an expected call of IsHealthy +// IsHealthy indicates an expected call of IsHealthy. func (mr *MockCheckerMockRecorder) IsHealthy(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsHealthy", reflect.TypeOf((*MockChecker)(nil).IsHealthy), arg0) diff --git a/ip/event_manager.go b/ip/event_manager.go index 781612d4..680e8cb8 100644 --- a/ip/event_manager.go +++ b/ip/event_manager.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Scalingo/go-utils/logger" - "github.com/Scalingo/link/locker" + "github.com/Scalingo/link/v2/locker" "github.com/pkg/errors" ) diff --git a/ip/event_manager_test.go b/ip/event_manager_test.go index 3db3a694..c94ef7ea 100644 --- a/ip/event_manager_test.go +++ b/ip/event_manager_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/locker/lockermock" - "github.com/Scalingo/link/models/modelsmock" - "github.com/Scalingo/link/network/networkmock" - "github.com/Scalingo/link/watcher/watchermock" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/locker/lockermock" + "github.com/Scalingo/link/v2/models/modelsmock" + "github.com/Scalingo/link/v2/network/networkmock" + "github.com/Scalingo/link/v2/watcher/watchermock" "github.com/golang/mock/gomock" "github.com/looplab/fsm" "github.com/pkg/errors" diff --git a/ip/healthchecks_test.go b/ip/healthchecks_test.go index 7f6f9c4b..e3f0f707 100644 --- a/ip/healthchecks_test.go +++ b/ip/healthchecks_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/healthcheck/healthcheckmock" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/healthcheck/healthcheckmock" "github.com/golang/mock/gomock" "github.com/looplab/fsm" "github.com/pkg/errors" diff --git a/ip/manager.go b/ip/manager.go index 5789cc97..75b529b4 100644 --- a/ip/manager.go +++ b/ip/manager.go @@ -8,12 +8,12 @@ import ( "github.com/Scalingo/go-utils/logger" "github.com/Scalingo/go-utils/retry" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/healthcheck" - "github.com/Scalingo/link/locker" - "github.com/Scalingo/link/models" - "github.com/Scalingo/link/network" - "github.com/Scalingo/link/watcher" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/healthcheck" + "github.com/Scalingo/link/v2/locker" + "github.com/Scalingo/link/v2/models" + "github.com/Scalingo/link/v2/network" + "github.com/Scalingo/link/v2/watcher" "github.com/looplab/fsm" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/ip/network.go b/ip/network.go index 4ada5c59..08433de1 100644 --- a/ip/network.go +++ b/ip/network.go @@ -5,8 +5,8 @@ import ( "time" "github.com/Scalingo/go-utils/logger" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/locker" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/locker" "github.com/looplab/fsm" ) diff --git a/ip/network_test.go b/ip/network_test.go index 99880caa..f35dc04c 100644 --- a/ip/network_test.go +++ b/ip/network_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/locker/lockermock" - "github.com/Scalingo/link/models" - "github.com/Scalingo/link/network/networkmock" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/locker/lockermock" + "github.com/Scalingo/link/v2/models" + "github.com/Scalingo/link/v2/network/networkmock" "github.com/golang/mock/gomock" "github.com/looplab/fsm" ) diff --git a/locker/etcd_lease_manager.go b/locker/etcd_lease_manager.go index 36744c9b..51c7d9a6 100644 --- a/locker/etcd_lease_manager.go +++ b/locker/etcd_lease_manager.go @@ -7,8 +7,8 @@ import ( scalingoerrors "github.com/Scalingo/go-utils/errors" "github.com/Scalingo/go-utils/logger" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/models" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/models" "github.com/gofrs/uuid" "github.com/pkg/errors" "go.etcd.io/etcd/v3/clientv3" diff --git a/locker/etcd_lease_manager_mock.go b/locker/etcd_lease_manager_mock.go index 63c1fdf6..4813b3cf 100644 --- a/locker/etcd_lease_manager_mock.go +++ b/locker/etcd_lease_manager_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/link/locker (interfaces: EtcdLeaseManager) +// Source: github.com/Scalingo/link/v2/locker (interfaces: EtcdLeaseManager) // Package locker is a generated GoMock package. package locker @@ -12,30 +12,30 @@ import ( clientv3 "go.etcd.io/etcd/v3/clientv3" ) -// MockEtcdLeaseManager is a mock of EtcdLeaseManager interface +// MockEtcdLeaseManager is a mock of EtcdLeaseManager interface. type MockEtcdLeaseManager struct { ctrl *gomock.Controller recorder *MockEtcdLeaseManagerMockRecorder } -// MockEtcdLeaseManagerMockRecorder is the mock recorder for MockEtcdLeaseManager +// MockEtcdLeaseManagerMockRecorder is the mock recorder for MockEtcdLeaseManager. type MockEtcdLeaseManagerMockRecorder struct { mock *MockEtcdLeaseManager } -// NewMockEtcdLeaseManager creates a new mock instance +// NewMockEtcdLeaseManager creates a new mock instance. func NewMockEtcdLeaseManager(ctrl *gomock.Controller) *MockEtcdLeaseManager { mock := &MockEtcdLeaseManager{ctrl: ctrl} mock.recorder = &MockEtcdLeaseManagerMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockEtcdLeaseManager) EXPECT() *MockEtcdLeaseManagerMockRecorder { return m.recorder } -// GetLease mocks base method +// GetLease mocks base method. func (m *MockEtcdLeaseManager) GetLease(arg0 context.Context) (clientv3.LeaseID, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetLease", arg0) @@ -44,13 +44,13 @@ func (m *MockEtcdLeaseManager) GetLease(arg0 context.Context) (clientv3.LeaseID, return ret0, ret1 } -// GetLease indicates an expected call of GetLease +// GetLease indicates an expected call of GetLease. func (mr *MockEtcdLeaseManagerMockRecorder) GetLease(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLease", reflect.TypeOf((*MockEtcdLeaseManager)(nil).GetLease), arg0) } -// MarkLeaseAsDirty mocks base method +// MarkLeaseAsDirty mocks base method. func (m *MockEtcdLeaseManager) MarkLeaseAsDirty(arg0 context.Context, arg1 clientv3.LeaseID) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "MarkLeaseAsDirty", arg0, arg1) @@ -58,13 +58,13 @@ func (m *MockEtcdLeaseManager) MarkLeaseAsDirty(arg0 context.Context, arg1 clien return ret0 } -// MarkLeaseAsDirty indicates an expected call of MarkLeaseAsDirty +// MarkLeaseAsDirty indicates an expected call of MarkLeaseAsDirty. func (mr *MockEtcdLeaseManagerMockRecorder) MarkLeaseAsDirty(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MarkLeaseAsDirty", reflect.TypeOf((*MockEtcdLeaseManager)(nil).MarkLeaseAsDirty), arg0, arg1) } -// Start mocks base method +// Start mocks base method. func (m *MockEtcdLeaseManager) Start(arg0 context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Start", arg0) @@ -72,25 +72,25 @@ func (m *MockEtcdLeaseManager) Start(arg0 context.Context) error { return ret0 } -// Start indicates an expected call of Start +// Start indicates an expected call of Start. func (mr *MockEtcdLeaseManagerMockRecorder) Start(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockEtcdLeaseManager)(nil).Start), arg0) } -// Stop mocks base method +// Stop mocks base method. func (m *MockEtcdLeaseManager) Stop(arg0 context.Context) { m.ctrl.T.Helper() m.ctrl.Call(m, "Stop", arg0) } -// Stop indicates an expected call of Stop +// Stop indicates an expected call of Stop. func (mr *MockEtcdLeaseManagerMockRecorder) Stop(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockEtcdLeaseManager)(nil).Stop), arg0) } -// SubscribeToLeaseChange mocks base method +// SubscribeToLeaseChange mocks base method. func (m *MockEtcdLeaseManager) SubscribeToLeaseChange(arg0 context.Context, arg1 LeaseChangedCallback) (string, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SubscribeToLeaseChange", arg0, arg1) @@ -99,13 +99,13 @@ func (m *MockEtcdLeaseManager) SubscribeToLeaseChange(arg0 context.Context, arg1 return ret0, ret1 } -// SubscribeToLeaseChange indicates an expected call of SubscribeToLeaseChange +// SubscribeToLeaseChange indicates an expected call of SubscribeToLeaseChange. func (mr *MockEtcdLeaseManagerMockRecorder) SubscribeToLeaseChange(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeToLeaseChange", reflect.TypeOf((*MockEtcdLeaseManager)(nil).SubscribeToLeaseChange), arg0, arg1) } -// UnsubscribeToLeaseChange mocks base method +// UnsubscribeToLeaseChange mocks base method. func (m *MockEtcdLeaseManager) UnsubscribeToLeaseChange(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UnsubscribeToLeaseChange", arg0, arg1) @@ -113,7 +113,7 @@ func (m *MockEtcdLeaseManager) UnsubscribeToLeaseChange(arg0 context.Context, ar return ret0 } -// UnsubscribeToLeaseChange indicates an expected call of UnsubscribeToLeaseChange +// UnsubscribeToLeaseChange indicates an expected call of UnsubscribeToLeaseChange. func (mr *MockEtcdLeaseManagerMockRecorder) UnsubscribeToLeaseChange(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnsubscribeToLeaseChange", reflect.TypeOf((*MockEtcdLeaseManager)(nil).UnsubscribeToLeaseChange), arg0, arg1) diff --git a/locker/etcd_lease_manager_test.go b/locker/etcd_lease_manager_test.go index 242a1eb2..6b7d0348 100644 --- a/locker/etcd_lease_manager_test.go +++ b/locker/etcd_lease_manager_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/etcdmock" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/etcdmock" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/locker/etcd_locker.go b/locker/etcd_locker.go index 9a1b387c..8ae72975 100644 --- a/locker/etcd_locker.go +++ b/locker/etcd_locker.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/Scalingo/go-utils/logger" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/models" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/models" "github.com/pkg/errors" "github.com/sirupsen/logrus" "go.etcd.io/etcd/v3/clientv3" diff --git a/locker/etcd_locker_test.go b/locker/etcd_locker_test.go index 574fbed6..7669c17a 100644 --- a/locker/etcd_locker_test.go +++ b/locker/etcd_locker_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/etcdmock" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/etcdmock" "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" diff --git a/locker/lockermock/locker_mock.go b/locker/lockermock/locker_mock.go index 433ef86a..808d926a 100644 --- a/locker/lockermock/locker_mock.go +++ b/locker/lockermock/locker_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/link/locker (interfaces: Locker) +// Source: github.com/Scalingo/link/v2/locker (interfaces: Locker) // Package lockermock is a generated GoMock package. package lockermock @@ -11,30 +11,30 @@ import ( gomock "github.com/golang/mock/gomock" ) -// MockLocker is a mock of Locker interface +// MockLocker is a mock of Locker interface. type MockLocker struct { ctrl *gomock.Controller recorder *MockLockerMockRecorder } -// MockLockerMockRecorder is the mock recorder for MockLocker +// MockLockerMockRecorder is the mock recorder for MockLocker. type MockLockerMockRecorder struct { mock *MockLocker } -// NewMockLocker creates a new mock instance +// NewMockLocker creates a new mock instance. func NewMockLocker(ctrl *gomock.Controller) *MockLocker { mock := &MockLocker{ctrl: ctrl} mock.recorder = &MockLockerMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockLocker) EXPECT() *MockLockerMockRecorder { return m.recorder } -// IsMaster mocks base method +// IsMaster mocks base method. func (m *MockLocker) IsMaster(arg0 context.Context) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsMaster", arg0) @@ -43,13 +43,13 @@ func (m *MockLocker) IsMaster(arg0 context.Context) (bool, error) { return ret0, ret1 } -// IsMaster indicates an expected call of IsMaster +// IsMaster indicates an expected call of IsMaster. func (mr *MockLockerMockRecorder) IsMaster(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsMaster", reflect.TypeOf((*MockLocker)(nil).IsMaster), arg0) } -// Refresh mocks base method +// Refresh mocks base method. func (m *MockLocker) Refresh(arg0 context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Refresh", arg0) @@ -57,13 +57,13 @@ func (m *MockLocker) Refresh(arg0 context.Context) error { return ret0 } -// Refresh indicates an expected call of Refresh +// Refresh indicates an expected call of Refresh. func (mr *MockLockerMockRecorder) Refresh(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Refresh", reflect.TypeOf((*MockLocker)(nil).Refresh), arg0) } -// Stop mocks base method +// Stop mocks base method. func (m *MockLocker) Stop(arg0 context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Stop", arg0) @@ -71,13 +71,13 @@ func (m *MockLocker) Stop(arg0 context.Context) error { return ret0 } -// Stop indicates an expected call of Stop +// Stop indicates an expected call of Stop. func (mr *MockLockerMockRecorder) Stop(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockLocker)(nil).Stop), arg0) } -// Unlock mocks base method +// Unlock mocks base method. func (m *MockLocker) Unlock(arg0 context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Unlock", arg0) @@ -85,7 +85,7 @@ func (m *MockLocker) Unlock(arg0 context.Context) error { return ret0 } -// Unlock indicates an expected call of Unlock +// Unlock indicates an expected call of Unlock. func (mr *MockLockerMockRecorder) Unlock(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unlock", reflect.TypeOf((*MockLocker)(nil).Unlock), arg0) diff --git a/main.go b/main.go index d5399925..789ec256 100644 --- a/main.go +++ b/main.go @@ -11,12 +11,12 @@ import ( "github.com/Scalingo/go-utils/etcd" "github.com/Scalingo/go-utils/logger" "github.com/Scalingo/go-utils/logger/plugins/rollbarplugin" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/locker" - "github.com/Scalingo/link/migrations" - "github.com/Scalingo/link/models" - "github.com/Scalingo/link/scheduler" - "github.com/Scalingo/link/web" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/locker" + "github.com/Scalingo/link/v2/migrations" + "github.com/Scalingo/link/v2/models" + "github.com/Scalingo/link/v2/scheduler" + "github.com/Scalingo/link/v2/web" "github.com/gorilla/mux" "github.com/sirupsen/logrus" ) diff --git a/migrations/etcd_storage_v0.go b/migrations/etcd_storage_v0.go index 79c0b85f..7a9f16bc 100644 --- a/migrations/etcd_storage_v0.go +++ b/migrations/etcd_storage_v0.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Scalingo/link/models" + "github.com/Scalingo/link/v2/models" "github.com/pkg/errors" "go.etcd.io/etcd/v3/clientv3" ) diff --git a/migrations/v0_to_v1.go b/migrations/v0_to_v1.go index fd41d283..6a4faf9f 100644 --- a/migrations/v0_to_v1.go +++ b/migrations/v0_to_v1.go @@ -7,8 +7,8 @@ import ( scalingoerrors "github.com/Scalingo/go-utils/errors" "github.com/Scalingo/go-utils/etcd" "github.com/Scalingo/go-utils/logger" - "github.com/Scalingo/link/locker" - "github.com/Scalingo/link/models" + "github.com/Scalingo/link/v2/locker" + "github.com/Scalingo/link/v2/models" "github.com/pkg/errors" "github.com/sirupsen/logrus" "go.etcd.io/etcd/v3/clientv3" diff --git a/mocks.json b/mocks.json index eb7787f9..5ee887fe 100644 --- a/mocks.json +++ b/mocks.json @@ -1,49 +1,61 @@ { - "base_package": "github.com/Scalingo/link", - "mocks": [ - { - "interface" : "Storage", - "src_package" : "models" - }, { - "interface" : "ARP", - "src_package" : "network" - }, { - "interface" : "NetworkInterface", - "src_package" : "network" - }, { - "interface" : "Scheduler", - "src_package" : "scheduler" - }, { - "interface" : "Client", - "src_package" : "api" - }, { - "interface" : "Checker", - "src_package" : "healthcheck" - }, { - "interface" : "Locker", - "src_package" : "locker" - }, { - "interface": "Watcher", - "src_package": "watcher" - }, { - "interface": "EtcdLeaseManager", - "mock_file": "locker/etcd_lease_manager_mock.go", - "src_package": "locker" - }, { - "external" : true, - "src_package": "go.etcd.io/etcd/v3/clientv3", - "interface" : "KV", - "mock_file" : "etcdmock/kv_mock.go" - }, { - "external" : true, - "src_package": "go.etcd.io/etcd/v3/clientv3", - "interface" : "Lease", - "mock_file" : "etcdmock/lease_mock.go" - }, { - "external" : true, - "src_package": "go.etcd.io/etcd/v3/clientv3", - "interface" : "Txn", - "mock_file" : "etcdmock/txn_mock.go" - } - ] + "base_directory": "github.com/Scalingo/link", + "base_package": "github.com/Scalingo/link/v2", + "mocks": [ + { + "interface": "Storage", + "src_package": "models" + }, + { + "interface": "ARP", + "src_package": "network" + }, + { + "interface": "NetworkInterface", + "src_package": "network" + }, + { + "interface": "Scheduler", + "src_package": "scheduler" + }, + { + "interface": "Client", + "src_package": "api" + }, + { + "interface": "Checker", + "src_package": "healthcheck" + }, + { + "interface": "Locker", + "src_package": "locker" + }, + { + "interface": "Watcher", + "src_package": "watcher" + }, + { + "interface": "EtcdLeaseManager", + "mock_file": "locker/etcd_lease_manager_mock.go", + "src_package": "locker" + }, + { + "external": true, + "src_package": "go.etcd.io/etcd/v3/clientv3", + "interface": "KV", + "mock_file": "etcdmock/kv_mock.go" + }, + { + "external": true, + "src_package": "go.etcd.io/etcd/v3/clientv3", + "interface": "Lease", + "mock_file": "etcdmock/lease_mock.go" + }, + { + "external": true, + "src_package": "go.etcd.io/etcd/v3/clientv3", + "interface": "Txn", + "mock_file": "etcdmock/txn_mock.go" + } + ] } diff --git a/mocks_sig.json b/mocks_sig.json index f21a6f3e..66fef5ee 100644 --- a/mocks_sig.json +++ b/mocks_sig.json @@ -1,14 +1,14 @@ { - "github.com/Scalingo/link/api.Client": "43 2c 65 f4 39 1d 94 6e 27 5d e0 d6 16 f1 42 4b 58 31 f3 0a", + "github.com/Scalingo/link/api.Client": "f3 4f e1 43 bc 9e e7 60 dc 8b 42 f7 a8 82 92 7e 05 b6 d2 27", "github.com/Scalingo/link/healthcheck.Checker": "68 49 fe 4d a3 bb 44 44 63 fd 68 46 63 a1 ac c4 f9 5b 51 3e", "github.com/Scalingo/link/locker.EtcdLeaseManager": "ac 51 8b 50 0f d3 c1 d5 76 33 64 4c 3b 57 13 a9 08 f0 58 91", "github.com/Scalingo/link/locker.Locker": "a5 24 96 0f 1b f5 df b8 d8 dd 15 83 a1 d2 b2 d3 53 fa 25 0d", - "github.com/Scalingo/link/models.Storage": "03 2a 32 33 82 6b 68 dd 02 eb 94 ea 73 b0 a6 d2 e5 68 d6 6e", + "github.com/Scalingo/link/models.Storage": "22 94 a2 21 97 22 de a1 b2 2c 05 2d 12 14 02 13 79 d7 c7 43", "github.com/Scalingo/link/network.ARP": "20 bb b8 da 57 d8 84 21 24 36 cc 40 34 be f6 c3 e6 e9 f9 78", "github.com/Scalingo/link/network.NetworkInterface": "02 61 47 58 85 b3 ce f2 ee 69 f8 58 4b ca cd eb 5b ed f9 3c", "github.com/Scalingo/link/scheduler.Scheduler": "2f 03 7b a9 8a 8c 66 79 58 89 e9 e3 5a ba 27 1e 21 b3 20 18", "github.com/Scalingo/link/watcher.Watcher": "22 fd 8e 1a 88 fd 2f 56 0b 5b 14 19 e4 49 cb d7 12 3a 6a 95", "go.etcd.io/etcd/v3/clientv3.KV": "b5 dc 10 4e dc 95 f2 cf 0a 6c e7 c5 ac 0a 47 5f 60 44 31 40", - "go.etcd.io/etcd/v3/clientv3.Lease": "c0 c8 6e 93 9b d9 00 21 7f b6 af 79 84 cf 24 a0 ec 54 57 47", + "go.etcd.io/etcd/v3/clientv3.Lease": "5c 67 f9 dc c6 90 cb 76 c4 1c 88 ce 51 dc 44 49 af f0 32 56", "go.etcd.io/etcd/v3/clientv3.Txn": "2b d8 86 0c 62 87 e9 d4 e5 71 78 81 ef 89 ec 5a e8 30 43 e1" } \ No newline at end of file diff --git a/models/etcd_storage.go b/models/etcd_storage.go index fbdd7f3d..930c1845 100644 --- a/models/etcd_storage.go +++ b/models/etcd_storage.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/go-utils/etcd" "github.com/Scalingo/go-utils/logger" - "github.com/Scalingo/link/config" + "github.com/Scalingo/link/v2/config" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" "github.com/sirupsen/logrus" diff --git a/models/modelsmock/storage_mock.go b/models/modelsmock/storage_mock.go index a98af3e8..3e403e4f 100644 --- a/models/modelsmock/storage_mock.go +++ b/models/modelsmock/storage_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/link/models (interfaces: Storage) +// Source: github.com/Scalingo/link/v2/models (interfaces: Storage) // Package modelsmock is a generated GoMock package. package modelsmock @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - models "github.com/Scalingo/link/models" + models "github.com/Scalingo/link/v2/models" gomock "github.com/golang/mock/gomock" ) diff --git a/network/networkmock/arp_mock.go b/network/networkmock/arp_mock.go index b29cc184..ef9b3e07 100644 --- a/network/networkmock/arp_mock.go +++ b/network/networkmock/arp_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/link/network (interfaces: ARP) +// Source: github.com/Scalingo/link/v2/network (interfaces: ARP) // Package networkmock is a generated GoMock package. package networkmock @@ -7,34 +7,34 @@ package networkmock import ( reflect "reflect" - network "github.com/Scalingo/link/network" + network "github.com/Scalingo/link/v2/network" gomock "github.com/golang/mock/gomock" ) -// MockARP is a mock of ARP interface +// MockARP is a mock of ARP interface. type MockARP struct { ctrl *gomock.Controller recorder *MockARPMockRecorder } -// MockARPMockRecorder is the mock recorder for MockARP +// MockARPMockRecorder is the mock recorder for MockARP. type MockARPMockRecorder struct { mock *MockARP } -// NewMockARP creates a new mock instance +// NewMockARP creates a new mock instance. func NewMockARP(ctrl *gomock.Controller) *MockARP { mock := &MockARP{ctrl: ctrl} mock.recorder = &MockARPMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockARP) EXPECT() *MockARPMockRecorder { return m.recorder } -// GratuitousArp mocks base method +// GratuitousArp mocks base method. func (m *MockARP) GratuitousArp(arg0 network.GratuitousArpRequest) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GratuitousArp", arg0) @@ -42,7 +42,7 @@ func (m *MockARP) GratuitousArp(arg0 network.GratuitousArpRequest) error { return ret0 } -// GratuitousArp indicates an expected call of GratuitousArp +// GratuitousArp indicates an expected call of GratuitousArp. func (mr *MockARPMockRecorder) GratuitousArp(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GratuitousArp", reflect.TypeOf((*MockARP)(nil).GratuitousArp), arg0) diff --git a/network/networkmock/networkinterface_mock.go b/network/networkmock/networkinterface_mock.go index 55af9048..fb0069a1 100644 --- a/network/networkmock/networkinterface_mock.go +++ b/network/networkmock/networkinterface_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/link/network (interfaces: NetworkInterface) +// Source: github.com/Scalingo/link/v2/network (interfaces: NetworkInterface) // Package networkmock is a generated GoMock package. package networkmock @@ -10,30 +10,30 @@ import ( gomock "github.com/golang/mock/gomock" ) -// MockNetworkInterface is a mock of NetworkInterface interface +// MockNetworkInterface is a mock of NetworkInterface interface. type MockNetworkInterface struct { ctrl *gomock.Controller recorder *MockNetworkInterfaceMockRecorder } -// MockNetworkInterfaceMockRecorder is the mock recorder for MockNetworkInterface +// MockNetworkInterfaceMockRecorder is the mock recorder for MockNetworkInterface. type MockNetworkInterfaceMockRecorder struct { mock *MockNetworkInterface } -// NewMockNetworkInterface creates a new mock instance +// NewMockNetworkInterface creates a new mock instance. func NewMockNetworkInterface(ctrl *gomock.Controller) *MockNetworkInterface { mock := &MockNetworkInterface{ctrl: ctrl} mock.recorder = &MockNetworkInterfaceMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockNetworkInterface) EXPECT() *MockNetworkInterfaceMockRecorder { return m.recorder } -// EnsureIP mocks base method +// EnsureIP mocks base method. func (m *MockNetworkInterface) EnsureIP(arg0 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "EnsureIP", arg0) @@ -41,13 +41,13 @@ func (m *MockNetworkInterface) EnsureIP(arg0 string) error { return ret0 } -// EnsureIP indicates an expected call of EnsureIP +// EnsureIP indicates an expected call of EnsureIP. func (mr *MockNetworkInterfaceMockRecorder) EnsureIP(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnsureIP", reflect.TypeOf((*MockNetworkInterface)(nil).EnsureIP), arg0) } -// RemoveIP mocks base method +// RemoveIP mocks base method. func (m *MockNetworkInterface) RemoveIP(arg0 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RemoveIP", arg0) @@ -55,7 +55,7 @@ func (m *MockNetworkInterface) RemoveIP(arg0 string) error { return ret0 } -// RemoveIP indicates an expected call of RemoveIP +// RemoveIP indicates an expected call of RemoveIP. func (mr *MockNetworkInterfaceMockRecorder) RemoveIP(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveIP", reflect.TypeOf((*MockNetworkInterface)(nil).RemoveIP), arg0) diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index 947b3b11..98e2c426 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -5,11 +5,11 @@ import ( "sync" "github.com/Scalingo/go-utils/logger" - "github.com/Scalingo/link/api" - "github.com/Scalingo/link/config" - "github.com/Scalingo/link/ip" - "github.com/Scalingo/link/locker" - "github.com/Scalingo/link/models" + "github.com/Scalingo/link/v2/api" + "github.com/Scalingo/link/v2/config" + "github.com/Scalingo/link/v2/ip" + "github.com/Scalingo/link/v2/locker" + "github.com/Scalingo/link/v2/models" "github.com/pkg/errors" "go.etcd.io/etcd/v3/clientv3" ) diff --git a/scheduler/schedulermock/scheduler_mock.go b/scheduler/schedulermock/scheduler_mock.go index 51c5ba7d..cfd964cd 100644 --- a/scheduler/schedulermock/scheduler_mock.go +++ b/scheduler/schedulermock/scheduler_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/link/scheduler (interfaces: Scheduler) +// Source: github.com/Scalingo/link/v2/scheduler (interfaces: Scheduler) // Package schedulermock is a generated GoMock package. package schedulermock @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - api "github.com/Scalingo/link/api" - models "github.com/Scalingo/link/models" + api "github.com/Scalingo/link/v2/api" + models "github.com/Scalingo/link/v2/models" gomock "github.com/golang/mock/gomock" ) diff --git a/vendor/github.com/mattn/go-runewidth/runewidth.go b/vendor/github.com/mattn/go-runewidth/runewidth.go index 82568a1b..2164497a 100644 --- a/vendor/github.com/mattn/go-runewidth/runewidth.go +++ b/vendor/github.com/mattn/go-runewidth/runewidth.go @@ -1,24 +1,13 @@ package runewidth -import "os" - var ( // EastAsianWidth will be set true if the current locale is CJK - EastAsianWidth bool + EastAsianWidth = IsEastAsian() // DefaultCondition is a condition in current locale DefaultCondition = &Condition{EastAsianWidth} ) -func init() { - env := os.Getenv("RUNEWIDTH_EASTASIAN") - if env == "" { - EastAsianWidth = IsEastAsian() - } else { - EastAsianWidth = env == "1" - } -} - type interval struct { first rune last rune @@ -66,7 +55,6 @@ var private = table{ var nonprint = table{ {0x0000, 0x001F}, {0x007F, 0x009F}, {0x00AD, 0x00AD}, {0x070F, 0x070F}, {0x180B, 0x180E}, {0x200B, 0x200F}, - {0x2028, 0x2029}, {0x202A, 0x202E}, {0x206A, 0x206F}, {0xD800, 0xDFFF}, {0xFEFF, 0xFEFF}, {0xFFF9, 0xFFFB}, {0xFFFE, 0xFFFF}, } diff --git a/vendor/modules.txt b/vendor/modules.txt index f072fbab..56706951 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -25,11 +25,9 @@ github.com/Scalingo/logrus-rollbar github.com/Soulou/errgo-rollbar # github.com/coreos/go-semver v0.3.0 github.com/coreos/go-semver/semver -# github.com/coreos/go-systemd/v22 v22.1.0 -## explicit +# github.com/coreos/go-systemd/v22 v22.0.0 github.com/coreos/go-systemd/v22/journal -# github.com/cpuguy83/go-md2man/v2 v2.0.0 -## explicit +# github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d github.com/cpuguy83/go-md2man/v2/md2man # github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew/spew @@ -66,8 +64,7 @@ github.com/logrusorgru/aurora # github.com/looplab/fsm v0.0.0-20180515091235-f980bdb68a89 ## explicit github.com/looplab/fsm -# github.com/mattn/go-runewidth v0.0.3 -## explicit +# github.com/mattn/go-runewidth v0.0.2 github.com/mattn/go-runewidth # github.com/olekukonko/tablewriter v0.0.0-20180912035003-be2c049b30cc ## explicit @@ -140,10 +137,6 @@ go.uber.org/zap/internal/bufferpool go.uber.org/zap/internal/color go.uber.org/zap/internal/exit go.uber.org/zap/zapcore -# golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 -## explicit -# golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f -## explicit # golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 golang.org/x/net/context golang.org/x/net/http/httpguts @@ -161,8 +154,7 @@ golang.org/x/text/secure/bidirule golang.org/x/text/transform golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm -# google.golang.org/genproto v0.0.0-20201117123952-62d171c70ae1 -## explicit +# google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6 google.golang.org/genproto/googleapis/rpc/status # google.golang.org/grpc v1.29.1 google.golang.org/grpc diff --git a/visualize/main.go b/visualize/main.go index ec207cae..ba6d352c 100644 --- a/visualize/main.go +++ b/visualize/main.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/Scalingo/link/ip" + "github.com/Scalingo/link/v2/ip" "github.com/looplab/fsm" ) diff --git a/watcher/watchermock/watcher_mock.go b/watcher/watchermock/watcher_mock.go index 54eef109..1dbd4e11 100644 --- a/watcher/watchermock/watcher_mock.go +++ b/watcher/watchermock/watcher_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/link/watcher (interfaces: Watcher) +// Source: github.com/Scalingo/link/v2/watcher (interfaces: Watcher) // Package watchermock is a generated GoMock package. package watchermock @@ -11,30 +11,30 @@ import ( gomock "github.com/golang/mock/gomock" ) -// MockWatcher is a mock of Watcher interface +// MockWatcher is a mock of Watcher interface. type MockWatcher struct { ctrl *gomock.Controller recorder *MockWatcherMockRecorder } -// MockWatcherMockRecorder is the mock recorder for MockWatcher +// MockWatcherMockRecorder is the mock recorder for MockWatcher. type MockWatcherMockRecorder struct { mock *MockWatcher } -// NewMockWatcher creates a new mock instance +// NewMockWatcher creates a new mock instance. func NewMockWatcher(ctrl *gomock.Controller) *MockWatcher { mock := &MockWatcher{ctrl: ctrl} mock.recorder = &MockWatcherMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockWatcher) EXPECT() *MockWatcherMockRecorder { return m.recorder } -// Start mocks base method +// Start mocks base method. func (m *MockWatcher) Start(arg0 context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Start", arg0) @@ -42,13 +42,13 @@ func (m *MockWatcher) Start(arg0 context.Context) error { return ret0 } -// Start indicates an expected call of Start +// Start indicates an expected call of Start. func (mr *MockWatcherMockRecorder) Start(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockWatcher)(nil).Start), arg0) } -// Stop mocks base method +// Stop mocks base method. func (m *MockWatcher) Stop(arg0 context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Stop", arg0) @@ -56,7 +56,7 @@ func (m *MockWatcher) Stop(arg0 context.Context) error { return ret0 } -// Stop indicates an expected call of Stop +// Stop indicates an expected call of Stop. func (mr *MockWatcherMockRecorder) Stop(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockWatcher)(nil).Stop), arg0) diff --git a/web/ip_controller.go b/web/ip_controller.go index 7c4f7e01..d1932b07 100644 --- a/web/ip_controller.go +++ b/web/ip_controller.go @@ -10,10 +10,10 @@ import ( "github.com/vishvananda/netlink" "github.com/Scalingo/go-utils/logger" - "github.com/Scalingo/link/api" - "github.com/Scalingo/link/ip" - "github.com/Scalingo/link/models" - "github.com/Scalingo/link/scheduler" + "github.com/Scalingo/link/v2/api" + "github.com/Scalingo/link/v2/ip" + "github.com/Scalingo/link/v2/models" + "github.com/Scalingo/link/v2/scheduler" ) type ipController struct { diff --git a/web/ip_controller_test.go b/web/ip_controller_test.go index 21fbfbc6..f6d8b9b8 100644 --- a/web/ip_controller_test.go +++ b/web/ip_controller_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Scalingo/link/api" - "github.com/Scalingo/link/models" - "github.com/Scalingo/link/scheduler" - "github.com/Scalingo/link/scheduler/schedulermock" + "github.com/Scalingo/link/v2/api" + "github.com/Scalingo/link/v2/models" + "github.com/Scalingo/link/v2/scheduler" + "github.com/Scalingo/link/v2/scheduler/schedulermock" ) func TestIPController_Create(t *testing.T) {