From 9a8cbf99cf5cae2375b874d7cfaec127095c8e00 Mon Sep 17 00:00:00 2001 From: Christopher Swenson Date: Tue, 2 Aug 2022 10:36:12 -0700 Subject: [PATCH] Update Go to 1.18 (#16522) Update Go to 1.18 From 1.17.12 1.18.5 was just released, but not all packages have been updated, so I went with 1.18.4 Co-authored-by: Steven Clark --- .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/_go-ver-1120.txt | 2 +- go.mod | 2 +- scripts/docker/Dockerfile | 2 +- scripts/docker/Dockerfile.ui | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a598015c908d..c4fde02e760a 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.17.12 + - GO_VERSION: 1.18.4 - GOFUMPT_VERSION: 0.2.1 - GOTESTSUM_VERSION: 0.5.2 test-go-remote-docker: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.12 + - image: docker.mirror.hashicorp.services/cimg/go:1.18.4 resource_class: medium working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -258,7 +258,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.18.4 \ tail -f /dev/null # Run tests @@ -359,12 +359,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.17.12 + - GO_VERSION: 1.18.4 - GOFUMPT_VERSION: 0.2.1 - GOTESTSUM_VERSION: 0.5.2 test-go-race: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.12 + - image: docker.mirror.hashicorp.services/cimg/go:1.18.4 resource_class: xlarge working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -493,7 +493,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.18.4 \ tail -f /dev/null # Run tests @@ -551,7 +551,7 @@ jobs: - GO_TAGS: '' test-go: docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.17.12 + - image: docker.mirror.hashicorp.services/cimg/go:1.18.4 resource_class: large working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -680,7 +680,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.18.4 \ tail -f /dev/null # Run tests @@ -839,12 +839,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.17.12 + - GO_VERSION: 1.18.4 - 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.12 + - image: docker.mirror.hashicorp.services/cimg/go:1.18.4 resource_class: medium working_directory: /home/circleci/go/src/github.com/hashicorp/vault parallelism: 8 @@ -977,7 +977,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.18.4 \ tail -f /dev/null # Run tests diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml index 36aaad4474a4..874a76dbc857 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.18.4" use_docker: type: boolean default: false diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml index c23c8f337eeb..89e158788b4e 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.18.4 # 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: "" @@ -30,7 +30,7 @@ semgrep: 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.18.4" 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.17.12" + - image: "docker.mirror.hashicorp.services/cimg/go:1.18.4" 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.17.12" + - image: "docker.mirror.hashicorp.services/cimg/go:1.18.4" 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 a4c4afd974bd..12e1f94f99a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: matrix: goos: [ freebsd, windows, netbsd, openbsd, solaris ] goarch: [ "386", "amd64", "arm" ] - go: [ "1.17.12" ] + go: [ "1.18.4" ] exclude: - goos: solaris goarch: 386 @@ -118,7 +118,7 @@ jobs: matrix: goos: [linux] goarch: ["arm", "arm64", "386", "amd64"] - go: ["1.17.12"] + go: ["1.18.4"] fail-fast: true name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build @@ -195,7 +195,7 @@ jobs: matrix: goos: [ darwin ] goarch: [ "amd64", "arm64" ] - go: [ "1.17.12" ] + go: [ "1.18.4" ] fail-fast: true name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build steps: diff --git a/Makefile b/Makefile index b0f9312e2923..bccecfe6ff8b 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,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.18.4 GO_CMD?=go CGO_ENABLED?=0 ifneq ($(FDB_ENABLED), ) diff --git a/README.md b/README.md index d21ed4699370..6293a3633d44 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.12+ is *required*. +1.18.4+ 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-1120.txt b/changelog/_go-ver-1120.txt index c9e146855741..911ed775fb0d 100644 --- a/changelog/_go-ver-1120.txt +++ b/changelog/_go-ver-1120.txt @@ -1,3 +1,3 @@ ```release-note:change -core: Bump Go version to 1.17.12. +core: Bump Go version to 1.18.4. ``` diff --git a/go.mod b/go.mod index b354c801fe39..f052f96fe7cb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/vault -go 1.17 +go 1.18 replace github.com/hashicorp/vault/api => ./api diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index f4c7ba26ab3f..5a29c49314ae 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.17.12 +ARG VERSION=1.18.4 FROM golang:${VERSION} AS builder diff --git a/scripts/docker/Dockerfile.ui b/scripts/docker/Dockerfile.ui index 4afdf652d1b5..595af6a3d5c2 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.17.12 +ARG VERSION=1.18.4 ARG CGO_ENABLED=0 ARG BUILD_TAGS ENV JOBS=2