Merge #67222

67222: deps: update bufbuild/buf r=dt a=knz Fixes #67216. This is a simplified version of #67221 until a fix for the bazel rules (see [this comment](#67221 (comment))) is available. Release note: None Co-authored-by: Raphael 'kena' Poss <[email protected]>
cockroachdb · Jul 5, 2021 · 464ddb9 · 464ddb9
2 parents dc62bfe + e0785e9
commit 464ddb9
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 39 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -399,8 +399,9 @@ def go_deps():
         name = "com_github_bufbuild_buf",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/bufbuild/buf",
-        sum = "h1:qXTtmuF3vBbR2K8RuyO3Qu8Yh887U1SG5g2ZlwOxUxQ=",
-        version = "v0.42.1",
+        replace = "github.com/cockroachdb/buf",
+        sum = "h1:3JIbI8ldy42gUIvkcsc48LU8VGJ8OcNR+X1bUM/S6MI=",
+        version = "v0.43.2-0.20210705165955-fe556391f1c7",
     )
 
     go_repository(
@@ -542,6 +543,14 @@ def go_deps():
         sum = "h1:cqQfy1jclcSy/FwLjemeg3SR1yaINm74aQyupQ0Bl8M=",
         version = "v0.0.0-20201120205902-5459f2c99403",
     )
+    go_repository(
+        name = "com_github_cncf_xds_go",
+        build_file_proto_mode = "disable_global",
+        importpath = "github.com/cncf/xds/go",
+        sum = "h1:OZmjad4L3H8ncOIR8rnb5MREYqG8ixi5+WbeUsquF0c=",
+        version = "v0.0.0-20210312221358-fbca930ec8ed",
+    )
+
     go_repository(
         name = "com_github_cockroachdb_apd",
         build_file_proto_mode = "disable_global",
@@ -1056,8 +1065,8 @@ def go_deps():
         name = "com_github_envoyproxy_go_control_plane",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/envoyproxy/go-control-plane",
-        sum = "h1:QyzYnTnPE15SQyUeqU6qLbWxMkwyAyu+vGksa0b7j00=",
-        version = "v0.9.9-0.20210217033140-668b12f5399d",
+        sum = "h1:dulLQAYQFYtG5MTplgNGHWuV2D+OBD+Z8lmDBmbLg+s=",
+        version = "v0.9.9-0.20210512163311-63b5d3c536b0",
     )
     go_repository(
         name = "com_github_envoyproxy_protoc_gen_validate",
@@ -1647,8 +1656,8 @@ def go_deps():
         name = "com_github_google_go_cmp",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/google/go-cmp",
-        sum = "h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=",
-        version = "v0.5.5",
+        sum = "h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=",
+        version = "v0.5.6",
     )
     go_repository(
         name = "com_github_google_go_github",
@@ -2276,8 +2285,8 @@ def go_deps():
         name = "com_github_jhump_protoreflect",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/jhump/protoreflect",
-        sum = "h1:dBmhjIVYJbfDDPGBvq/WLfi0mAMg5e2GGYzv9nW/Jxg=",
-        version = "v1.8.3-0.20210302193947-8255811fc3c0",
+        sum = "h1:Ivt7LN1DpWfBtIQrpCUCou0FNqhcEEKNGeU900XxW6k=",
+        version = "v1.8.3-0.20210426154227-2837af466451",
     )
 
     go_repository(
@@ -2457,8 +2466,8 @@ def go_deps():
         name = "com_github_klauspost_compress",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/klauspost/compress",
-        sum = "h1:2KCfW3I9M7nSc5wOqXAlW2v2U6v+w6cbjvbfp+OykW8=",
-        version = "v1.12.2",
+        sum = "h1:G5AfA94pHPysR56qqrkO2pxEexdDzrpFJ6yt/VqWxVU=",
+        version = "v1.12.3",
     )
     go_repository(
         name = "com_github_klauspost_cpuid",
@@ -3838,8 +3847,8 @@ def go_deps():
         name = "com_github_twitchtv_twirp",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/twitchtv/twirp",
-        sum = "h1:VgwjwtPtKRwVt80FRXNCSkm30+n4YhqroQMkjLEbtik=",
-        version = "v7.1.1+incompatible",
+        sum = "h1:uYHA8+9cit/+LUfQjL6zo/0QDKTo4U2H/WAnJ6LfhBU=",
+        version = "v8.0.0+incompatible",
     )
 
     go_repository(
@@ -4487,6 +4496,14 @@ def go_deps():
         sum = "h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=",
         version = "v0.23.0",
     )
+    go_repository(
+        name = "io_opentelemetry_go_proto_otlp",
+        build_file_proto_mode = "disable_global",
+        importpath = "go.opentelemetry.io/proto/otlp",
+        sum = "h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8=",
+        version = "v0.7.0",
+    )
+
     go_repository(
         name = "io_rsc_binaryregexp",
         build_file_proto_mode = "disable_global",
@@ -4537,8 +4554,8 @@ def go_deps():
         name = "org_golang_google_grpc",
         build_file_proto_mode = "disable_global",
         importpath = "google.golang.org/grpc",
-        sum = "h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=",
-        version = "v1.38.0",
+        sum = "h1:UwAg44F4WVGhmEWcBpHqAfe5XGLe6FwErLFEfbmeNdI=",
+        version = "v1.39.0-dev.0.20210519181852-3dd75a6888ce",
     )
     go_repository(
         name = "org_golang_google_grpc_examples",
@@ -4552,8 +4569,8 @@ def go_deps():
         name = "org_golang_google_protobuf",
         build_file_proto_mode = "disable_global",
         importpath = "google.golang.org/protobuf",
-        sum = "h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=",
-        version = "v1.26.0",
+        sum = "h1:nVuQ4k/NgcScf/FWjCN+NO1lTEMTfTBIFp5w7/qxyUA=",
+        version = "v1.26.1-0.20210520194023-50a85913fbce",
     )
     go_repository(
         name = "org_golang_x_arch",
@@ -4744,8 +4761,8 @@ def go_deps():
         name = "org_uber_go_zap",
         build_file_proto_mode = "disable_global",
         importpath = "go.uber.org/zap",
-        sum = "h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=",
-        version = "v1.16.0",
+        sum = "h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=",
+        version = "v1.17.0",
     )
     go_repository(
         name = "tools_gotest",

diff --git a/go.mod b/go.mod
@@ -30,7 +30,7 @@ require (
 	github.com/axiomhq/hyperloglog v0.0.0-20181223111420-4b99d0c2c99e
 	github.com/bazelbuild/rules_go v0.26.0
 	github.com/biogo/store v0.0.0-20160505134755-913427a1d5e8
-	github.com/bufbuild/buf v0.42.1
+	github.com/bufbuild/buf v0.43.2
 	github.com/cenkalti/backoff v2.1.1+incompatible
 	github.com/client9/misspell v0.3.4
 	github.com/cockroachdb/apd/v2 v2.0.2
@@ -80,7 +80,7 @@ require (
 	github.com/golang/snappy v0.0.3
 	github.com/google/btree v1.0.0
 	github.com/google/flatbuffers v1.11.0
-	github.com/google/go-cmp v0.5.5
+	github.com/google/go-cmp v0.5.6
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99
 	github.com/google/uuid v1.2.0 // indirect
@@ -168,9 +168,9 @@ require (
 	golang.org/x/tools v0.1.2
 	google.golang.org/api v0.30.0
 	google.golang.org/genproto v0.0.0-20210603172842-58e84a565dcf
-	google.golang.org/grpc v1.38.0
+	google.golang.org/grpc v1.39.0-dev.0.20210519181852-3dd75a6888ce
 	google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d // indirect
-	google.golang.org/protobuf v1.26.0
+	google.golang.org/protobuf v1.26.1-0.20210520194023-50a85913fbce
 	gopkg.in/DataDog/dd-trace-go.v1 v1.28.0
 	gopkg.in/yaml.v2 v2.4.0
 	gotest.tools/v3 v3.0.3 // indirect
@@ -184,6 +184,10 @@ replace github.com/abourget/teamcity => github.com/cockroachdb/teamcity v0.0.0-2
 
 replace honnef.co/go/tools => honnef.co/go/tools v0.0.1-2020.1.6
 
+// Temporary replacement until https://github.com/cockroachdb/cockroach/pull/67221#issuecomment-874236134
+// has been addressed.
+replace github.com/bufbuild/buf => github.com/cockroachdb/buf v0.43.2-0.20210705165955-fe556391f1c7
+
 replace vitess.io/vitess => github.com/cockroachdb/vitess v0.0.0-20210218160543-54524729cc82
 
 replace gopkg.in/yaml.v2 => github.com/cockroachdb/yaml v0.0.0-20180705215940-0e2822948641