scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 02:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Go to 1.17.11 (#15818)

Browse Source 
* Update Go to 1.17.11

 See https://go.dev/doc/devel/release#go1.17.minor for release notes
This commit is contained in:
Steven Clark
2022-06-06 13:18:24 -04:00
committed by GitHub
parent 114c78e0dc
commit 8dbb7f86b7
9 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.circleci/config.yml generated
View File

@@ -147,12 +147,12 @@ jobs:
environment: environment:
- CIRCLECI_CLI_VERSION: 0.1.5546 - CIRCLECI_CLI_VERSION: 0.1.5546
- GO_TAGS: '' - GO_TAGS: ''
- GO_VERSION: 1.17.9 - GO_VERSION: 1.17.11
- GOFUMPT_VERSION: 0.2.1 - GOFUMPT_VERSION: 0.2.1
- GOTESTSUM_VERSION: 0.5.2 - GOTESTSUM_VERSION: 0.5.2
test-go-remote-docker: test-go-remote-docker:
docker: docker:
- image: docker.mirror.hashicorp.services/cimg/go:1.17.9 - image: docker.mirror.hashicorp.services/cimg/go:1.17.11
resource_class: medium resource_class: medium
working_directory: /home/circleci/go/src/github.com/hashicorp/vault working_directory: /home/circleci/go/src/github.com/hashicorp/vault
parallelism: 8 parallelism: 8
@@ -285,7 +285,7 @@ jobs:
-e NO_PROXY \ -e NO_PROXY \
-e VAULT_TEST_LOG_DIR=/tmp/testlogs \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
--network vaulttest --name \ --network vaulttest --name \
testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.9 \ testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.11 \
tail -f /dev/null tail -f /dev/null
# Run tests # Run tests
@@ -386,12 +386,12 @@ jobs:
environment: environment:
- CIRCLECI_CLI_VERSION: 0.1.5546 - CIRCLECI_CLI_VERSION: 0.1.5546
- GO_TAGS: '' - GO_TAGS: ''
- GO_VERSION: 1.17.9 - GO_VERSION: 1.17.11
- GOFUMPT_VERSION: 0.2.1 - GOFUMPT_VERSION: 0.2.1
- GOTESTSUM_VERSION: 0.5.2 - GOTESTSUM_VERSION: 0.5.2
test-go-race: test-go-race:
docker: docker:
- image: docker.mirror.hashicorp.services/cimg/go:1.17.9 - image: docker.mirror.hashicorp.services/cimg/go:1.17.11
resource_class: xlarge resource_class: xlarge
working_directory: /home/circleci/go/src/github.com/hashicorp/vault working_directory: /home/circleci/go/src/github.com/hashicorp/vault
parallelism: 8 parallelism: 8
@@ -520,7 +520,7 @@ jobs:
-e NO_PROXY \ -e NO_PROXY \
-e VAULT_TEST_LOG_DIR=/tmp/testlogs \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
--network vaulttest --name \ --network vaulttest --name \
testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.9 \ testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.11 \
tail -f /dev/null tail -f /dev/null
# Run tests # Run tests
@@ -578,7 +578,7 @@ jobs:
- GO_TAGS: '' - GO_TAGS: ''
test-go: test-go:
docker: docker:
- image: docker.mirror.hashicorp.services/cimg/go:1.17.9 - image: docker.mirror.hashicorp.services/cimg/go:1.17.11
resource_class: large resource_class: large
working_directory: /home/circleci/go/src/github.com/hashicorp/vault working_directory: /home/circleci/go/src/github.com/hashicorp/vault
parallelism: 8 parallelism: 8
@@ -707,7 +707,7 @@ jobs:
-e NO_PROXY \ -e NO_PROXY \
-e VAULT_TEST_LOG_DIR=/tmp/testlogs \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
--network vaulttest --name \ --network vaulttest --name \
testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.9 \ testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.11 \
tail -f /dev/null tail -f /dev/null
# Run tests # Run tests
@@ -876,12 +876,12 @@ jobs:
environment: environment:
- CIRCLECI_CLI_VERSION: 0.1.5546 - CIRCLECI_CLI_VERSION: 0.1.5546
- GO_TAGS: '' - GO_TAGS: ''
- GO_VERSION: 1.17.9 - GO_VERSION: 1.17.11
- GOFUMPT_VERSION: 0.2.1 - GOFUMPT_VERSION: 0.2.1
- GOTESTSUM_VERSION: 0.5.2 - GOTESTSUM_VERSION: 0.5.2
test-go-race-remote-docker: test-go-race-remote-docker:
docker: docker:
- image: docker.mirror.hashicorp.services/cimg/go:1.17.9 - image: docker.mirror.hashicorp.services/cimg/go:1.17.11
resource_class: medium resource_class: medium
working_directory: /home/circleci/go/src/github.com/hashicorp/vault working_directory: /home/circleci/go/src/github.com/hashicorp/vault
parallelism: 8 parallelism: 8
@@ -1014,7 +1014,7 @@ jobs:
-e NO_PROXY \ -e NO_PROXY \
-e VAULT_TEST_LOG_DIR=/tmp/testlogs \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
--network vaulttest --name \ --network vaulttest --name \
testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.9 \ testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.11 \
tail -f /dev/null tail -f /dev/null
# Run tests # Run tests

2
.circleci/config/commands/go_test.yml
View File

@@ -14,7 +14,7 @@ parameters:
default: false default: false
go_image: go_image:
type: string type: string
default: "docker.mirror.hashicorp.services/cimg/go:1.17.9" default: "docker.mirror.hashicorp.services/cimg/go:1.17.11"
use_docker: use_docker:
type: boolean type: boolean
default: false default: false

8
.circleci/config/executors/@executors.yml
View File

@@ -4,7 +4,7 @@ go-machine:
shell: /usr/bin/env bash -euo pipefail -c shell: /usr/bin/env bash -euo pipefail -c
environment: environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_VERSION: 1.17.9 # Pin Go to patch version (ex: 1.2.3) GO_VERSION: 1.17.11 # Pin Go to patch version (ex: 1.2.3)
GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum 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) GOFUMPT_VERSION: 0.2.1 # Pin gofumpt to patch version (ex: 1.2.3)
GO_TAGS: "" GO_TAGS: ""
@@ -27,7 +27,7 @@ alpine:
docker-env-go-test-remote-docker: docker-env-go-test-remote-docker:
resource_class: medium resource_class: medium
docker: docker:
- image: "docker.mirror.hashicorp.services/cimg/go:1.17.9" - image: "docker.mirror.hashicorp.services/cimg/go:1.17.11"
environment: environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: "" GO_TAGS: ""
@@ -35,7 +35,7 @@ docker-env-go-test-remote-docker:
docker-env-go-test: docker-env-go-test:
resource_class: large resource_class: large
docker: docker:
- image: "docker.mirror.hashicorp.services/cimg/go:1.17.9" - image: "docker.mirror.hashicorp.services/cimg/go:1.17.11"
environment: environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: "" GO_TAGS: ""
@@ -43,7 +43,7 @@ docker-env-go-test:
docker-env-go-test-race: docker-env-go-test-race:
resource_class: xlarge resource_class: xlarge
docker: docker:
- image: "docker.mirror.hashicorp.services/cimg/go:1.17.9" - image: "docker.mirror.hashicorp.services/cimg/go:1.17.11"
environment: environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: "" GO_TAGS: ""

6
.github/workflows/build.yml vendored
View File

@@ -66,7 +66,7 @@ jobs:
matrix: matrix:
goos: [ freebsd, windows, netbsd, openbsd, solaris ] goos: [ freebsd, windows, netbsd, openbsd, solaris ]
goarch: [ "386", "amd64", "arm" ] goarch: [ "386", "amd64", "arm" ]
go: [ "1.17.9" ] go: [ "1.17.11" ]
exclude: exclude:
- goos: solaris - goos: solaris
goarch: 386 goarch: 386
@@ -118,7 +118,7 @@ jobs:
matrix: matrix:
goos: [linux] goos: [linux]
goarch: ["arm", "arm64", "386", "amd64"] goarch: ["arm", "arm64", "386", "amd64"]
go: ["1.17.9"] go: ["1.17.11"]
fail-fast: true fail-fast: true
name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@@ -195,7 +195,7 @@ jobs:
matrix: matrix:
goos: [ darwin ] goos: [ darwin ]
goarch: [ "amd64", "arm64" ] goarch: [ "amd64", "arm64" ]
go: [ "1.17.9" ] go: [ "1.17.11" ]
fail-fast: true fail-fast: true
name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
steps: steps:

2
Makefile
View File

@@ -15,7 +15,7 @@ EXTERNAL_TOOLS=\
GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor) GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor)
GO_VERSION_MIN=1.17.9 GO_VERSION_MIN=1.17.11
GO_CMD?=go GO_CMD?=go
CGO_ENABLED?=0 CGO_ENABLED?=0
ifneq ($(FDB_ENABLED), ) ifneq ($(FDB_ENABLED), )

2
README.md
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 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 first need [Go](https://www.golang.org) installed on your machine. Go version
1.17.9+ is *required*. 1.17.11+ is *required*.
For local dev first make sure Go is properly installed, including setting up a 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 [GOPATH](https://golang.org/doc/code.html#GOPATH). Ensure that `$GOPATH/bin` is in

3
changelog/15818.txt Normal file
View File

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

2
scripts/docker/Dockerfile
View File

@@ -1,7 +1,7 @@
# Multi-stage builder to avoid polluting users environment with wrong # Multi-stage builder to avoid polluting users environment with wrong
# architecture binaries. Since this binary is used in an alpine container, # architecture binaries. Since this binary is used in an alpine container,
# we're explicitly compiling for 'linux/amd64' # we're explicitly compiling for 'linux/amd64'
ARG VERSION=1.17.9 ARG VERSION=1.17.11
FROM golang:${VERSION} AS builder FROM golang:${VERSION} AS builder

2
scripts/docker/Dockerfile.ui
View File

@@ -3,7 +3,7 @@
# we're explicitly compiling for 'linux/amd64' # we're explicitly compiling for 'linux/amd64'
FROM debian:buster AS builder FROM debian:buster AS builder
ARG VERSION=1.17.9 ARG VERSION=1.17.11
ARG CGO_ENABLED=0 ARG CGO_ENABLED=0
ARG BUILD_TAGS ARG BUILD_TAGS
ENV JOBS=2 ENV JOBS=2