From e17082b9cf6ed8d96f5960b48d68464be26c7e92 Mon Sep 17 00:00:00 2001
From: Mahmood Ali <mahmood@hashicorp.com>
Date: Fri, 30 Apr 2021 13:52:05 -0400
Subject: [PATCH] update golang to 1.16.3 (#10484)

---
 .circleci/config.yml             | 8 ++++----
 contributing/README.md           | 2 +-
 go.mod                           | 2 +-
 scripts/release/mac-remote-build | 2 +-
 scripts/vagrant-linux-priv-go.sh | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 30af3d537..c1e1052d5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -507,7 +507,7 @@ executors:
   go:
     working_directory: /go/src/github.com/hashicorp/nomad
     docker:
-      - image: docker.mirror.hashicorp.services/golang:1.16
+      - image: docker.mirror.hashicorp.services/golang:1.16.3
     environment:
       <<: *common_envs
       GOPATH: /go
@@ -519,7 +519,7 @@ executors:
     environment: &machine_env
       <<: *common_envs
       GOPATH: /home/circleci/go
-      GOLANG_VERSION: 1.16
+      GOLANG_VERSION: 1.16.3
 
   # uses a more recent image with unattended upgrades disabled properly
   # but seems to break docker builds
@@ -536,7 +536,7 @@ executors:
     environment:
       <<: *common_envs
       GOPATH: /Users/distiller/go
-      GOLANG_VERSION: 1.16
+      GOLANG_VERSION: 1.16.3
 
   go-windows:
     machine:
@@ -548,7 +548,7 @@ executors:
       GOPATH: c:\gopath
       GOBIN: c:\gopath\bin
       GOTESTSUM_PATH: c:\tmp\test-reports
-      GOLANG_VERSION: 1.16
+      GOLANG_VERSION: 1.16.3
       GOTESTSUM_VERSION: 0.4.2
       VAULT_VERSION: 1.4.1
 
diff --git a/contributing/README.md b/contributing/README.md
index bf25d08d0..0afb994c2 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+](https://golang.org/) *(Note: `gcc-go` is not supported)*
+1. Install [Go 1.16.3+](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/go.mod b/go.mod
index 4f576fc70..d55c5dda8 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/nomad
 
-go 1.15
+go 1.16
 
 replace (
 	github.com/Microsoft/go-winio => github.com/endocrimes/go-winio v0.4.13-0.20190628114223-fb47a8b41948
diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build
index b0ad49ce3..6239ba451 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"
+  local go_version="1.16.3"
   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 7a91db10a..3bae44dfd 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"
+	local go_version="1.16.3"
 	local download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz"
 
 		if go version 2>&1 | grep -q "${go_version}"; then