From 4cad5b8a04274cddfdcfd7b9cc9cb81bb33b5ebf Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <4903+rboyer@users.noreply.github.com>
Date: Mon, 16 Aug 2021 12:21:16 -0500
Subject: [PATCH] ci: upgrade to use Go 1.16.7 (#10856)

---
 .changelog/10856.txt                       | 3 +++
 .circleci/config.yml                       | 2 +-
 build-support/docker/Build-Go.dockerfile   | 2 +-
 build-support/docker/Test-Flake.dockerfile | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 .changelog/10856.txt

diff --git a/.changelog/10856.txt b/.changelog/10856.txt
new file mode 100644
index 000000000..0faa07ab0
--- /dev/null
+++ b/.changelog/10856.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ci: upgrade to use Go 1.16.7
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ea1d1a37..8166b11d1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ references:
   images:
     # When updating the Go version, remember to also update the versions in the
     # workflows section for go-test-lib jobs.
-    go: &GOLANG_IMAGE docker.mirror.hashicorp.services/circleci/golang:1.16.3
+    go: &GOLANG_IMAGE docker.mirror.hashicorp.services/circleci/golang:1.16.7
     ember: &EMBER_IMAGE docker.mirror.hashicorp.services/circleci/node:14-browsers
 
   paths:
diff --git a/build-support/docker/Build-Go.dockerfile b/build-support/docker/Build-Go.dockerfile
index fa67e4671..62833db17 100644
--- a/build-support/docker/Build-Go.dockerfile
+++ b/build-support/docker/Build-Go.dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.15.5
+ARG GOLANG_VERSION=1.16.7
 FROM golang:${GOLANG_VERSION}
 
 ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \
diff --git a/build-support/docker/Test-Flake.dockerfile b/build-support/docker/Test-Flake.dockerfile
index 76fc315ef..6f7e1cfca 100644
--- a/build-support/docker/Test-Flake.dockerfile
+++ b/build-support/docker/Test-Flake.dockerfile
@@ -1,6 +1,6 @@
 FROM travisci/ci-garnet:packer-1512502276-986baf0
 
-ENV GOLANG_VERSION 1.15.5
+ENV GOLANG_VERSION 1.16.7
 
 RUN mkdir -p /home/travis/go && chown -R travis /home/travis/go