From 0f69f0f990476755ca1541576327c2e9181d5e61 Mon Sep 17 00:00:00 2001
From: Jack McCluskey <thejackmccluskey@gmail.com>
Date: Tue, 2 Jul 2024 10:54:10 -0400
Subject: [PATCH] Update Go Version to 1.22.4

---
 .../setup-default-test-properties/test-properties.json        | 2 +-
 .github/gh-actions-self-hosted-runners/arc/images/Dockerfile  | 2 +-
 .github/workflows/go_tests.yml                                | 2 +-
 .github/workflows/local_env_tests.yml                         | 4 ++--
 .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy     | 2 +-
 dev-support/docker/Dockerfile                                 | 2 +-
 sdks/go/run_with_go_version.sh                                | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/actions/setup-default-test-properties/test-properties.json b/.github/actions/setup-default-test-properties/test-properties.json
index d7e1ef55bf53..89ef25b21160 100644
--- a/.github/actions/setup-default-test-properties/test-properties.json
+++ b/.github/actions/setup-default-test-properties/test-properties.json
@@ -18,6 +18,6 @@
     "SPARK_VERSIONS": ["2", "3"]
   },
   "GoTestProperties": {
-    "SUPPORTED_VERSIONS": ["1.20"]
+    "SUPPORTED_VERSIONS": ["1.22"]
   }
 }
diff --git a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile
index 06dfff159719..7fa8f631729c 100644
--- a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile
+++ b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile
@@ -31,7 +31,7 @@ RUN curl -OL https://nodejs.org/dist/v18.16.0/node-v18.16.0-linux-x64.tar.xz &&
     mv /usr/local/node-v18.16.0-linux-x64 /usr/local/node
 ENV PATH="${PATH}:/usr/local/node/bin"
 #Install Go
-ARG go_version=1.21.0
+ARG go_version=1.22.4
 RUN curl -OL https://go.dev/dl/go${go_version}.linux-amd64.tar.gz && \
     tar -C /usr/local -xzf go${go_version}.linux-amd64.tar.gz && \
     rm go${go_version}.linux-amd64.tar.gz
diff --git a/.github/workflows/go_tests.yml b/.github/workflows/go_tests.yml
index ae5960666363..c7eed4470954 100644
--- a/.github/workflows/go_tests.yml
+++ b/.github/workflows/go_tests.yml
@@ -45,7 +45,7 @@ jobs:
           fetch-depth: 2
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache-dependency-path: |
              sdks/go.sum
       - name: Delete old coverage
diff --git a/.github/workflows/local_env_tests.yml b/.github/workflows/local_env_tests.yml
index 232ac81c4a7b..adfef66b8591 100644
--- a/.github/workflows/local_env_tests.yml
+++ b/.github/workflows/local_env_tests.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - uses: actions/setup-python@v5
         with:
           python-version: '3.8'
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - uses: actions/setup-python@v5
         with:
           python-version: '3.8'
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 730695392abd..c0ac274a6571 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -2226,7 +2226,7 @@ class BeamModulePlugin implements Plugin<Project> {
 
       // This sets the whole project Go version.
       // The latest stable Go version can be checked at https://go.dev/dl/
-      project.ext.goVersion = "go1.21.11"
+      project.ext.goVersion = "go1.22.4"
 
       // Minor TODO: Figure out if we can pull out the GOCMD env variable after goPrepare script
       // completion, and avoid this GOBIN substitution.
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index c118ad098334..5cabba8be41a 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -78,7 +78,7 @@ RUN pip3 install distlib==0.3.1 yapf==0.29.0 pytest
 ###
 # Install Go
 ###
-ENV DOWNLOAD_GO_VERSION=1.21.0
+ENV DOWNLOAD_GO_VERSION=1.22.4
 RUN wget https://golang.org/dl/go${DOWNLOAD_GO_VERSION}.linux-amd64.tar.gz && \
     tar -C /usr/local -xzf go${DOWNLOAD_GO_VERSION}.linux-amd64.tar.gz
 ENV GOROOT /usr/local/go
diff --git a/sdks/go/run_with_go_version.sh b/sdks/go/run_with_go_version.sh
index 03d8d74e9f52..7de5f339011d 100755
--- a/sdks/go/run_with_go_version.sh
+++ b/sdks/go/run_with_go_version.sh
@@ -37,7 +37,7 @@ set -e
 #
 # This variable is also used as the execution command downscript.
 # The list of downloadable versions are at https://go.dev/dl/
-GOVERS=go1.21.8
+GOVERS=go1.22.4
 
 if ! command -v go &> /dev/null
 then