From 6a452bc3e6682f7531e68c64f47dfb676235b161 Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Wed, 23 Feb 2022 15:08:08 -0500 Subject: [PATCH] Update to Go 1.17.7 (#14232) --- .circleci/config.yml | 22 +++++++++++----------- .circleci/config/commands/go_test.yml | 2 +- .circleci/config/executors/@executors.yml | 8 ++++---- .github/workflows/build.yml | 6 +++--- Makefile | 2 +- README.md | 2 +- changelog/14232.txt | 3 +++ scripts/docker/Dockerfile | 2 +- scripts/docker/Dockerfile.ui | 2 +- 9 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 changelog/14232.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index f0ced96ba..1dcde32e6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,7 +145,7 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.17.5 + - GO_VERSION: 1.17.7 - GOFUMPT_VERSION: 0.2.1 - GOTESTSUM_VERSION: 0.5.2 algolia-index: @@ -166,7 +166,7 @@ jobs: name: Push content to Algolia Index test-go-remote-docker: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.5 + - image: docker.mirror.hashicorp.services/cimg/go:1.17.7 resource_class: medium working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -299,7 +299,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.5 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.7 \ tail -f /dev/null # Run tests @@ -398,12 +398,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.17.5 + - GO_VERSION: 1.17.7 - GOFUMPT_VERSION: 0.2.1 - GOTESTSUM_VERSION: 0.5.2 test-go-race: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.5 + - image: docker.mirror.hashicorp.services/cimg/go:1.17.7 resource_class: xlarge working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -532,7 +532,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.5 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.7 \ tail -f /dev/null # Run tests @@ -613,7 +613,7 @@ jobs: name: Build Docker Image if Necessary test-go: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.5 + - image: docker.mirror.hashicorp.services/cimg/go:1.17.7 resource_class: large working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -742,7 +742,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.5 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.7 \ tail -f /dev/null # Run tests @@ -881,12 +881,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.17.5 + - GO_VERSION: 1.17.7 - GOFUMPT_VERSION: 0.2.1 - GOTESTSUM_VERSION: 0.5.2 test-go-race-remote-docker: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.5 + - image: docker.mirror.hashicorp.services/cimg/go:1.17.7 resource_class: medium working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -1019,7 +1019,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.5 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.7 \ tail -f /dev/null # Run tests diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml index ca3f71f0d..d67634dec 100644 --- a/.circleci/config/commands/go_test.yml +++ b/.circleci/config/commands/go_test.yml @@ -14,7 +14,7 @@ parameters: default: false go_image: type: string - default: "docker.mirror.hashicorp.services/cimg/go:1.17.5" + default: "docker.mirror.hashicorp.services/cimg/go:1.17.7" use_docker: type: boolean default: false diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml index a97895c42..d379a417b 100644 --- a/.circleci/config/executors/@executors.yml +++ b/.circleci/config/executors/@executors.yml @@ -3,7 +3,7 @@ go-machine: shell: /usr/bin/env bash -euo pipefail -c environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) - GO_VERSION: 1.17.5 # Pin Go to patch version (ex: 1.2.3) + GO_VERSION: 1.17.7 # Pin Go to patch version (ex: 1.2.3) GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3) GOFUMPT_VERSION: 0.2.1 # Pin gofumpt to patch version (ex: 1.2.3) GO_TAGS: "" @@ -26,7 +26,7 @@ alpine: docker-env-go-test-remote-docker: resource_class: medium docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.17.5" + - image: "docker.mirror.hashicorp.services/cimg/go:1.17.7" environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) GO_TAGS: "" @@ -34,7 +34,7 @@ docker-env-go-test-remote-docker: docker-env-go-test: resource_class: large docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.17.5" + - image: "docker.mirror.hashicorp.services/cimg/go:1.17.7" environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) GO_TAGS: "" @@ -42,7 +42,7 @@ docker-env-go-test: docker-env-go-test-race: resource_class: xlarge docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.17.5" + - image: "docker.mirror.hashicorp.services/cimg/go:1.17.7" environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) GO_TAGS: "" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 973983290..ff5113d4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: matrix: goos: [ freebsd, windows, netbsd, openbsd, solaris ] goarch: [ "386", "amd64", "arm" ] - go: [ "1.17.5" ] + go: [ "1.17.7" ] exclude: - goos: solaris goarch: 386 @@ -103,7 +103,7 @@ jobs: matrix: goos: [linux] goarch: ["arm", "arm64", "386", "amd64"] - go: ["1.17.5"] + go: ["1.17.7"] fail-fast: true name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build @@ -180,7 +180,7 @@ jobs: matrix: goos: [ darwin ] goarch: [ "amd64", "arm64" ] - go: [ "1.17.5" ] + go: [ "1.17.7" ] fail-fast: true name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build steps: diff --git a/Makefile b/Makefile index 4c5dd1eeb..fde793465 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ EXTERNAL_TOOLS=\ GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor) -GO_VERSION_MIN=1.17.5 +GO_VERSION_MIN=1.17.7 GO_CMD?=go CGO_ENABLED?=0 ifneq ($(FDB_ENABLED), ) diff --git a/README.md b/README.md index 3dbb4009c..f1568a6a3 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Developing Vault If you wish to work on Vault itself or any of its built-in systems, you'll first need [Go](https://www.golang.org) installed on your machine. Go version -1.17.5+ is *required*. +1.17.7+ is *required*. For local dev first make sure Go is properly installed, including setting up a [GOPATH](https://golang.org/doc/code.html#GOPATH). Ensure that `$GOPATH/bin` is in diff --git a/changelog/14232.txt b/changelog/14232.txt new file mode 100644 index 000000000..e9497b5e7 --- /dev/null +++ b/changelog/14232.txt @@ -0,0 +1,3 @@ +```release-note:improvement +core: Bump Go version to 1.17.7. +``` diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 71aa724b4..c82d46fb9 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -1,7 +1,7 @@ # Multi-stage builder to avoid polluting users environment with wrong # architecture binaries. Since this binary is used in an alpine container, # we're explicitly compiling for 'linux/amd64' -ARG VERSION=1.17.5 +ARG VERSION=1.17.7 FROM golang:${VERSION} AS builder diff --git a/scripts/docker/Dockerfile.ui b/scripts/docker/Dockerfile.ui index f49924c40..5d6470e07 100644 --- a/scripts/docker/Dockerfile.ui +++ b/scripts/docker/Dockerfile.ui @@ -3,7 +3,7 @@ # we're explicitly compiling for 'linux/amd64' FROM debian:buster AS builder -ARG VERSION=1.17.5 +ARG VERSION=1.17.7 ARG CGO_ENABLED=0 ARG BUILD_TAGS ENV JOBS=2