[DNM] build: update patches to be consistent with new version of pkgs

Epic: none Release note: None
cockroachdb · Nov 26, 2024 · 1a1f98a · 1a1f98a
1 parent 75e2cdd
commit 1a1f98a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -11468,6 +11468,16 @@ def go_deps():
             "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/api/org_golang_google_genproto_googleapis_api-v0.0.0-20240903143218-8af14fe29dc1.zip",
         ],
     )
+    go_repository(
+        name = "org_golang_google_genproto_googleapis_bytestream",
+        build_file_proto_mode = "disable_global",
+        importpath = "google.golang.org/genproto/googleapis/bytestream",
+        sha256 = "7bd7611524b7d7bbb16b622b76875da123daefbc5d933a1f23106303d0061970",
+        strip_prefix = "google.golang.org/genproto/googleapis/[email protected]",
+        urls = [
+            "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/bytestream/org_golang_google_genproto_googleapis_bytestream-v0.0.0-20241118233622-e639e219e697.zip",
+        ],
+    )
     go_repository(
         name = "org_golang_google_genproto_googleapis_rpc",
         build_file_proto_mode = "disable_global",
@@ -11512,10 +11522,10 @@ def go_deps():
         name = "org_golang_google_protobuf",
         build_file_proto_mode = "disable_global",
         importpath = "google.golang.org/protobuf",
-        sha256 = "5a27ed9bbe348c7435d91f699af976d0f7dc40c324542e4f41076a425d9e793e",
-        strip_prefix = "google.golang.org/[email protected].1",
+        sha256 = "6e509c9d87452302b9c3484ae7dfdbf740a33cc9cb54095e7eec305d7a4dfdc4",
+        strip_prefix = "google.golang.org/[email protected].2",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.1.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.2.zip",
         ],
     )
     go_repository(

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -1112,12 +1112,13 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/appengine/org_golang_google_appengine-v1.6.7.zip": "79f80dfac18681788f1414e21a4a7734eff4cdf992070be9163103eb8d9f92cd",
     "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/cloud/org_golang_google_cloud-v0.0.0-20151119220103-975617b05ea8.zip": "b1d5595a11b88273665d35d4316edbd4545731c979d046c82844fafef2039c2a",
     "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/api/org_golang_google_genproto_googleapis_api-v0.0.0-20240903143218-8af14fe29dc1.zip": "7027cd84aeddaa671f408f03bc30373ff6cffad9599a477b79e932fac3a40cd8",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/bytestream/org_golang_google_genproto_googleapis_bytestream-v0.0.0-20241118233622-e639e219e697.zip": "7bd7611524b7d7bbb16b622b76875da123daefbc5d933a1f23106303d0061970",
     "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/rpc/org_golang_google_genproto_googleapis_rpc-v0.0.0-20240903143218-8af14fe29dc1.zip": "0a466f53eacec63d96282ed3dfb2aa5cd26a9b3aa89619262f3a58e7e20ae0ac",
     "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230526161137-0005af68ea54.zip": "dd3a50a0b27c99b52c9bbcf1ed54529b8d95f97c11d7f50d734a2592f2caa766",
     "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/cmd/protoc-gen-go-grpc/org_golang_google_grpc_cmd_protoc_gen_go_grpc-v1.1.0.zip": "13877d86cbfa30bde4d62fef2bc58dd56377dcb502c16cf78197f6934193009a",
     "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/examples/org_golang_google_grpc_examples-v0.0.0-20210324172016-702608ffae4d.zip": "f5cad7b05a93557c91864a02890a35c6bc5c394897222978cff2b880a78f7a11",
     "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.68.0.zip": "02a23b873909d3a7f46b1ab5e822b698aeec0e79538924e5edb21838e7fda562",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.1.zip": "5a27ed9bbe348c7435d91f699af976d0f7dc40c324542e4f41076a425d9e793e",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.2.zip": "6e509c9d87452302b9c3484ae7dfdbf740a33cc9cb54095e7eec305d7a4dfdc4",
     "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/DataDog/dd-trace-go.v1/in_gopkg_datadog_dd_trace_go_v1-v1.17.0.zip": "2ebcc818df0b2d560a61037da4492ae7effbaed67de94339a1d3a72728d2cb09",
     "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/airbrake/gobrake.v2/in_gopkg_airbrake_gobrake_v2-v2.0.9.zip": "2db903664908e5a9afafefba94821b9579bbf271e2929c1f0b7b1fdd23f7bbcf",
     "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/alecthomas/kingpin.v2/in_gopkg_alecthomas_kingpin_v2-v2.2.6.zip": "638080591aefe7d2642f2575b627d534c692606f02ea54ba89f42db112ba8839",

diff --git a/build/patches/com_github_buchgr_bazel_remote.patch b/build/patches/com_github_buchgr_bazel_remote.patch
@@ -114,7 +114,7 @@ diff -urN a/genproto/build/bazel/remote/asset/v1/BUILD.bazel b/genproto/build/ba
 -        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
 -        "@io_bazel_rules_go//proto/wkt:timestamp_go_proto",
 +        "@org_golang_google_genproto_googleapis_api//annotations:go_default_library",
-+        "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
++        "@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
 +        "@com_github_golang_protobuf//ptypes/duration:go_default_library",
 +        "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
          "@org_golang_google_grpc//:go_default_library",
@@ -135,7 +135,7 @@ diff -urN a/genproto/build/bazel/remote/execution/v2/BUILD.bazel b/genproto/buil
 -        "@io_bazel_rules_go//proto/wkt:wrappers_go_proto",
 +        "@org_golang_google_genproto_googleapis_api//annotations:go_default_library",
 +        "@org_golang_google_genproto//googleapis/longrunning:go_default_library",
-+        "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
++        "@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
 +        "@com_github_golang_protobuf//ptypes/duration:go_default_library",
 +        "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
 +        "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
@@ -153,9 +153,9 @@ index f60cf80..ba707d3 100644
 -        "@go_googleapis//google/bytestream:bytestream_go_proto",
 -        "@go_googleapis//google/rpc:code_go_proto",
 -        "@go_googleapis//google/rpc:status_go_proto",
-+        "@org_golang_google_genproto//googleapis/bytestream:go_default_library",
-+        "@org_golang_google_genproto//googleapis/rpc/code:go_default_library",
-+        "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
++        "@org_golang_google_genproto_googleapis_bytestream//:go_default_library",
++        "@org_golang_google_genproto_googleapis_rpc//code:go_default_library",
++        "@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
          "@org_golang_google_grpc//:go_default_library",
          "@org_golang_google_grpc//codes:go_default_library",
          "@org_golang_google_grpc//encoding/gzip:go_default_library",
@@ -164,7 +164,7 @@ index f60cf80..ba707d3 100644
          "@com_github_golang_protobuf//proto:go_default_library",
          "@com_github_google_uuid//:go_default_library",
 -        "@go_googleapis//google/bytestream:bytestream_go_proto",
-+        "@org_golang_google_genproto//googleapis/bytestream:go_default_library",
++        "@org_golang_google_genproto_googleapis_bytestream//:go_default_library",
          "@org_golang_google_grpc//:go_default_library",
          "@org_golang_google_grpc//codes:go_default_library",
          "@org_golang_google_grpc//status:go_default_library",
diff --git a/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch b/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch
@@ -65,7 +65,7 @@ index c4d18f624..41d5319fb 100644
 +        "@com_github_golang_protobuf//ptypes/duration:go_default_library",
 +        "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
 +        "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
-+        "@org_golang_google_genproto//googleapis/api/httpbody:go_default_library",
++        "@org_golang_google_genproto_googleapis_api//httpbody:go_default_library",
 +        "@org_golang_google_genproto//protobuf/field_mask:go_default_library",
          "@org_golang_google_grpc//codes:go_default_library",
          "@org_golang_google_grpc//grpclog:go_default_library",

diff --git a/go.mod b/go.mod
@@ -40,7 +40,7 @@ require (
 	google.golang.org/api v0.114.0
 	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54
 	google.golang.org/grpc v1.68.0
-	google.golang.org/protobuf v1.35.1
+	google.golang.org/protobuf v1.35.2
 )
 
 // If any of the following dependencies get updated as a side-effect
@@ -445,6 +445,8 @@ require (
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	gonum.org/v1/plot v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto/googleapis/bytestream v0.0.0-20241118233622-e639e219e697 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 )
 

diff --git a/go.sum b/go.sum
@@ -3141,6 +3141,10 @@ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg
 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk=
+google.golang.org/genproto/googleapis/bytestream v0.0.0-20241118233622-e639e219e697 h1:rY93Be8/KL+EtFM4im9lxMzjGn796GnwVUd75cyFCJg=
+google.golang.org/genproto/googleapis/bytestream v0.0.0-20241118233622-e639e219e697/go.mod h1:qUsLYwbwz5ostUWtuFuXPlHmSJodC5NI/88ZlHj4M1o=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v0.0.0-20170208002647-2a6bf6142e96/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
@@ -3200,6 +3204,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
 google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/DataDog/dd-trace-go.v1 v1.17.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=