1
0

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 <steven.clark@hashicorp.com>
This commit is contained in:
Christopher Swenson 2022-08-02 10:36:12 -07:00 committed by GitHub
parent dee422cc8c
commit 9a8cbf99cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 25 additions and 25 deletions

22
.circleci/config.yml generated
View File

@ -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

View File

@ -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

View File

@ -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: ""

View File

@ -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:

View File

@ -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), )

View File

@ -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

View File

@ -1,3 +1,3 @@
```release-note:change
core: Bump Go version to 1.17.12.
core: Bump Go version to 1.18.4.
```

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/hashicorp/vault
go 1.17
go 1.18
replace github.com/hashicorp/vault/api => ./api

View File

@ -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

View File

@ -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