Skip to content

Commit

Permalink
Merge #96449
Browse files Browse the repository at this point in the history
96449: update pubsub dependency r=shermanCRL a=shermanCRL

Motivated by an apparent shortcoming in a dependency ([internal conversation](https://cockroachlabs.slack.com/archives/C9TGBJB44/p1675192660786999)).

This brings in updates for sub dependencies, here are some diffs:

- googleapis/google-cloud-go@kms/v1.1.0...kms/v1.6.0
  `@adityamaru` would you please review KMS changes? This link above is not great for reviewing the history of that submodule, perhaps you can find a better way?
- golang/net@a158d28...f15817d
  `@knz` reviewed
- golang/sync@886fb93...v0.1.0
  `@knz` reviewed
- golang/time@1f47c86...v0.1.0
  `@nvanbenschoten` reviewed 
- googleapis/google-api-go-client@v0.80.0...v0.103.0
  `@shermanCRL` reviewed
- protocolbuffers/protobuf-go@v1.28.0...v1.28.1
  `@knz` reviewed
- google/go-cmp@v0.5.8...v0.5.9
  `@shermanCRL` reviewed
- census-instrumentation/opencensus-go@v0.23.0...v0.24.0
  `@shermanCRL` reviewed
- googleapis/go-genproto@f39f71e...67e5cbc
  `@shermanCRL` reviewed

Jira: none
Epic: none

Co-authored-by: Matt Sherman <[email protected]>
  • Loading branch information
craig[bot] and shermanCRL committed Mar 8, 2023
2 parents 329a232 + e846fce commit cd0ff71
Show file tree
Hide file tree
Showing 6 changed files with 1,357 additions and 208 deletions.
1,234 changes: 1,172 additions & 62 deletions DEPS.bzl

Large diffs are not rendered by default.

147 changes: 129 additions & 18 deletions build/bazelutil/distdir_files.bzl

Large diffs are not rendered by default.

35 changes: 18 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ require (
golang.org/x/exp/typeparams v0.0.0-20220713135740-79cabaa25d75 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.7.0
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
golang.org/x/sync v0.1.0
golang.org/x/sys v0.5.0
golang.org/x/text v0.7.0
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
golang.org/x/time v0.1.0
golang.org/x/tools v0.1.12
google.golang.org/api v0.80.0
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3
google.golang.org/api v0.103.0
google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd
google.golang.org/grpc v1.51.0
google.golang.org/protobuf v1.28.0
google.golang.org/protobuf v1.28.1
)

// If any of the following dependencies get updated as a side-effect
// of another change, be sure to request extra scrutiny from
// the disaster recovery team.
require (
cloud.google.com/go/kms v1.1.0
cloud.google.com/go/pubsub v1.16.0
cloud.google.com/go/storage v1.21.0
cloud.google.com/go/kms v1.6.0
cloud.google.com/go/pubsub v1.28.0
cloud.google.com/go/storage v1.27.0
github.com/Azure/azure-sdk-for-go v57.1.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.20
github.com/Azure/go-autorest/autorest/azure/auth v0.5.8
Expand Down Expand Up @@ -143,7 +143,7 @@ require (
github.com/gogo/status v1.1.0
github.com/golang-commonmark/markdown v0.0.0-20180910011815-a8f139058164
github.com/google/flatbuffers v2.0.0+incompatible
github.com/google/go-cmp v0.5.8
github.com/google/go-cmp v0.5.9
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-github/v42 v42.0.0
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
Expand Down Expand Up @@ -228,9 +228,11 @@ require (
)

require (
cloud.google.com/go v0.100.2 // indirect
cloud.google.com/go/compute v1.6.1 // indirect
cloud.google.com/go/iam v0.3.0 // indirect
cloud.google.com/go v0.107.0 // indirect
cloud.google.com/go/compute v1.13.0 // indirect
cloud.google.com/go/compute/metadata v0.2.1 // indirect
cloud.google.com/go/iam v0.8.0 // indirect
cloud.google.com/go/longrunning v0.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
Expand Down Expand Up @@ -293,7 +295,8 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/safehtml v0.0.2 // indirect
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.7.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 @@ -373,12 +376,12 @@ require (
github.com/urfave/cli/v2 v2.3.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.mongodb.org/mongo-driver v1.5.1 // indirect
go.opencensus.io v0.23.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
)
Expand Down Expand Up @@ -423,5 +426,3 @@ replace gopkg.in/yaml.v2 => github.com/cockroachdb/yaml v0.0.0-20210825132133-2d
replace github.com/knz/go-libedit => github.com/otan-cockroach/go-libedit v1.10.2-0.20201030151939-7cced08450e7

replace github.com/docker/docker => github.com/moby/moby v20.10.6+incompatible

replace google.golang.org/api v0.80.0 => github.com/cockroachdb/google-api-go-client v0.80.1-0.20221117193156-6a9f7150cb93
Loading

0 comments on commit cd0ff71

Please sign in to comment.