From 4917f85b25734e79e1961e36a8a7217f90e6a91f Mon Sep 17 00:00:00 2001
From: Mahmood Ali <mahmood@hashicorp.com>
Date: Wed, 25 Aug 2021 11:56:46 -0400
Subject: [PATCH] update golang to 1.16.7 (#11083)

---
 .changelog/11083.txt             | 3 +++
 .circleci/config.yml             | 8 ++++----
 contributing/README.md           | 2 +-
 scripts/release/mac-remote-build | 2 +-
 scripts/vagrant-linux-priv-go.sh | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 .changelog/11083.txt

diff --git a/.changelog/11083.txt b/.changelog/11083.txt
new file mode 100644
index 000000000000..260cfaeff2b3
--- /dev/null
+++ b/.changelog/11083.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+build: Updated to Go 1.16.7
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index b1cd52dda001..1b8b25bd6f6d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -512,7 +512,7 @@ executors:
   go:
     working_directory: /go/src/github.com/hashicorp/nomad
     docker:
-      - image: docker.mirror.hashicorp.services/golang:1.16.5
+      - image: docker.mirror.hashicorp.services/golang:1.16.7
     environment:
       <<: *common_envs
       GOPATH: /go
@@ -524,7 +524,7 @@ executors:
     environment: &machine_env
       <<: *common_envs
       GOPATH: /home/circleci/go
-      GOLANG_VERSION: 1.16.5
+      GOLANG_VERSION: 1.16.7
 
   # uses a more recent image with unattended upgrades disabled properly
   # but seems to break docker builds
@@ -541,7 +541,7 @@ executors:
     environment:
       <<: *common_envs
       GOPATH: /Users/distiller/go
-      GOLANG_VERSION: 1.16.5
+      GOLANG_VERSION: 1.16.7
 
   go-windows:
     machine:
@@ -553,7 +553,7 @@ executors:
       GOPATH: c:\gopath
       GOBIN: c:\gopath\bin
       GOTESTSUM_PATH: c:\tmp\test-reports
-      GOLANG_VERSION: 1.16.5
+      GOLANG_VERSION: 1.16.7
       GOTESTSUM_VERSION: 0.4.2
       VAULT_VERSION: 1.4.1
 
diff --git a/contributing/README.md b/contributing/README.md
index e6a745fb9355..4e9f8ebe89cb 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.16.5+](https://golang.org/) *(Note: `gcc-go` is not supported)*
+1. Install [Go 1.16.7+](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/release/mac-remote-build b/scripts/release/mac-remote-build
index a009080ab2e8..92c3849ccb64 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.16.5"
+  local go_version="1.16.7"
   local download=
 
   download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz"
diff --git a/scripts/vagrant-linux-priv-go.sh b/scripts/vagrant-linux-priv-go.sh
index 6e96efee539a..6ee1eaeca657 100755
--- a/scripts/vagrant-linux-priv-go.sh
+++ b/scripts/vagrant-linux-priv-go.sh
@@ -3,7 +3,7 @@
 set -o errexit
 
 function install_go() {
-	local go_version="1.16.5"
+	local go_version="1.16.7"
 	local download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz"
 
 		if go version 2>&1 | grep -q "${go_version}"; then