From f75224785c493caeb150715f6e34877d22fef8db Mon Sep 17 00:00:00 2001
From: Justin Tobler <jtobler@gitlab.com>
Date: Tue, 5 Mar 2024 20:06:53 -0600
Subject: [PATCH 1/2] go.mod: Update dependencies

Update dependencies to resolve detected vulnerabilities.
---
 .tool-versions | 2 +-
 go.mod         | 2 +-
 go.sum         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 9d2c042738..5175da87d8 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 # Versions of Gitaly dependencies managed by asdf.
-golang 1.22.0 1.21.7
+golang 1.22.1 1.21.7
 ruby 3.2.3
diff --git a/go.mod b/go.mod
index 30fde85608..b463ae2886 100644
--- a/go.mod
+++ b/go.mod
@@ -48,7 +48,7 @@ require (
 	golang.org/x/time v0.3.0
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97
 	google.golang.org/grpc v1.60.1
-	google.golang.org/protobuf v1.31.0
+	google.golang.org/protobuf v1.33.0
 )
 
 require (
diff --git a/go.sum b/go.sum
index 2c19a216af..66a73bcd17 100644
--- a/go.sum
+++ b/go.sum
@@ -1082,8 +1082,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/DataDog/dd-trace-go.v1 v1.32.0 h1:DkD0plWEVUB8v/Ru6kRBW30Hy/fRNBC8hPdcExuBZMc=
 gopkg.in/DataDog/dd-trace-go.v1 v1.32.0/go.mod h1:wRKMf/tRASHwH/UOfPQ3IQmVFhTz2/1a1/mpXoIjF54=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-- 
GitLab


From 2e966695048d46186426e99292f0149b8c9c2a76 Mon Sep 17 00:00:00 2001
From: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Date: Wed, 6 Mar 2024 10:35:40 +0700
Subject: [PATCH 2/2] Upgrade go image

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6b2ff4275..d412aa7ba9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,8 +16,8 @@ default:
   git_default: "default"
   git_minimum: "v2.42.0"
   gitlab_dangerfiles: "4.5.1"
-  go_default: "1.22"
-  go_supported: [ "1.21", "1.22" ]
+  go_default: "1.22.1"
+  go_supported: [ "1.21", "1.22.1" ]
   macos: "macos-12-xcode-14"
   pgbouncer: "1.17.0"
   postgres_default: "12-alpine"
-- 
GitLab