Skip to content

Commit

Permalink
Merge #68158
Browse files Browse the repository at this point in the history 
68158: Revert "go.mod: bump cloud.google.com/go/storage to v1.16.0" r=tbg,erikgrinaker a=knz

Reverts #67806

Informs #68154
Informs #65926 

Fixes #68150
Fixes #68152
Fixes  #68148
Fixes #68145
Fixes #68144
Fixes #68143

This reverts commit e52ddc8.

This is because that commit contains an upgrade to gRPC 1.39 which
contains a race condition.

Release note: None

Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
  • Loading branch information
@knz
craig[bot] and knz committed Jul 28, 2021
2 parents 5b971c2 + 9ed78b7 commit dbbf8fb
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 199 deletions.
83 changes: 33 additions & 50 deletions DEPS.bzl
View file
Expand Up @@ -551,14 +551,6 @@ 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",
Expand Down Expand Up @@ -1073,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:dulLQAYQFYtG5MTplgNGHWuV2D+OBD+Z8lmDBmbLg+s=",
version = "v0.9.9-0.20210512163311-63b5d3c536b0",
sum = "h1:QyzYnTnPE15SQyUeqU6qLbWxMkwyAyu+vGksa0b7j00=",
version = "v0.9.9-0.20210217033140-668b12f5399d",
)
go_repository(
name = "com_github_envoyproxy_protoc_gen_validate",
Expand Down Expand Up @@ -1621,16 +1613,16 @@ def go_deps():
name = "com_github_golang_groupcache",
build_file_proto_mode = "disable_global",
importpath = "github.com/golang/groupcache",
sum = "h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=",
version = "v0.0.0-20210331224755-41bb18bfe9da",
sum = "h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=",
version = "v0.0.0-20200121045136-8c9f03a8e57e",
)

go_repository(
name = "com_github_golang_mock",
build_file_proto_mode = "disable_global",
importpath = "github.com/golang/mock",
sum = "h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=",
version = "v1.6.0",
sum = "h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g=",
version = "v1.5.0",
)
go_repository(
name = "com_github_golang_snappy",
Expand Down Expand Up @@ -1664,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:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=",
version = "v0.5.6",
sum = "h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=",
version = "v0.5.5",
)
go_repository(
name = "com_github_google_go_github",
Expand Down Expand Up @@ -1707,16 +1699,16 @@ def go_deps():
name = "com_github_google_martian_v3",
build_file_proto_mode = "disable_global",
importpath = "github.com/google/martian/v3",
sum = "h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ=",
version = "v3.2.1",
sum = "h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs=",
version = "v3.0.0",
)

go_repository(
name = "com_github_google_pprof",
build_file_proto_mode = "disable_global",
importpath = "github.com/google/pprof",
sum = "h1:WqmlwDwojb0rrPPtueSYqNrONX90T3SjwZeVUr4QCtI=",
version = "v0.0.0-20210715191844-86eeefc3e471",
sum = "h1:Ak8CrdlwwXwAZxzS66vgPt4U8yUZX7JwLvVR58FN5jM=",
version = "v0.0.0-20200708004538-1a94d8640e99",
)
go_repository(
name = "com_github_google_renameio",
Expand Down Expand Up @@ -2074,8 +2066,8 @@ def go_deps():
name = "com_github_ianlancetaylor_demangle",
build_file_proto_mode = "disable_global",
importpath = "github.com/ianlancetaylor/demangle",
sum = "h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI=",
version = "v0.0.0-20200824232613-28f6c0f3b639",
sum = "h1:UDMh68UUwekSh5iP2OMhRRZJiiBccgV7axzUG8vi56c=",
version = "v0.0.0-20181102032728-5e5cf60278f6",
)
go_repository(
name = "com_github_icrowley_fake",
Expand Down Expand Up @@ -4123,8 +4115,8 @@ def go_deps():
name = "com_google_cloud_go",
build_file_proto_mode = "disable_global",
importpath = "cloud.google.com/go",
sum = "h1:MZ2cf9Elnv1wqccq8ooKO2MqHQLc+ChCp/+QWObCpxg=",
version = "v0.88.0",
sum = "h1:Dg9iHVQfrhq82rUNu9ZxUDrJLaxFUe/HlCVaLyRruq8=",
version = "v0.65.0",
)
go_repository(
name = "com_google_cloud_go_bigquery",
Expand Down Expand Up @@ -4158,8 +4150,8 @@ def go_deps():
name = "com_google_cloud_go_storage",
build_file_proto_mode = "disable_global",
importpath = "cloud.google.com/go/storage",
sum = "h1:1UwAux2OZP4310YXg5ohqBEpV16Y93uZG4+qOX7K2Kg=",
version = "v1.16.0",
sum = "h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA=",
version = "v1.10.0",
)

go_repository(
Expand Down Expand Up @@ -4504,14 +4496,6 @@ 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",
Expand Down Expand Up @@ -4547,8 +4531,8 @@ def go_deps():
name = "org_golang_google_api",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/api",
sum = "h1:SQaA2Cx57B+iPw2MBgyjEkoeMkRK2IenSGoia0U3lCk=",
version = "v0.51.0",
sum = "h1:yfrXXP61wVuLb0vBcG6qaOoIoqYEzOQS8jum51jkv2w=",
version = "v0.30.0",
)
go_repository(
name = "org_golang_google_appengine",
Expand All @@ -4562,17 +4546,9 @@ def go_deps():
name = "org_golang_google_grpc",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/grpc",
sum = "h1:Klz8I9kdtkIN6EpHHUOMLCYhTn/2WAe5a0s1hcBkdTI=",
version = "v1.39.0",
)
go_repository(
name = "org_golang_google_grpc_cmd_protoc_gen_go_grpc",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/grpc/cmd/protoc-gen-go-grpc",
sum = "h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE=",
version = "v1.1.0",
sum = "h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=",
version = "v1.38.0",
)

go_repository(
name = "org_golang_google_grpc_examples",
build_file_proto_mode = "disable_global",
Expand All @@ -4585,8 +4561,8 @@ def go_deps():
name = "org_golang_google_protobuf",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/protobuf",
sum = "h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=",
version = "v1.27.1",
sum = "h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=",
version = "v1.26.0",
)
go_repository(
name = "org_golang_x_arch",
Expand Down Expand Up @@ -4637,12 +4613,19 @@ def go_deps():
sum = "h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=",
version = "v0.4.2",
)
go_repository(
name = "org_golang_x_net",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/net",
sum = "h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=",
version = "v0.0.0-20210614182718-04defd469f4e",
)
go_repository(
name = "org_golang_x_oauth2",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/oauth2",
sum = "h1:3B43BWw0xEBsLZ/NO1VALz6fppU3481pik+2Ksv45z8=",
version = "v0.0.0-20210628180205-a41e5a781914",
sum = "h1:Mj83v+wSRNEar42a/MQgxk9X42TdEmrOl9i+y8WbxLo=",
version = "v0.0.0-20201109201403-9fd604954f58",
)
go_repository(
name = "org_golang_x_perf",
Expand Down
20 changes: 6 additions & 14 deletions WORKSPACE
View file
Expand Up @@ -43,24 +43,16 @@ go_repository(
name = "org_golang_x_sys",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/sys",
sum = "h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=",
version = "v0.0.0-20210630005230-0f9fa26af87c",
sum = "h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=",
version = "v0.0.0-20210616094352-59db8d763f22",
)

go_repository(
name = "org_golang_x_tools",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/tools",
sum = "h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=",
version = "v0.1.5",
)

go_repository(
name = "org_golang_x_net",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/net",
sum = "h1:4CSI6oo7cOjJKajidEljs9h+uP0rRZBPPPhcCbj5mw8=",
version = "v0.0.0-20210726213435-c6fcb2dbf985",
sum = "h1:L69ShwSZEyCsLKoAxDKeMvLDZkumEe8gXUZAjab0tX8=",
version = "v0.1.3",
)

go_repository(
Expand Down Expand Up @@ -99,8 +91,8 @@ go_repository(
name = "org_golang_google_genproto",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/genproto",
sum = "h1:VpRFBmFg/ol+rqJnkKLPjVebPNFbSxuj17B7bH1xMc8=",
version = "v0.0.0-20210726200206-e7812ac95cc0",
sum = "h1:R1r5J0u6Cx+RNl/6mezTw6oA14cmKC96FeUwL6A9bd4=",
version = "v0.0.0-20210624195500-8bfb893ecb84",
)

go_repository(
Expand Down
26 changes: 12 additions & 14 deletions go.mod
View file
Expand Up @@ -3,8 +3,7 @@ module github.com/cockroachdb/cockroach
go 1.16

require (
cloud.google.com/go v0.88.0 // indirect
cloud.google.com/go/storage v1.16.0
cloud.google.com/go/storage v1.10.0
github.com/Azure/azure-sdk-for-go v33.4.0+incompatible
github.com/Azure/azure-storage-blob-go v0.14.0
github.com/Azure/go-autorest/autorest v0.11.1
Expand Down Expand Up @@ -75,15 +74,14 @@ require (
github.com/golang-commonmark/puny v0.0.0-20180910110745-050be392d8b8 // indirect
github.com/golang/geo v0.0.0-20200319012246-673a6f80352d
github.com/golang/glog v0.0.0-20210429001901-424d2337a529 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0
github.com/golang/mock v1.5.0
github.com/golang/protobuf v1.5.2
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.6
github.com/google/go-cmp v0.5.5
github.com/google/go-github v17.0.0+incompatible
github.com/google/pprof v0.0.0-20210715191844-86eeefc3e471
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99
github.com/gorhill/cronexpr v0.0.0-20140423231348-a557574d6c02
github.com/gorilla/mux v1.8.0
github.com/goware/modvendor v0.3.0
Expand Down Expand Up @@ -157,20 +155,20 @@ require (
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
golang.org/x/exp v0.0.0-20210514180818-737f94c0881e
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58
golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
golang.org/x/text v0.3.6
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
golang.org/x/tools v0.1.5
google.golang.org/api v0.51.0
google.golang.org/genproto v0.0.0-20210726200206-e7812ac95cc0
google.golang.org/grpc v1.39.0
golang.org/x/tools v0.1.3
google.golang.org/api v0.30.0
google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84
google.golang.org/grpc v1.38.0
google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d // indirect
google.golang.org/protobuf v1.27.1
google.golang.org/protobuf v1.26.0
gopkg.in/DataDog/dd-trace-go.v1 v1.28.0
gopkg.in/yaml.v2 v2.4.0
gotest.tools/v3 v3.0.3 // indirect
Expand Down

0 comments on commit dbbf8fb

Please sign in to comment.