From dcadf44bf94b77169f38cf9b60f04bba1cf9e445 Mon Sep 17 00:00:00 2001
From: Joshua Powers <powersj@fastmail.com>
Date: Fri, 8 Sep 2023 03:40:48 -0600
Subject: [PATCH] chore: Update to go1.21.1 (#13887)

---
 .circleci/config.yml              | 14 +++++++-------
 .github/workflows/govulncheck.yml |  2 +-
 Makefile                          |  4 ++--
 scripts/ci.docker                 |  2 +-
 scripts/installgo_linux.sh        |  4 ++--
 scripts/installgo_mac.sh          |  6 +++---
 scripts/installgo_windows.sh      |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7a3eb3519..28ab73872 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.21.0'
+      - image: 'quay.io/influxdb/telegraf-ci:1.21.1'
     environment:
       GOFLAGS: -p=4
   mac:
@@ -40,7 +40,7 @@ commands:
         default: "v2"
       goversion:
         type: string
-        default: 1.21.0
+        default: 1.21.1
     steps:
       - check-changed-files-or-halt
       - restore_cache:
@@ -198,7 +198,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.0
+        default: 1.21.1
       cache_version:
         type: string
         default: "v2"
@@ -230,7 +230,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.0
+        default: 1.21.1
       cache_version:
         type: string
         default: "v2"
@@ -267,7 +267,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.0
+        default: 1.21.1
       cache_version:
         type: string
         default: "v2"
@@ -289,7 +289,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.0
+        default: 1.21.1
       cache_version:
         type: string
         default: "v2"
@@ -318,7 +318,7 @@ jobs:
     parameters:
       goversion:
         type: string
-        default: 1.21.0
+        default: 1.21.1
       cache_version:
         type: string
         default: "v2"
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index 33877929f..9a75372e8 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -15,5 +15,5 @@ jobs:
       - name: Scan for Vulnerabilities in Code
         uses: golang/govulncheck-action@v1
         with:
-          go-version-input: 1.21.0
+          go-version-input: 1.21.1
           go-package: ./...
diff --git a/Makefile b/Makefile
index 881b74b04..83a91b201 100644
--- a/Makefile
+++ b/Makefile
@@ -249,8 +249,8 @@ plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
 
 .PHONY: ci
 ci:
-	docker build -t quay.io/influxdb/telegraf-ci:1.21.0 - < scripts/ci.docker
-	docker push quay.io/influxdb/telegraf-ci:1.21.0
+	docker build -t quay.io/influxdb/telegraf-ci:1.21.1 - < scripts/ci.docker
+	docker push quay.io/influxdb/telegraf-ci:1.21.1
 
 .PHONY: install
 install: $(buildbin)
diff --git a/scripts/ci.docker b/scripts/ci.docker
index a9d155ec0..9a50d2b74 100644
--- a/scripts/ci.docker
+++ b/scripts/ci.docker
@@ -1,4 +1,4 @@
-FROM golang:1.21.0
+FROM golang:1.21.1
 
 RUN chmod -R 755 "$GOPATH"
 
diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh
index 5083e3df1..b0f70a244 100644
--- a/scripts/installgo_linux.sh
+++ b/scripts/installgo_linux.sh
@@ -2,10 +2,10 @@
 
 set -eux
 
-GO_VERSION="1.21.0"
+GO_VERSION="1.21.1"
 GO_ARCH="linux-amd64"
 # from https://golang.org/dl
-GO_VERSION_SHA="d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742"
+GO_VERSION_SHA="b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae"
 
 # Download Go and verify Go tarball
 setup_go () {
diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh
index 4de4178b4..53bb2a3dd 100644
--- a/scripts/installgo_mac.sh
+++ b/scripts/installgo_mac.sh
@@ -3,9 +3,9 @@
 set -eux
 
 ARCH=$(uname -m)
-GO_VERSION="1.21.0"
-GO_VERSION_SHA_arm64="3aca44de55c5e098de2f406e98aba328898b05d509a2e2a356416faacf2c4566" # from https://golang.org/dl
-GO_VERSION_SHA_amd64="b314de9f704ab122c077d2ec8e67e3670affe8865479d1f01991e7ac55d65e70" # from https://golang.org/dl
+GO_VERSION="1.21.1"
+GO_VERSION_SHA_arm64="ffd40391a1e995855488b008ad9326ff8c2e81803a6e80894401003bae47fcf1" # from https://golang.org/dl
+GO_VERSION_SHA_amd64="809f5b0ef4f7dcdd5f51e9630a5b2e5a1006f22a047126d61560cdc365678a19" # from https://golang.org/dl
 
 if [ "$ARCH" = 'arm64' ]; then
     GO_ARCH="darwin-arm64"
diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh
index 5600db3e3..0c40dfd4d 100644
--- a/scripts/installgo_windows.sh
+++ b/scripts/installgo_windows.sh
@@ -2,7 +2,7 @@
 
 set -eux
 
-GO_VERSION="1.21.0"
+GO_VERSION="1.21.1"
 
 setup_go () {
     rm -rf '/c/Program Files/Go'