Skip to content

Commit

Permalink
Merge #80412
Browse files Browse the repository at this point in the history 
80412: go.mod: upgrade cloud.google.com/go/storage to v1.21.0 r=knz a=adityamaru

This change was motivated by the need to pickup
googleapis/google-cloud-go#5482 that
makes the `Writer.ChunkRetryDeadline` configurable.

Some other notable bumps in this upgrade are:

go get: upgraded google.golang.org/api v0.65.0 => v0.75.0
go get: upgraded google.golang.org/grpc v1.43.0 => v1.46.0
go get: upgraded google.golang.org/protobuf v1.27.1 => v1.28.0

Release note: None

Co-authored-by: Aditya Maru <[email protected]>
  • Loading branch information
@adityamaru
craig[bot] and adityamaru committed Apr 23, 2022
2 parents 0add852 + c8296f1 commit 621a046
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 72 deletions.
78 changes: 39 additions & 39 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2317,10 +2317,10 @@ def go_deps():
name = "com_github_envoyproxy_go_control_plane",
build_file_proto_mode = "disable_global",
importpath = "github.com/envoyproxy/go-control-plane",
sha256 = "41dc70a8e658cb8945fa0de289d25dd7a608e99929bae144776781401dec507a",
strip_prefix = "github.com/envoyproxy/go-control-plane@v0.9.10-0.20210907150352-cf90f659a021",
sha256 = "8e8bf22bacf1b4b5a54aa6c56af3f281131d6dcd1ccbf2226b9c1e62c9b5cca7",
strip_prefix = "github.com/envoyproxy/go-control-plane@v0.10.2-0.20220325020618-49ff273808a1",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/go-control-plane/com_github_envoyproxy_go_control_plane-v0.9.10-0.20210907150352-cf90f659a021.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/go-control-plane/com_github_envoyproxy_go_control_plane-v0.10.2-0.20220325020618-49ff273808a1.zip",
],
)
go_repository(
Expand Down Expand Up @@ -3596,10 +3596,10 @@ def go_deps():
name = "com_github_googleapis_gax_go_v2",
build_file_proto_mode = "disable_global",
importpath = "github.com/googleapis/gax-go/v2",
sha256 = "b8f7a0fd38ce167551e21a0c29c9bb3ebb4ccf179ecebe6c5b2504ce7f1baddd",
strip_prefix = "github.com/googleapis/gax-go/v2@v2.1.1",
sha256 = "4d34bd7f9d9c402c2e13f75383f8c9984d64394df61c48f49449082880af4d66",
strip_prefix = "github.com/googleapis/gax-go/v2@v2.3.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/googleapis/gax-go/v2/com_github_googleapis_gax_go_v2-v2.1.1.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/googleapis/gax-go/v2/com_github_googleapis_gax_go_v2-v2.3.0.zip",
],
)
go_repository(
Expand Down Expand Up @@ -8107,10 +8107,10 @@ def go_deps():
name = "com_google_cloud_go_compute",
build_file_proto_mode = "disable_global",
importpath = "cloud.google.com/go/compute",
sha256 = "218c735fda51e41253d69dccbb09be8c494bcfa6062895d4734f1e7c0f4cf0ec",
strip_prefix = "cloud.google.com/go/compute@v1.1.0",
sha256 = "fd9c29e99ad763abad551b83a41ceaab0da5212b2f684b6ac02fa1a26a014914",
strip_prefix = "cloud.google.com/go/compute@v1.6.1",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/com_google_cloud_go_compute-v1.1.0.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/com_google_cloud_go_compute-v1.6.1.zip",
],
)
go_repository(
Expand All @@ -8137,10 +8137,10 @@ def go_deps():
name = "com_google_cloud_go_iam",
build_file_proto_mode = "disable_global",
importpath = "cloud.google.com/go/iam",
sha256 = "fd7412140440b51b39f605defa8ac062fb2b65dee94d1096db8a62709ae34b8f",
strip_prefix = "cloud.google.com/go/iam@v0.1.1",
sha256 = "943c35c32e09e5d9fe89ed8149f23d6ead84b1ede5fb1537539938046383f36a",
strip_prefix = "cloud.google.com/go/iam@v0.3.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/iam/com_google_cloud_go_iam-v0.1.1.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/iam/com_google_cloud_go_iam-v0.3.0.zip",
],
)
go_repository(
Expand All @@ -8167,10 +8167,10 @@ def go_deps():
name = "com_google_cloud_go_storage",
build_file_proto_mode = "disable_global",
importpath = "cloud.google.com/go/storage",
sha256 = "998027df933c89d2a8c5ab535eec479e3210317b13cd9d9b64062c722a48523a",
strip_prefix = "cloud.google.com/go/storage@v1.18.2",
sha256 = "fb7b2e6ffe19ef64c8ccd809a64896e551137bfeb7a9af973dab8ab39da211ec",
strip_prefix = "cloud.google.com/go/storage@v1.21.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/storage/com_google_cloud_go_storage-v1.18.2.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/storage/com_google_cloud_go_storage-v1.21.0.zip",
],
)
go_repository(
Expand Down Expand Up @@ -8995,10 +8995,10 @@ def go_deps():
name = "org_golang_google_api",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/api",
sha256 = "8e97065d27143c3b9d80bcc2afd9d97a038a020a7d1be3699350780cbe187dc2",
strip_prefix = "google.golang.org/api@v0.65.0",
sha256 = "ff7ee199b1d7d3e4034d6ddce326d130ff77d9598ca4cf59669f97dc3d6b0f8c",
strip_prefix = "google.golang.org/api@v0.75.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/api/org_golang_google_api-v0.65.0.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/api/org_golang_google_api-v0.75.0.zip",
],
)
go_repository(
Expand All @@ -9025,20 +9025,20 @@ def go_deps():
name = "org_golang_google_genproto",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/genproto",
sha256 = "3c82d071d0f035a28367f01ad0672585d094813560ffdb715142996795c881e2",
strip_prefix = "google.golang.org/[email protected]20220118154757-00ab72f36ad5",
sha256 = "201ad005a42adb569c45adae512d9e3b21b1304dbdff38d4dc648b1a3b67d655",
strip_prefix = "google.golang.org/[email protected]20220422154200-b37d22cd5731",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20220118154757-00ab72f36ad5.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20220422154200-b37d22cd5731.zip",
],
)
go_repository(
name = "org_golang_google_grpc",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/grpc",
sha256 = "19fa6e227e62e3ae9791ab81b8a784e93cc68860b7fe0e85dd8d3cfbc1b24398",
strip_prefix = "google.golang.org/grpc@v1.43.0",
sha256 = "f7bd2af40f0d6b16f7d771099e0ae7ed3468b9e40faf88be9d9759fffaff2a4a",
strip_prefix = "google.golang.org/grpc@v1.46.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.43.0.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.46.0.zip",
],
)
go_repository(
Expand All @@ -9065,10 +9065,10 @@ def go_deps():
name = "org_golang_google_protobuf",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/protobuf",
sha256 = "93180890add31a55b56d9c083a397c1dacc3571afa83981d0daa16f0afaf51d0",
strip_prefix = "google.golang.org/protobuf@v1.27.1",
sha256 = "f06dc39ce93043d6ec91a5106c7ec958be6b4ba520cab3a21a2448d387cf15a4",
strip_prefix = "google.golang.org/protobuf@v1.28.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.27.1.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.28.0.zip",
],
)
go_repository(
Expand Down Expand Up @@ -9145,20 +9145,20 @@ def go_deps():
name = "org_golang_x_net",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/net",
sha256 = "fb6a68784dabf543c3d90fc35598bdd9c356f22bddc59c8f820de6db7ea6a039",
strip_prefix = "golang.org/x/[email protected]20220225172249-27dd8689420f",
sha256 = "f5f7dc4a598dc997feb78996f2b224ccac588af7109b082439094a59690982c3",
strip_prefix = "golang.org/x/[email protected]20220421235706-1d1ef9303861",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/net/org_golang_x_net-v0.0.0-20220225172249-27dd8689420f.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/net/org_golang_x_net-v0.0.0-20220421235706-1d1ef9303861.zip",
],
)
go_repository(
name = "org_golang_x_oauth2",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/oauth2",
sha256 = "f67c8da0113402471bd476d772e1f4e20907cb3d12c413c0c445e0f4c906b002",
strip_prefix = "golang.org/x/[email protected]20220309155454-6242fa91716a",
sha256 = "81f60a99f4f3bcb34993ca5831386d8399c472a0ca4dc6f1e3659a071d002029",
strip_prefix = "golang.org/x/[email protected]20220411215720-9780585627b5",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/oauth2/org_golang_x_oauth2-v0.0.0-20220309155454-6242fa91716a.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/oauth2/org_golang_x_oauth2-v0.0.0-20220411215720-9780585627b5.zip",
],
)
go_repository(
Expand All @@ -9185,10 +9185,10 @@ def go_deps():
name = "org_golang_x_sys",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/sys",
sha256 = "84289ab5dec00ea6f7b911c392b59198d046eabe43185cba45cff79f5b1a9233",
strip_prefix = "golang.org/x/[email protected]20220209214540-3681064d5158",
sha256 = "31ab4197e7c6ce4e2808ee18e788e23be476824d7c900be4743a425b5a197484",
strip_prefix = "golang.org/x/[email protected]20220422013727-9388b58f7150",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/sys/org_golang_x_sys-v0.0.0-20220209214540-3681064d5158.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/sys/org_golang_x_sys-v0.0.0-20220422013727-9388b58f7150.zip",
],
)
go_repository(
Expand Down Expand Up @@ -9235,10 +9235,10 @@ def go_deps():
name = "org_golang_x_xerrors",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/xerrors",
sha256 = "380aaa3368ae165628bb487cf4e695a55c1420072b8b7a6f59c122f6a23bb255",
strip_prefix = "golang.org/x/[email protected]20200804184101-5ec99f83aff1",
sha256 = "74da8691af0731e342692d53b91af7a0b8b1d7ce509eccc4fc6fddde4fecfcd1",
strip_prefix = "golang.org/x/[email protected]20220411194840-2f41105eb62f",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/xerrors/org_golang_x_xerrors-v0.0.0-20200804184101-5ec99f83aff1.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/xerrors/org_golang_x_xerrors-v0.0.0-20220411194840-2f41105eb62f.zip",
],
)
go_repository(
Expand Down
24 changes: 12 additions & 12 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.17
require (
cloud.google.com/go/kms v1.1.0
cloud.google.com/go/pubsub v1.16.0
cloud.google.com/go/storage v1.18.2
cloud.google.com/go/storage v1.21.0
github.com/Azure/azure-sdk-for-go v57.1.0+incompatible
github.com/Azure/azure-storage-blob-go v0.14.0
github.com/Azure/go-autorest/autorest v0.11.20
Expand Down Expand Up @@ -154,19 +154,19 @@ require (
golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70
golang.org/x/exp v0.0.0-20220104160115-025e73f80486
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a
golang.org/x/net v0.0.0-20220421235706-1d1ef9303861
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
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-20220209214540-3681064d5158
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
golang.org/x/text v0.3.7
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023
google.golang.org/api v0.65.0
google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5
google.golang.org/grpc v1.43.0
google.golang.org/protobuf v1.27.1
google.golang.org/api v0.75.0
google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731
google.golang.org/grpc v1.46.0
google.golang.org/protobuf v1.28.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
honnef.co/go/tools v0.2.1
Expand All @@ -175,8 +175,8 @@ require (

require (
cloud.google.com/go v0.100.2 // indirect
cloud.google.com/go/compute v1.1.0 // indirect
cloud.google.com/go/iam v0.1.1 // indirect
cloud.google.com/go/compute v1.6.1 // indirect
cloud.google.com/go/iam v0.3.0 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
Expand Down Expand Up @@ -241,7 +241,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
github.com/googleapis/gax-go/v2 v2.3.0 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
Expand Down Expand Up @@ -326,7 +326,7 @@ require (
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
)
Expand Down
Loading

0 comments on commit 621a046

Please sign in to comment.