From 36f5a8fa254d7144d9fa03ba6245778f87d40b3c Mon Sep 17 00:00:00 2001
From: Josh Powers <powersj@fastmail.com>
Date: Wed, 9 Feb 2022 08:53:48 -0700
Subject: [PATCH 1/2] chore: update CI go to 1.17.6

---
 .circleci/config.yml         | 2 +-
 Makefile                     | 4 ++--
 scripts/ci-1.17.docker       | 2 +-
 scripts/installgo_mac.sh     | 6 +++---
 scripts/installgo_windows.sh | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f2840d9be167..316942e485314 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ executors:
     working_directory: '/go/src/github.com/influxdata/telegraf'
     resource_class: large
     docker:
-      - image: 'quay.io/influxdb/telegraf-ci:1.17.5'
+      - image: 'quay.io/influxdb/telegraf-ci:1.17.6'
     environment:
       GOFLAGS: -p=4
   mac:
diff --git a/Makefile b/Makefile
index 8988a902f89c1..4dfcd566f6c81 100644
--- a/Makefile
+++ b/Makefile
@@ -221,8 +221,8 @@ plugin-%:
 
 .PHONY: ci-1.17
 ci-1.17:
-	docker build -t quay.io/influxdb/telegraf-ci:1.17.5 - < scripts/ci-1.17.docker
-	docker push quay.io/influxdb/telegraf-ci:1.17.5
+	docker build -t quay.io/influxdb/telegraf-ci:1.17.6 - < scripts/ci-1.17.docker
+	docker push quay.io/influxdb/telegraf-ci:1.17.6
 
 .PHONY: install
 install: $(buildbin)
diff --git a/scripts/ci-1.17.docker b/scripts/ci-1.17.docker
index b93e206140dd7..b75bc6271ee0c 100644
--- a/scripts/ci-1.17.docker
+++ b/scripts/ci-1.17.docker
@@ -1,4 +1,4 @@
-FROM golang:1.17.5
+FROM golang:1.17.6
 
 RUN chmod -R 755 "$GOPATH"
 
diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh
index cd92d3393972b..f2572d149c4f5 100644
--- a/scripts/installgo_mac.sh
+++ b/scripts/installgo_mac.sh
@@ -3,13 +3,13 @@
 set -eux
 
 ARCH=$(uname -m)
-GO_VERSION="1.17.5"
+GO_VERSION="1.17.6"
 if [ "$ARCH" = 'arm64' ]; then
     GO_ARCH="darwin-arm64"
-    GO_VERSION_SHA="111f71166de0cb8089bb3e8f9f5b02d76e1bf1309256824d4062a47b0e5f98e0" # from https://golang.org/dl
+    GO_VERSION_SHA="dc54f3f4099e2be9e9c33bf926a7dc3ad64f34717142f7abcaff9ae44bc03d0c" # from https://golang.org/dl
 elif [ "$ARCH" = 'x86_64' ]; then
     GO_ARCH="darwin-amd64"
-    GO_VERSION_SHA="2db6a5d25815b56072465a2cacc8ed426c18f1d5fc26c1fc8c4f5a7188658264" # from https://golang.org/dl
+    GO_VERSION_SHA="231654bbf2dab3d86c1619ce799e77b03d96f9b50770297c8f4dff8836fc8ca2" # from https://golang.org/dl
 fi
 
 # This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.)
diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh
index 847e9644bd0bf..4eb79bfa9a36d 100644
--- a/scripts/installgo_windows.sh
+++ b/scripts/installgo_windows.sh
@@ -2,7 +2,7 @@
 
 set -eux
 
-GO_VERSION="1.17.5"
+GO_VERSION="1.17.6"
 
 setup_go () {
     choco upgrade golang --version=${GO_VERSION}

From 432c53c9bb72b8ce42180d3acb82f36519dca332 Mon Sep 17 00:00:00 2001
From: Josh Powers <powersj@fastmail.com>
Date: Wed, 9 Feb 2022 09:10:59 -0700
Subject: [PATCH 2/2] use darwin sha, not linux

---
 scripts/installgo_mac.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh
index f2572d149c4f5..0a53030bec2e7 100644
--- a/scripts/installgo_mac.sh
+++ b/scripts/installgo_mac.sh
@@ -9,7 +9,7 @@ if [ "$ARCH" = 'arm64' ]; then
     GO_VERSION_SHA="dc54f3f4099e2be9e9c33bf926a7dc3ad64f34717142f7abcaff9ae44bc03d0c" # from https://golang.org/dl
 elif [ "$ARCH" = 'x86_64' ]; then
     GO_ARCH="darwin-amd64"
-    GO_VERSION_SHA="231654bbf2dab3d86c1619ce799e77b03d96f9b50770297c8f4dff8836fc8ca2" # from https://golang.org/dl
+    GO_VERSION_SHA="874bc6f95e07697380069a394a21e05576a18d60f4ba178646e1ebed8f8b1f89" # from https://golang.org/dl
 fi
 
 # This path is cachable. (Saving in /usr/local/ would cause issues restoring the cache.)