Update Go to 1.18 (hashicorp#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 <[email protected]>
kstevena · Aug 2, 2022 · 9a8cbf9 · 9a8cbf9
1 parent dee422c
commit 9a8cbf9
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git 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
@@ -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,23 +30,23 @@ 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: ""
   working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 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: ""
   working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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