From 0c72216a1e2c6e467871285e3c2e1c35ded34ee2 Mon Sep 17 00:00:00 2001
From: Alan Parra <alan.parra@goteleport.com>
Date: Fri, 20 Dec 2024 10:30:54 -0300
Subject: [PATCH 1/4] chore: Bump Buf to v1.48.0

---
 build.assets/versions.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.assets/versions.mk b/build.assets/versions.mk
index 72240f4c4c1d9..365696c236b89 100644
--- a/build.assets/versions.mk
+++ b/build.assets/versions.mk
@@ -17,7 +17,7 @@ LIBPCSCLITE_VERSION ?= 1.9.9-teleport
 DEVTOOLSET ?= devtoolset-12
 
 # Protogen related versions.
-BUF_VERSION ?= v1.42.0
+BUF_VERSION ?= v1.48.0
 # Keep in sync with api/proto/buf.yaml (and buf.lock).
 GOGO_PROTO_TAG ?= v1.3.2
 NODE_GRPC_TOOLS_VERSION ?= 1.12.4

From 519308d8488fb5f05f588a176a2d999d73e53e62 Mon Sep 17 00:00:00 2001
From: Alan Parra <alan.parra@goteleport.com>
Date: Fri, 20 Dec 2024 10:34:26 -0300
Subject: [PATCH 2/4] Remove breaking.use hack from buf-legacy.yaml

---
 buf-legacy.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/buf-legacy.yaml b/buf-legacy.yaml
index 5dcbbf314a2a4..f50c9f7b20e5b 100644
--- a/buf-legacy.yaml
+++ b/buf-legacy.yaml
@@ -35,7 +35,3 @@ lint:
     - RPC_REQUEST_RESPONSE_UNIQUE
     - RPC_REQUEST_STANDARD_NAME
     - RPC_RESPONSE_STANDARD_NAME
-
-breaking:
-  use:
-    - "buf-legacy.yaml should not be used for buf breaking"

From 119a671f8c9a4bd5e4909a3e017a82dccb19da7e Mon Sep 17 00:00:00 2001
From: Alan Parra <alan.parra@goteleport.com>
Date: Fri, 20 Dec 2024 10:35:44 -0300
Subject: [PATCH 3/4] Update generated protos

---
 gen/proto/ts/google/protobuf/descriptor_pb.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gen/proto/ts/google/protobuf/descriptor_pb.ts b/gen/proto/ts/google/protobuf/descriptor_pb.ts
index 391723fe0e258..c0f84db4647ad 100644
--- a/gen/proto/ts/google/protobuf/descriptor_pb.ts
+++ b/gen/proto/ts/google/protobuf/descriptor_pb.ts
@@ -1036,12 +1036,13 @@ export interface MessageOptions {
  */
 export interface FieldOptions {
     /**
+     * NOTE: ctype is deprecated. Use `features.(pb.cpp).string_type` instead.
      * The ctype option instructs the C++ code generator to use a different
      * representation of the field than it normally would.  See the specific
      * options below.  This option is only implemented to support use of
      * [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of
-     * type "bytes" in the open source release -- sorry, we'll try to include
-     * other types in a future version!
+     * type "bytes" in the open source release.
+     * TODO: make ctype actually deprecated.
      *
      * @generated from protobuf field: optional google.protobuf.FieldOptions.CType ctype = 1;
      */
@@ -1261,8 +1262,6 @@ export enum FieldOptions_JSType {
 }
 /**
  * If set to RETENTION_SOURCE, the option will be omitted from the binary.
- * Note: as of January 2023, support for this is in progress and does not yet
- * have an effect (b/264593489).
  *
  * @generated from protobuf enum google.protobuf.FieldOptions.OptionRetention
  */
@@ -1283,8 +1282,7 @@ export enum FieldOptions_OptionRetention {
 /**
  * This indicates the types of entities that the field may apply to when used
  * as an option. If it is unset, then the field may be freely used as an
- * option on any kind of entity. Note: as of January 2023, support for this is
- * in progress and does not yet have an effect (b/264593489).
+ * option on any kind of entity.
  *
  * @generated from protobuf enum google.protobuf.FieldOptions.OptionTargetType
  */
@@ -2071,7 +2069,7 @@ export enum Edition {
     EDITION_2024 = 1001,
     /**
      * Placeholder editions for testing feature resolution.  These should not be
-     * used or relyed on outside of tests.
+     * used or relied on outside of tests.
      *
      * @generated from protobuf enum value: EDITION_1_TEST_ONLY = 1;
      */

From 4017986dda293f72f83423010e88e8404e29f676 Mon Sep 17 00:00:00 2001
From: Alan Parra <alan.parra@goteleport.com>
Date: Fri, 20 Dec 2024 11:26:45 -0300
Subject: [PATCH 4/4] Normalize grpcbox base image

---
 build.assets/Dockerfile-grpcbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.assets/Dockerfile-grpcbox b/build.assets/Dockerfile-grpcbox
index dcb558518d7f1..09972f9de5132 100644
--- a/build.assets/Dockerfile-grpcbox
+++ b/build.assets/Dockerfile-grpcbox
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM docker.io/golang:1.22
+FROM docker.io/golang:1.23
 
 # Image layers go from less likely to most likely to change.
 RUN apt-get update && \