From ec2b7c7da63ca1d0b9c128d381fcf63b65471999 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 2 Sep 2021 12:28:03 -0700 Subject: [PATCH] all: bump minimum Go to 1.17 In prep for using 1.17 features. Note the go.mod changes are due to: https://golang.org/doc/go1.17#go-command Signed-off-by: Brad Fitzpatrick --- .github/workflows/cross-darwin.yml | 2 +- .github/workflows/cross-freebsd.yml | 2 +- .github/workflows/cross-openbsd.yml | 2 +- .github/workflows/cross-windows.yml | 2 +- .github/workflows/depaware.yml | 2 +- .github/workflows/go_generate.yml | 2 +- .github/workflows/license.yml | 2 +- .github/workflows/linux-race.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/linux32.yml | 2 +- .github/workflows/staticcheck.yml | 2 +- .github/workflows/windows-race.yml | 2 +- .github/workflows/windows.yml | 2 +- Dockerfile | 2 +- README.md | 2 +- go.mod | 147 +++++++++++++++++++++++++++- 16 files changed, 161 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cross-darwin.yml b/.github/workflows/cross-darwin.yml index 6158cc32c..07b1bef90 100644 --- a/.github/workflows/cross-darwin.yml +++ b/.github/workflows/cross-darwin.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/cross-freebsd.yml b/.github/workflows/cross-freebsd.yml index b0793ee9f..420a1bc3d 100644 --- a/.github/workflows/cross-freebsd.yml +++ b/.github/workflows/cross-freebsd.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/cross-openbsd.yml b/.github/workflows/cross-openbsd.yml index d29819f75..711e995a9 100644 --- a/.github/workflows/cross-openbsd.yml +++ b/.github/workflows/cross-openbsd.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/cross-windows.yml b/.github/workflows/cross-windows.yml index d1e5e4c3d..7e1aa778c 100644 --- a/.github/workflows/cross-windows.yml +++ b/.github/workflows/cross-windows.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/depaware.yml b/.github/workflows/depaware.yml index 829304613..e28e10f97 100644 --- a/.github/workflows/depaware.yml +++ b/.github/workflows/depaware.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 - name: Check out code uses: actions/checkout@v1 diff --git a/.github/workflows/go_generate.yml b/.github/workflows/go_generate.yml index ddf37cf10..2554a45af 100644 --- a/.github/workflows/go_generate.yml +++ b/.github/workflows/go_generate.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 - name: Check out code uses: actions/checkout@v2 diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 9dba471f1..8f73a3e0b 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 - name: Check out code uses: actions/checkout@v1 diff --git a/.github/workflows/linux-race.yml b/.github/workflows/linux-race.yml index 03b5dccd6..fb68b1863 100644 --- a/.github/workflows/linux-race.yml +++ b/.github/workflows/linux-race.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b4f82b6ef..bdb0868f9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/linux32.yml b/.github/workflows/linux32.yml index 79a229d16..34d1252ca 100644 --- a/.github/workflows/linux32.yml +++ b/.github/workflows/linux32.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/staticcheck.yml b/.github/workflows/staticcheck.yml index b6b5d67c3..3f0ab9430 100644 --- a/.github/workflows/staticcheck.yml +++ b/.github/workflows/staticcheck.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 - name: Check out code uses: actions/checkout@v1 diff --git a/.github/workflows/windows-race.yml b/.github/workflows/windows-race.yml index a3c99822f..7612f5abe 100644 --- a/.github/workflows/windows-race.yml +++ b/.github/workflows/windows-race.yml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.17.x - name: Checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2783e3aee..32f347ccd 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.17.x - name: Checkout code uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index 9b59e2b28..5ab19183f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ # $ docker exec tailscaled tailscale status -FROM golang:1.16-alpine AS build-env +FROM golang:1.17-alpine AS build-env WORKDIR /go/src/tailscale diff --git a/README.md b/README.md index 1303bf8e5..39eb45785 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If your distro has conventions that preclude the use of distro's way, so that bug reports contain useful version information. We only guarantee to support the latest Go release and any Go beta or -release candidate builds (currently Go 1.16) in module mode. It might +release candidate builds (currently Go 1.17) in module mode. It might work in earlier Go versions or in GOPATH mode, but we're making no effort to keep those working. diff --git a/go.mod b/go.mod index 7b85b21ad..4e60ec5f3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module tailscale.com -go 1.16 +go 1.17 require ( github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 @@ -52,3 +52,148 @@ require ( inet.af/peercred v0.0.0-20210318190834-4259e17bb763 inet.af/wf v0.0.0-20210516214145-a5343001b756 ) + +require ( + 4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a // indirect + github.com/BurntSushi/toml v0.3.1 // indirect + github.com/Djarvur/go-err113 v0.1.0 // indirect + github.com/Masterminds/goutils v1.1.0 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Masterminds/semver/v3 v3.1.1 // indirect + github.com/Masterminds/sprig v2.22.0+incompatible // indirect + github.com/Microsoft/go-winio v0.4.16 // indirect + github.com/OpenPeeDeeP/depguard v1.0.1 // indirect + github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect + github.com/bombsimon/wsl/v3 v3.1.0 // indirect + github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e // indirect + github.com/daixiang0/gci v0.2.7 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/denis-tingajkin/go-header v0.3.1 // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/fatih/color v1.10.0 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-critic/go-critic v0.5.2 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.0.0 // indirect + github.com/go-git/go-git/v5 v5.2.0 // indirect + github.com/go-toolsmith/astcast v1.0.0 // indirect + github.com/go-toolsmith/astcopy v1.0.0 // indirect + github.com/go-toolsmith/astequal v1.0.0 // indirect + github.com/go-toolsmith/astfmt v1.0.0 // indirect + github.com/go-toolsmith/astp v1.0.0 // indirect + github.com/go-toolsmith/strparse v1.0.0 // indirect + github.com/go-toolsmith/typep v1.0.2 // indirect + github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect + github.com/gobwas/glob v0.2.3 // indirect + github.com/gofrs/flock v0.8.0 // indirect + github.com/golang/protobuf v1.4.2 // indirect + github.com/golang/snappy v0.0.3 // indirect + github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect + github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect + github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 // indirect + github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 // indirect + github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d // indirect + github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect + github.com/golangci/golangci-lint v1.33.0 // indirect + github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc // indirect + github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect + github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect + github.com/golangci/misspell v0.3.5 // indirect + github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 // indirect + github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 // indirect + github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect + github.com/google/btree v1.0.1 // indirect + github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f // indirect + github.com/google/rpmpack v0.0.0-20201206194719-59e495f2b7e1 // indirect + github.com/goreleaser/chglog v0.1.2 // indirect + github.com/goreleaser/fileglob v0.3.1 // indirect + github.com/gostaticanalysis/analysisutil v0.6.1 // indirect + github.com/gostaticanalysis/comment v1.4.1 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.11 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jgautheron/goconst v0.0.0-20201117150253-ccae5bf973f3 // indirect + github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a // indirect + github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect + github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect + github.com/kisielk/gotool v1.0.0 // indirect + github.com/kr/fs v0.1.0 // indirect + github.com/kr/pretty v0.2.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/kunwardeep/paralleltest v1.0.2 // indirect + github.com/kyoh86/exportloopref v0.1.8 // indirect + github.com/magiconair/properties v1.8.4 // indirect + github.com/maratori/testpackage v1.0.1 // indirect + github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mbilski/exhaustivestruct v1.1.0 // indirect + github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00 // indirect + github.com/mitchellh/copystructure v1.0.0 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.4.0 // indirect + github.com/mitchellh/reflectwalk v1.0.1 // indirect + github.com/moricho/tparallel v0.2.1 // indirect + github.com/nakabonne/nestif v0.3.0 // indirect + github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect + github.com/nishanths/exhaustive v0.1.0 // indirect + github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect + github.com/pelletier/go-toml v1.8.1 // indirect + github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect + github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f // indirect + github.com/quasilyte/go-ruleguard v0.2.1 // indirect + github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c // indirect + github.com/ryancurrah/gomodguard v1.1.0 // indirect + github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect + github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b // indirect + github.com/securego/gosec/v2 v2.5.0 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect + github.com/sirupsen/logrus v1.7.0 // indirect + github.com/sonatard/noctx v0.0.1 // indirect + github.com/sourcegraph/go-diff v0.6.1 // indirect + github.com/spf13/afero v1.5.1 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/spf13/cobra v1.1.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.7.1 // indirect + github.com/ssgreg/nlreturn/v2 v2.1.0 // indirect + github.com/stretchr/objx v0.3.0 // indirect + github.com/stretchr/testify v1.6.1 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect + github.com/tetafro/godot v1.3.2 // indirect + github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect + github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756 // indirect + github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa // indirect + github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect + github.com/ulikunitz/xz v0.5.7 // indirect + github.com/ultraware/funlen v0.0.3 // indirect + github.com/ultraware/whitespace v0.0.4 // indirect + github.com/uudashr/gocognit v1.0.1 // indirect + github.com/xanzy/ssh-agent v0.3.0 // indirect + go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect + go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 // indirect + golang.org/x/mod v0.4.2 // indirect + golang.org/x/text v0.3.7-0.20210524175448-3115f89c4b99 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a // indirect + google.golang.org/grpc v1.31.0 // indirect + google.golang.org/protobuf v1.23.0 // indirect + gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect + mvdan.cc/gofumpt v0.0.0-20201129102820-5c11c50e9475 // indirect + mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect + mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect + mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7 // indirect +)