diff --git a/.changelog/11461.txt b/.changelog/11461.txt new file mode 100644 index 000000000000..2ccdb1809271 --- /dev/null +++ b/.changelog/11461.txt @@ -0,0 +1,3 @@ +```release-note:bug +build: Update go toolchain to 1.17.3 +``` diff --git a/.circleci/config.yml b/.circleci/config.yml index 1f4e64459aba..88bb0d3e2d5e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -512,7 +512,7 @@ executors: go: working_directory: /go/src/github.com/hashicorp/nomad docker: - - image: docker.mirror.hashicorp.services/golang:1.17.1 + - image: docker.mirror.hashicorp.services/golang:1.17.3 environment: <<: *common_envs GOPATH: /go @@ -524,7 +524,7 @@ executors: environment: &machine_env <<: *common_envs GOPATH: /home/circleci/go - GOLANG_VERSION: 1.17.1 + GOLANG_VERSION: 1.17.3 # uses a more recent image with unattended upgrades disabled properly # but seems to break docker builds @@ -541,7 +541,7 @@ executors: environment: <<: *common_envs GOPATH: /Users/distiller/go - GOLANG_VERSION: 1.17.1 + GOLANG_VERSION: 1.17.3 go-windows: machine: @@ -553,7 +553,7 @@ executors: GOPATH: c:\gopath GOBIN: c:\gopath\bin GOTESTSUM_PATH: c:\tmp\test-reports - GOLANG_VERSION: 1.17.1 + GOLANG_VERSION: 1.17.3 GOTESTSUM_VERSION: 0.4.2 VAULT_VERSION: 1.4.1 diff --git a/contributing/README.md b/contributing/README.md index 945e35d80c5e..2401cf7456cf 100644 --- a/contributing/README.md +++ b/contributing/README.md @@ -30,7 +30,7 @@ A development environment is supplied via Vagrant to make getting started easier Developing without Vagrant --- -1. Install [Go 1.17.1+](https://golang.org/) *(Note: `gcc-go` is not supported)* +1. Install [Go 1.17.3+](https://golang.org/) *(Note: `gcc-go` is not supported)* 1. Clone this repo ```sh $ git clone https://github.com/hashicorp/nomad.git diff --git a/go.mod b/go.mod index 0b8784c06e96..b0a23ff314bc 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/nomad -go 1.16 +go 1.17 replace ( github.com/Microsoft/go-winio => github.com/endocrimes/go-winio v0.4.13-0.20190628114223-fb47a8b41948 @@ -14,9 +14,6 @@ replace ( ) require ( - cloud.google.com/go/storage v1.0.0 // indirect - github.com/Azure/go-autorest/autorest v0.11.4 // indirect - github.com/Azure/go-autorest/autorest/azure/auth v0.5.1 // indirect github.com/LK4D4/joincontext v0.0.0-20171026170139-1724345da6d5 github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873 github.com/NYTimes/gziphandler v1.0.1 @@ -30,20 +27,14 @@ require ( github.com/containernetworking/plugins v0.7.3-0.20190501191748-2d6d46d308b2 github.com/coreos/go-iptables v0.4.3-0.20190724151750-969b135e941d github.com/coreos/go-semver v0.3.0 - github.com/cyphar/filepath-securejoin v0.2.3-0.20190205144030-7efe413b52e1 // indirect - github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba // indirect github.com/docker/cli v0.0.0-20200303215952-eb310fca4956 github.com/docker/distribution v2.7.1+incompatible github.com/docker/docker v17.12.0-ce-rc1.0.20200330121334-7f8b4b621b5d+incompatible - github.com/docker/docker-credential-helpers v0.6.2-0.20180719074751-73e5f5dbfea3 // indirect - github.com/docker/go-metrics v0.0.1 // indirect github.com/docker/go-units v0.4.0 github.com/docker/libnetwork v0.8.0-dev.2.0.20200612180813-9e99af28df21 - github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect github.com/dustin/go-humanize v1.0.0 github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f github.com/fatih/color v1.9.0 - github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/fsouza/go-dockerclient v1.6.5 github.com/golang/protobuf v1.5.0 github.com/golang/snappy v0.0.4 @@ -90,8 +81,6 @@ require ( github.com/hashicorp/vault/sdk v0.2.0 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d github.com/hpcloud/tail v1.0.1-0.20170814160653-37f427138745 - github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07 // indirect - github.com/joyent/triton-go v0.0.0-20190112182421-51ffac552869 // indirect github.com/kr/pretty v0.2.0 github.com/kr/pty v1.1.5 github.com/kr/text v0.2.0 @@ -106,9 +95,6 @@ require ( github.com/mitchellh/hashstructure v1.0.0 github.com/mitchellh/mapstructure v1.4.1 github.com/mitchellh/reflectwalk v1.0.1 - github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect - github.com/oklog/run v1.0.1-0.20180308005104-6934b124db28 // indirect - github.com/onsi/gomega v1.9.0 // indirect github.com/opencontainers/runc v1.0.0-rc93 github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d github.com/pkg/errors v0.9.1 @@ -119,25 +105,149 @@ require ( github.com/ryanuber/columnize v2.1.1-0.20170703205827-abc90934186a+incompatible github.com/ryanuber/go-glob v1.0.0 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 - github.com/seccomp/libseccomp-golang v0.9.2-0.20200314001724-bdab42bd5128 // indirect github.com/shirou/gopsutil/v3 v3.21.6-0.20210619153009-7ea8062810b6 github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c - github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.7.0 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 github.com/zclconf/go-cty v1.8.0 github.com/zclconf/go-cty-yaml v1.0.2 - go.opencensus.io v0.22.1-0.20190713072201-b4a14686f0a9 // indirect go.uber.org/goleak v1.1.12 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e - google.golang.org/api v0.13.0 // indirect google.golang.org/grpc v1.29.1 - gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 gopkg.in/tomb.v2 v2.0.0-20140626144623-14b3d72120e8 +) + +require ( + cloud.google.com/go v0.46.3 // indirect + cloud.google.com/go/storage v1.0.0 // indirect + github.com/Azure/azure-sdk-for-go v44.0.0+incompatible // indirect + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.4 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.2 // indirect + github.com/Azure/go-autorest/autorest/azure/auth v0.5.1 // indirect + github.com/Azure/go-autorest/autorest/azure/cli v0.4.0 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect + github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.0 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/BurntSushi/toml v0.3.1 // indirect + github.com/DataDog/datadog-go v3.2.0+incompatible // indirect + github.com/Microsoft/hcsshim v0.8.9 // indirect + github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect + github.com/VividCortex/ewma v1.1.1 // indirect + github.com/agext/levenshtein v1.2.1 // indirect + github.com/apparentlymart/go-cidr v1.0.1 // indirect + github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/armon/go-radix v1.0.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/bgentry/speakeasy v0.1.0 // indirect + github.com/bmatcuk/doublestar v1.1.5 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/checkpoint-restore/go-criu/v4 v4.1.0 // indirect + github.com/cheggaaa/pb/v3 v3.0.5 // indirect + github.com/cilium/ebpf v0.2.0 // indirect + github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect + github.com/circonus-labs/circonusllhist v0.1.3 // indirect + github.com/containerd/console v1.0.1 // indirect + github.com/containerd/containerd v1.3.4 // indirect + github.com/containerd/continuity v0.0.0-20200709052629-daa8e1ccc0bc // indirect + github.com/coreos/go-systemd/v22 v22.1.0 // indirect + github.com/cyphar/filepath-securejoin v0.2.3-0.20190205144030-7efe413b52e1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba // indirect + github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect + github.com/digitalocean/godo v1.10.0 // indirect + github.com/dimchansky/utfbom v1.1.0 // indirect + github.com/docker/docker-credential-helpers v0.6.2-0.20180719074751-73e5f5dbfea3 // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-metrics v0.0.1 // indirect + github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-ole/go-ole v1.2.4 // indirect + github.com/godbus/dbus/v5 v5.0.3 // indirect + github.com/gogo/protobuf v1.3.1 // indirect + github.com/google/btree v1.0.0 // indirect + github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect + github.com/google/uuid v1.1.1 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/gookit/color v1.3.1 // indirect + github.com/gophercloud/gophercloud v0.1.0 // indirect + github.com/gorilla/mux v1.7.4 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-retryablehttp v0.6.7 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/hashicorp/mdns v1.0.1 // indirect + github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 // indirect + github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/joyent/triton-go v0.0.0-20190112182421-51ffac552869 // indirect + github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024 // indirect + github.com/klauspost/compress v1.11.2 // indirect + github.com/linode/linodego v0.7.1 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-runewidth v0.0.7 // indirect + github.com/mattn/go-shellwords v1.0.10 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/moby/sys/mountinfo v0.4.0 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/mrunalp/fileutils v0.5.0 // indirect + github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect + github.com/oklog/run v1.0.1-0.20180308005104-6934b124db28 // indirect + github.com/onsi/gomega v1.9.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/opencontainers/selinux v1.8.0 // indirect + github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect + github.com/pierrec/lz4 v2.5.2+incompatible // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/procfs v0.0.8 // indirect + github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 // indirect + github.com/seccomp/libseccomp-golang v0.9.2-0.20200314001724-bdab42bd5128 // indirect + github.com/sirupsen/logrus v1.7.0 // indirect + github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d // indirect + github.com/stretchr/objx v0.2.0 // indirect + github.com/tencentcloud/tencentcloud-sdk-go v1.0.162 // indirect + github.com/tj/go-spin v1.1.0 // indirect + github.com/tklauser/go-sysconf v0.3.6 // indirect + github.com/tklauser/numcpus v0.2.2 // indirect + github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect + github.com/ulikunitz/xz v0.5.8 // indirect + github.com/vishvananda/netlink v1.1.0 // indirect + github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect + github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect + github.com/vmihailenco/tagparser v0.1.1 // indirect + github.com/vmware/govmomi v0.18.0 // indirect + github.com/willf/bitset v1.1.11 // indirect + go.opencensus.io v0.22.1-0.20190713072201-b4a14686f0a9 // indirect + golang.org/x/exp v0.0.0-20190829153037-c13cbed26979 // indirect + golang.org/x/lint v0.0.0-20190930215403-16217165b5de // indirect + golang.org/x/mod v0.4.2 // indirect + golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect + golang.org/x/text v0.3.5 // indirect + golang.org/x/tools v0.1.5 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/api v0.13.0 // indirect + google.golang.org/appengine v1.6.5 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/protobuf v1.26.0-rc.1 // indirect + gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect + gopkg.in/fsnotify.v1 v1.4.7 // indirect + gopkg.in/resty.v1 v1.12.0 // indirect + gopkg.in/square/go-jose.v2 v2.5.1 // indirect + gopkg.in/yaml.v2 v2.3.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect honnef.co/go/tools v0.0.1-2020.1.4 // indirect ) diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build index 0222e2d43622..7027058bd029 100755 --- a/scripts/release/mac-remote-build +++ b/scripts/release/mac-remote-build @@ -56,7 +56,7 @@ REPO_PATH="${TMP_WORKSPACE}/gopath/src/github.com/hashicorp/nomad" mkdir -p "${TMP_WORKSPACE}/tmp" install_go() { - local go_version="1.17.1" + local go_version="1.17.3" local download= download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz" diff --git a/scripts/vagrant-linux-priv-go.sh b/scripts/vagrant-linux-priv-go.sh index fd85d5bccbdb..7efb21eb29d1 100755 --- a/scripts/vagrant-linux-priv-go.sh +++ b/scripts/vagrant-linux-priv-go.sh @@ -3,7 +3,7 @@ set -o errexit function install_go() { - local go_version="1.17.1" + local go_version="1.17.3" local download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz" if go version 2>&1 | grep -q "${go_version}"; then diff --git a/tools/go.mod b/tools/go.mod index 5ef82a5f272c..0cf657c962c5 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,5 +1,5 @@ module github.com/hashicorp/nomad/tools -go 1.16 +go 1.17 require github.com/aws/aws-sdk-go v1.37.26