From ceb3b4c0f1e2604e37e5098e894956a8f2f48c5f Mon Sep 17 00:00:00 2001
From: Tim Gross <tgross@hashicorp.com>
Date: Wed, 7 Jun 2023 11:44:59 -0400
Subject: [PATCH] build: update to go1.20.5 (#17451)

Go released a security update to fix build-time code injection and execution via
CGO. This doesn't impact already-released versions of Nomad, just the build
toolchain, so we won't be releasing a Nomad security update to go with it.
---
 .circleci/config.yml             | 8 ++++----
 .go-version                      | 2 +-
 contributing/README.md           | 2 +-
 scripts/linux-priv-go.sh         | 2 +-
 scripts/release/mac-remote-build | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d243f16dc..b8ebf077e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -454,7 +454,7 @@ executors:
   go:
     working_directory: /go/src/github.com/hashicorp/nomad
     docker:
-      - image: docker.mirror.hashicorp.services/golang:1.20.4
+      - image: docker.mirror.hashicorp.services/golang:1.20.5
     resource_class: medium
     environment:
       <<: *common_envs
@@ -467,7 +467,7 @@ executors:
       resource_class: large
     environment: &machine_env
       <<: *common_envs
-      GOLANG_VERSION: 1.20.4
+      GOLANG_VERSION: 1.20.5
 
   go-macos:
     working_directory: ~/go/src/github.com/hashicorp/nomad
@@ -476,7 +476,7 @@ executors:
     environment:
       <<: *common_envs
       GOPATH: /Users/distiller/go
-      GOLANG_VERSION: 1.20.4
+      GOLANG_VERSION: 1.20.5
 
   go-windows:
     machine:
@@ -488,7 +488,7 @@ executors:
       GOPATH: c:\gopath
       GOBIN: c:\gopath\bin
       GOTESTSUM_PATH: c:\tmp\test-reports
-      GOLANG_VERSION: 1.20.4
+      GOLANG_VERSION: 1.20.5
       GOTESTSUM_VERSION: 1.7.0
       VAULT_VERSION: 1.4.1
 
diff --git a/.go-version b/.go-version
index 0bd54efd3..7bf9455f0 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.20.4
+1.20.5
diff --git a/contributing/README.md b/contributing/README.md
index 1d86b6719..13cdf88b0 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.4+](https://golang.org/) *(Note: `gcc-go` is not supported)*
+1. Install [Go 1.20.5+](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 500a41e8d..301fafa14 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.4"
+	local go_version="1.20.5"
 	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 f1173e430..238080c3d 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.4"
+  local go_version="1.20.5"
   local download=
 
   download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz"