From d651606603407d9aeafa7ebc6b028d8d7d9c8d65 Mon Sep 17 00:00:00 2001 From: Hamid Ghaf <83242695+hghaf099@users.noreply.github.com> Date: Tue, 23 Aug 2022 19:00:26 -0400 Subject: [PATCH] Update 1.9.x go 1.17.13 (#16836) * Update go version to 1.17.13 for 1.9.x * adding CL --- .circleci/config.yml | 20 ++++++++++---------- .circleci/config/commands/go_test.yml | 2 +- .circleci/config/executors/@executors.yml | 8 ++++---- .github/workflows/build.yml | 6 +++--- Makefile | 2 +- README.md | 2 +- changelog/_go-ver-199.txt | 3 +++ scripts/docker/Dockerfile | 2 +- scripts/docker/Dockerfile.ui | 2 +- 9 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 changelog/_go-ver-199.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 9fd098971fb1..31eabff1289f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -147,7 +147,7 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.17.12 + - GO_VERSION: 1.17.13 - GOTESTSUM_VERSION: 0.5.2 algolia-index: docker: @@ -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.12 + - image: docker.mirror.hashicorp.services/cimg/go:1.17.13 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.12 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.13 \ tail -f /dev/null # Run tests @@ -363,7 +363,7 @@ jobs: - GO_TAGS: '' test-go-race: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.12 + - image: docker.mirror.hashicorp.services/cimg/go:1.17.13 resource_class: xlarge working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -492,7 +492,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.12 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.13 \ tail -f /dev/null # Run tests @@ -573,7 +573,7 @@ jobs: name: Build Docker Image if Necessary test-go: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.12 + - image: docker.mirror.hashicorp.services/cimg/go:1.17.13 resource_class: large working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -702,7 +702,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.12 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.13 \ tail -f /dev/null # Run tests @@ -849,11 +849,11 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.17.12 + - GO_VERSION: 1.17.13 - GOTESTSUM_VERSION: 0.5.2 test-go-race-remote-docker: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.12 + - image: docker.mirror.hashicorp.services/cimg/go:1.17.13 resource_class: medium working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -986,7 +986,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.12 \ + testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.13 \ tail -f /dev/null # Run tests diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml index 0ff2f0e7aa7d..5ab0d9de1ee0 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.12" + default: "docker.mirror.hashicorp.services/cimg/go:1.17.13" use_docker: type: boolean default: false diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml index 48cb382dd1a4..b85d8347643c 100644 --- a/.circleci/config/executors/@executors.yml +++ b/.circleci/config/executors/@executors.yml @@ -4,7 +4,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.12 # Pin Go to patch version (ex: 1.2.3) + GO_VERSION: 1.17.13 # Pin Go to patch version (ex: 1.2.3) GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3) GO_TAGS: "" working_directory: /home/circleci/go/src/github.com/hashicorp/vault @@ -26,7 +26,7 @@ alpine: docker-env-go-test-remote-docker: resource_class: medium docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.17.12" + - image: "docker.mirror.hashicorp.services/cimg/go:1.17.13" 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.12" + - image: "docker.mirror.hashicorp.services/cimg/go:1.17.13" 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.12" + - image: "docker.mirror.hashicorp.services/cimg/go:1.17.13" 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 f06ea4136b88..1214157bf89f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: matrix: goos: [ freebsd, windows, netbsd, openbsd, solaris ] goarch: [ "386", "amd64", "arm" ] - go: [ "1.17.12" ] + go: [ "1.17.13" ] exclude: - goos: solaris goarch: 386 @@ -98,7 +98,7 @@ jobs: matrix: goos: [linux] goarch: ["arm", "arm64", "386", "amd64"] - go: ["1.17.12"] + go: ["1.17.13"] fail-fast: true name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build @@ -175,7 +175,7 @@ jobs: matrix: goos: [ darwin ] goarch: [ "amd64", "arm64" ] - go: [ "1.17.12" ] + go: [ "1.17.13" ] fail-fast: true name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build steps: diff --git a/Makefile b/Makefile index e1ffa2ce912d..0c1bfc98bda9 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.12 +GO_VERSION_MIN=1.17.13 GO_CMD?=go CGO_ENABLED?=0 ifneq ($(FDB_ENABLED), ) diff --git a/README.md b/README.md index d2a97b9b44ee..d9da46614e52 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,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.12+ is *required*. +1.17.13+ 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/_go-ver-199.txt b/changelog/_go-ver-199.txt new file mode 100644 index 000000000000..a749401955d7 --- /dev/null +++ b/changelog/_go-ver-199.txt @@ -0,0 +1,3 @@ +```release-note:change +core: Bump Go version to 1.17.13. +``` diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index e408df085093..1ee94cf09652 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.12 +ARG VERSION=1.17.13 FROM golang:${VERSION} AS builder diff --git a/scripts/docker/Dockerfile.ui b/scripts/docker/Dockerfile.ui index 4163ffbbed61..9bfbfb38110c 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.12 +ARG VERSION=1.17.13 ARG CGO_ENABLED=0 ARG BUILD_TAGS ENV JOBS=2