From f8f9e91b8a953e24a815fe4dbea3dd205a56f0d3 Mon Sep 17 00:00:00 2001
From: Michael Schurter <mschurter@hashicorp.com>
Date: Tue, 2 May 2023 13:09:11 -0700
Subject: [PATCH] build: upgrade from go 1.20.3 to 1.20.4 (#17056)

Includes CVE fixes that do *not* impact Nomad:

https://groups.google.com/g/golang-announce/c/MEb0UyuSMsU
---
 .changelog/17056.txt             | 3 +++
 .circleci/config.yml             | 8 ++++----
 .go-version                      | 2 +-
 contributing/README.md           | 2 +-
 scripts/linux-priv-go.sh         | 2 +-
 scripts/release/mac-remote-build | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 .changelog/17056.txt

diff --git a/.changelog/17056.txt b/.changelog/17056.txt
new file mode 100644
index 000000000..6bf64d52a
--- /dev/null
+++ b/.changelog/17056.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+build: Update from Go 1.20.3 to Go 1.20.4
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08fcc6766..5fbb0c32f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -453,7 +453,7 @@ executors:
   go:
     working_directory: /go/src/github.com/hashicorp/nomad
     docker:
-      - image: docker.mirror.hashicorp.services/golang:1.20.3
+      - image: docker.mirror.hashicorp.services/golang:1.20.4
     resource_class: medium
     environment:
       <<: *common_envs
@@ -466,7 +466,7 @@ executors:
       resource_class: large
     environment: &machine_env
       <<: *common_envs
-      GOLANG_VERSION: 1.20.3
+      GOLANG_VERSION: 1.20.4
 
   go-macos:
     working_directory: ~/go/src/github.com/hashicorp/nomad
@@ -475,7 +475,7 @@ executors:
     environment:
       <<: *common_envs
       GOPATH: /Users/distiller/go
-      GOLANG_VERSION: 1.20.3
+      GOLANG_VERSION: 1.20.4
 
   go-windows:
     machine:
@@ -487,7 +487,7 @@ executors:
       GOPATH: c:\gopath
       GOBIN: c:\gopath\bin
       GOTESTSUM_PATH: c:\tmp\test-reports
-      GOLANG_VERSION: 1.20.3
+      GOLANG_VERSION: 1.20.4
       GOTESTSUM_VERSION: 1.7.0
       VAULT_VERSION: 1.4.1
 
diff --git a/.go-version b/.go-version
index f5b00dc26..0bd54efd3 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.20.3
+1.20.4
diff --git a/contributing/README.md b/contributing/README.md
index 7bed708fc..1d86b6719 100644
--- a/contributing/README.md
+++ b/contributing/README.md
@@ -30,7 +30,7 @@ A development environment is supplied via Vagrant to make getting started easier
 
 Developing without Vagrant
 ---
-1. Install [Go 1.20.3+](https://golang.org/) *(Note: `gcc-go` is not supported)*
+1. Install [Go 1.20.4+](https://golang.org/) *(Note: `gcc-go` is not supported)*
 1. Clone this repo
    ```sh
    $ git clone https://github.com/hashicorp/nomad.git
diff --git a/scripts/linux-priv-go.sh b/scripts/linux-priv-go.sh
index 3eb322f11..500a41e8d 100755
--- a/scripts/linux-priv-go.sh
+++ b/scripts/linux-priv-go.sh
@@ -21,7 +21,7 @@ case $(arch) in
 esac
 
 function install_go() {
-	local go_version="1.20.2"
+	local go_version="1.20.4"
 	local download="https://storage.googleapis.com/golang/go${go_version}.linux-${ARCH}.tar.gz"
 
 	if go version 2>&1 | grep -q "${go_version}"; then
diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build
index 566f9ad67..f1173e430 100755
--- a/scripts/release/mac-remote-build
+++ b/scripts/release/mac-remote-build
@@ -56,7 +56,7 @@ REPO_PATH="${TMP_WORKSPACE}/gopath/src/github.com/hashicorp/nomad"
 mkdir -p "${TMP_WORKSPACE}/tmp"
 
 install_go() {
-  local go_version="1.20.3"
+  local go_version="1.20.4"
   local download=
 
   download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz"