-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[backport] chore: support go1.18 and update dependencies
This diff backports #708 to the release/3.14 branch. - - - Here's the squash of the following patches that enable support for go1.18 and update our dependencies. This diff WILL need to be backported to the release/3.14 branch. * chore: use go1.17.8 See ooni/probe#2067 * chore: upgrade to probe-assets@v0.8.0 See ooni/probe#2067. * chore: update dependencies and enable go1.18 As mentioned in ooni/psiphon@7a0d17e, the tree won't build with `go1.18` unless we say it does. So, not only here we need to update dependencies but also we need to explicitly say `go1.18` in the `go.mod`. This work is part of ooni/probe#2067. * chore(coverage.yml): run with go1.18 This change will give us a bare minimum confidence that we're going to build our tree using version 1.18 of golang. See ooni/probe#2067. * chore: update user agent used for measuring See ooni/probe#2067 * chore: run `go generate ./...` See ooni/probe#2067 * fix(dialer_test.go): make test work with go1.17 and go1.18 1. the original test wanted the dial to fail, so ensure we're not passing any domain name to exercise dialing not resolving; 2. match the end of the error rather than the whole error string. Tested locally with both go1.17 and go1.18. See #708 (comment)
- Loading branch information
1 parent
5dcd8a0
commit 45a7092
Showing
47 changed files
with
855 additions
and
504 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
This product includes [IP Geolocation by DB-IP](https://db-ip.com). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,60 +1,121 @@ | ||
module github.com/ooni/probe-cli/v3 | ||
|
||
go 1.16 | ||
go 1.18 | ||
|
||
require ( | ||
filippo.io/age v1.0.0 | ||
git.torproject.org/pluggable-transports/goptlib.git v1.2.0 | ||
git.torproject.org/pluggable-transports/snowflake.git/v2 v2.0.1 | ||
github.com/AlecAivazis/survey/v2 v2.3.2 | ||
git.torproject.org/pluggable-transports/snowflake.git/v2 v2.1.0 | ||
github.com/AlecAivazis/survey/v2 v2.3.4 | ||
github.com/alecthomas/kingpin v2.2.6+incompatible | ||
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect | ||
github.com/apex/log v1.9.0 | ||
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 | ||
github.com/cretz/bine v0.2.0 | ||
github.com/fatih/color v1.13.0 | ||
github.com/fsnotify/fsnotify v1.5.1 // indirect | ||
github.com/google/go-cmp v0.5.6 | ||
github.com/google/martian/v3 v3.2.1 | ||
github.com/google/go-cmp v0.5.7 | ||
github.com/google/martian/v3 v3.3.2 | ||
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 | ||
github.com/google/uuid v1.3.0 | ||
github.com/gorilla/websocket v1.4.2 | ||
github.com/gorilla/websocket v1.5.0 | ||
github.com/hexops/gotextdiff v1.0.3 | ||
github.com/iancoleman/strcase v0.2.0 | ||
github.com/klauspost/cpuid/v2 v2.0.9 // indirect | ||
github.com/klauspost/reedsolomon v1.9.15 // indirect | ||
github.com/lucas-clemente/quic-go v0.25.0 | ||
github.com/marten-seemann/qtls-go1-17 v0.1.0 | ||
github.com/lucas-clemente/quic-go v0.26.0 | ||
github.com/marten-seemann/qtls-go1-17 v0.1.1 | ||
github.com/mattn/go-colorable v0.1.12 | ||
github.com/mattn/go-sqlite3 v1.14.10 // indirect | ||
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect | ||
github.com/miekg/dns v1.1.45 | ||
github.com/miekg/dns v1.1.48 | ||
github.com/mitchellh/go-wordwrap v1.0.1 | ||
github.com/montanaflynn/stats v0.6.6 | ||
github.com/ooni/go-libtor v1.1.4 | ||
github.com/ooni/oohttp v0.0.0-20220118112935-940b7f7db71e | ||
github.com/ooni/probe-assets v0.7.0 | ||
github.com/ooni/psiphon/tunnel-core v0.0.0-20220121102537-7fc0bcd97c5f | ||
github.com/oschwald/geoip2-golang v1.5.0 | ||
github.com/ooni/oohttp v0.0.0-20220412070944-b683bc0f8d53 | ||
github.com/ooni/probe-assets v0.8.0 | ||
github.com/ooni/psiphon/tunnel-core v0.0.0-20220412085408-7a0d17ea91f8 | ||
github.com/oschwald/geoip2-golang v1.7.0 | ||
github.com/pborman/getopt/v2 v2.1.0 | ||
github.com/pion/interceptor v0.1.5 // indirect | ||
github.com/pion/stun v0.3.5 | ||
github.com/pion/webrtc/v3 v3.1.16 // indirect | ||
github.com/pkg/errors v0.9.1 | ||
github.com/rogpeppe/go-internal v1.8.1 | ||
github.com/rubenv/sql-migrate v1.0.0 | ||
github.com/sirupsen/logrus v1.7.0 // indirect | ||
github.com/rubenv/sql-migrate v1.1.1 | ||
gitlab.com/yawning/obfs4.git v0.0.0-20220204003609-77af0cba934d | ||
gitlab.com/yawning/utls.git v0.0.12-1 | ||
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 | ||
golang.org/x/sys v0.0.0-20220412071739-889880a91fd5 | ||
gopkg.in/yaml.v2 v2.4.0 | ||
upper.io/db.v3 v3.8.0+incompatible | ||
) | ||
|
||
require ( | ||
filippo.io/edwards25519 v1.0.0-rc.1.0.20210721174708-390f27c3be20 // indirect | ||
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect | ||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect | ||
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect | ||
github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a // indirect | ||
github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61 // indirect | ||
github.com/cespare/xxhash/v2 v2.1.2 // indirect | ||
github.com/cheekybits/genny v1.0.0 // indirect | ||
github.com/cognusion/go-cache-lru v0.0.0-20170419142635-f73e2280ecea // indirect | ||
github.com/dchest/siphash v1.2.3 // indirect | ||
github.com/dgraph-io/badger v1.6.2 // indirect | ||
github.com/dgraph-io/ristretto v0.1.0 // indirect | ||
github.com/dsnet/compress v0.0.1 // indirect | ||
github.com/dustin/go-humanize v1.0.0 // indirect | ||
github.com/fsnotify/fsnotify v1.5.1 // indirect | ||
github.com/go-gorp/gorp/v3 v3.0.2 // indirect | ||
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect | ||
github.com/golang/glog v1.0.0 // indirect | ||
github.com/golang/protobuf v1.5.3-0.20210916003710-5d5e8c018a13 // indirect | ||
github.com/grafov/m3u8 v0.11.1 // indirect | ||
github.com/hashicorp/golang-lru v0.5.4 // indirect | ||
github.com/juju/ratelimit v1.0.2-0.20191002062651-f60b32039441 // indirect | ||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect | ||
github.com/klauspost/cpuid/v2 v2.0.12 // indirect | ||
github.com/klauspost/reedsolomon v1.9.16 // indirect | ||
github.com/marten-seemann/qpack v0.2.1 // indirect | ||
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect | ||
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect | ||
github.com/mattn/go-isatty v0.0.14 // indirect | ||
github.com/mattn/go-sqlite3 v1.14.12 // indirect | ||
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect | ||
github.com/mroth/weightedrand v0.4.1 // indirect | ||
github.com/nxadm/tail v1.4.8 // indirect | ||
github.com/onsi/ginkgo v1.16.5 // indirect | ||
github.com/oschwald/maxminddb-golang v1.9.0 // indirect | ||
github.com/pion/datachannel v1.5.2 // indirect | ||
github.com/pion/dtls/v2 v2.1.3 // indirect | ||
github.com/pion/ice/v2 v2.2.3 // indirect | ||
github.com/pion/interceptor v0.1.10 // indirect | ||
github.com/pion/logging v0.2.2 // indirect | ||
github.com/pion/mdns v0.0.5 // indirect | ||
github.com/pion/randutil v0.1.0 // indirect | ||
github.com/pion/rtcp v1.2.9 // indirect | ||
github.com/pion/rtp v1.7.11 // indirect | ||
github.com/pion/sctp v1.8.2 // indirect | ||
github.com/pion/sdp/v3 v3.0.4 // indirect | ||
github.com/pion/srtp/v2 v2.0.5 // indirect | ||
github.com/pion/transport v0.13.0 // indirect | ||
github.com/pion/turn/v2 v2.0.8 // indirect | ||
github.com/pion/udp v0.1.1 // indirect | ||
github.com/pion/webrtc/v3 v3.1.27 // indirect | ||
github.com/refraction-networking/gotapdance v0.0.0-20220119224326-7831ceda04f9 // indirect | ||
github.com/refraction-networking/utls v1.0.0 // indirect | ||
github.com/sergeyfrolov/bsbuffer v0.0.0-20180903213811-94e85abb8507 // indirect | ||
github.com/sirupsen/logrus v1.8.1 // indirect | ||
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect | ||
github.com/templexxx/cpu v0.0.9 // indirect | ||
github.com/templexxx/xorsimd v0.4.1 // indirect | ||
github.com/tjfoc/gmsm v1.4.1 // indirect | ||
github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78 // indirect | ||
github.com/xtaci/kcp-go/v5 v5.6.1 // indirect | ||
github.com/xtaci/smux v1.5.16 // indirect | ||
github.com/ziutek/mymysql v1.5.4 // indirect | ||
gitlab.com/yawning/obfs4.git v0.0.0-20210511220700-e330d1b7024b | ||
gitlab.com/yawning/utls.git v0.0.12-1 | ||
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect | ||
golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d | ||
golang.org/x/sys v0.0.0-20220222200937-f2425489ef4c | ||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect | ||
golang.org/x/tools v0.1.9 // indirect | ||
github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea // indirect | ||
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect | ||
gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb // indirect | ||
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect | ||
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect | ||
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect | ||
golang.org/x/text v0.3.7 // indirect | ||
golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect | ||
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect | ||
google.golang.org/protobuf v1.28.0 // indirect | ||
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect | ||
upper.io/db.v3 v3.8.0+incompatible | ||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect | ||
) |
Oops, something went wrong.