From 0c00f80e4f706ef80ac309ab15465c430ff9daeb Mon Sep 17 00:00:00 2001 From: Steve Clark Date: Tue, 22 Nov 2022 15:06:20 -0500 Subject: [PATCH] Update 1.12.2 to Go 1.19.3 --- .circleci/config.yml | 22 +++++++++++----------- .circleci/config/commands/go_test.yml | 2 +- .circleci/config/executors/@executors.yml | 8 ++++---- .go-version | 2 +- Makefile | 2 +- README.md | 2 +- changelog/_go-ver-1122.txt | 3 +++ scripts/docker/Dockerfile | 2 +- scripts/docker/Dockerfile.ui | 2 +- 9 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 changelog/_go-ver-1122.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 9d0c4f63c96de..ddda81ddb98f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,12 +120,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.19.2 + - GO_VERSION: 1.19.3 - GOFUMPT_VERSION: 0.3.1 - GOTESTSUM_VERSION: 0.5.2 test-go-remote-docker: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.19.2 + - image: docker.mirror.hashicorp.services/cimg/go:1.19.3 resource_class: medium working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -261,7 +261,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network ${TEST_DOCKER_NETWORK_NAME} \ - docker.mirror.hashicorp.services/cimg/go:1.19.2 \ + docker.mirror.hashicorp.services/cimg/go:1.19.3 \ tail -f /dev/null)" mkdir workspace echo ${CONTAINER_ID} > workspace/container_id @@ -392,12 +392,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.19.2 + - GO_VERSION: 1.19.3 - GOFUMPT_VERSION: 0.3.1 - GOTESTSUM_VERSION: 0.5.2 test-go-race: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.19.2 + - image: docker.mirror.hashicorp.services/cimg/go:1.19.3 resource_class: xlarge working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -529,7 +529,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network ${TEST_DOCKER_NETWORK_NAME} \ - docker.mirror.hashicorp.services/cimg/go:1.19.2 \ + docker.mirror.hashicorp.services/cimg/go:1.19.3 \ tail -f /dev/null)" mkdir workspace echo ${CONTAINER_ID} > workspace/container_id @@ -616,7 +616,7 @@ jobs: - GO_TAGS: '' test-go: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.19.2 + - image: docker.mirror.hashicorp.services/cimg/go:1.19.3 resource_class: large working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -748,7 +748,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network ${TEST_DOCKER_NETWORK_NAME} \ - docker.mirror.hashicorp.services/cimg/go:1.19.2 \ + docker.mirror.hashicorp.services/cimg/go:1.19.3 \ tail -f /dev/null)" mkdir workspace echo ${CONTAINER_ID} > workspace/container_id @@ -936,12 +936,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.19.2 + - GO_VERSION: 1.19.3 - GOFUMPT_VERSION: 0.3.1 - GOTESTSUM_VERSION: 0.5.2 test-go-race-remote-docker: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.19.2 + - image: docker.mirror.hashicorp.services/cimg/go:1.19.3 resource_class: medium working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -1077,7 +1077,7 @@ jobs: -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network ${TEST_DOCKER_NETWORK_NAME} \ - docker.mirror.hashicorp.services/cimg/go:1.19.2 \ + docker.mirror.hashicorp.services/cimg/go:1.19.3 \ tail -f /dev/null)" mkdir workspace echo ${CONTAINER_ID} > workspace/container_id diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml index 57a920d063760..0f2094a81a9f7 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.19.2" + default: "docker.mirror.hashicorp.services/cimg/go:1.19.3" use_docker: type: boolean default: false diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml index 467e7ac4551a7..8bf34877d9fee 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.19.2 # Pin Go to patch version (ex: 1.2.3) + GO_VERSION: 1.19.3 # 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.3.1 # Pin gofumpt to patch version (ex: 1.2.3) GO_TAGS: "" @@ -30,7 +30,7 @@ semgrep: docker-env-go-test-remote-docker: resource_class: medium docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.19.2" + - image: "docker.mirror.hashicorp.services/cimg/go:1.19.3" environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) GO_TAGS: "" @@ -38,7 +38,7 @@ docker-env-go-test-remote-docker: docker-env-go-test: resource_class: large docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.19.2" + - image: "docker.mirror.hashicorp.services/cimg/go:1.19.3" environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) GO_TAGS: "" @@ -46,7 +46,7 @@ docker-env-go-test: docker-env-go-test-race: resource_class: xlarge docker: - - image: "docker.mirror.hashicorp.services/cimg/go:1.19.2" + - image: "docker.mirror.hashicorp.services/cimg/go:1.19.3" environment: CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) GO_TAGS: "" diff --git a/.go-version b/.go-version index 836ae4eda2992..1b92e588b7943 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.19.2 +1.19.3 diff --git a/Makefile b/Makefile index ff957df189776..610f9e87ebc54 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor) SED?=$(shell command -v gsed || command -v sed) -GO_VERSION_MIN=1.19.2 +GO_VERSION_MIN=1.19.3 PROTOC_VERSION_MIN=3.21.5 GO_CMD?=go CGO_ENABLED?=0 diff --git a/README.md b/README.md index ccf7c6f439b71..9dc9eaccd4c75 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.19.2+ is *required*. +1.19.3+ 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-1122.txt b/changelog/_go-ver-1122.txt new file mode 100644 index 0000000000000..c7744e1497577 --- /dev/null +++ b/changelog/_go-ver-1122.txt @@ -0,0 +1,3 @@ +```release-note:change +core: Bump Go version to 1.19.3. +``` diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 0fff3d49f840e..295d9cd391b26 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -1,6 +1,6 @@ # Multi-stage builder to avoid polluting users environment with wrong # architecture binaries. -ARG VERSION=1.19.2 +ARG VERSION=1.19.3 FROM golang:${VERSION} AS builder diff --git a/scripts/docker/Dockerfile.ui b/scripts/docker/Dockerfile.ui index e0b9603e54e4c..e73d43432bb54 100644 --- a/scripts/docker/Dockerfile.ui +++ b/scripts/docker/Dockerfile.ui @@ -2,7 +2,7 @@ # architecture binaries. This file only currently works for linux/amd64. FROM debian:buster AS builder -ARG VERSION=1.19.2 +ARG VERSION=1.19.3 ARG CGO_ENABLED=0 ARG BUILD_TAGS ENV JOBS=2