Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vendored dependencies. #3357

Merged
merged 4 commits into from
May 22, 2019
Merged

Conversation

danielmai
Copy link
Contributor

@danielmai danielmai commented May 2, 2019

Found all external dependencies with govendor list. Each external dependency is marked as e in the list output:

$ govendor list | awk '$1 == "e" { print }'
 e  github.com/apache/thrift/lib/go/thrift
 e  github.com/dgraph-io/dgo/x
 e  github.com/dgrijalva/jwt-go
 e  github.com/dustin/go-humanize/english
 e  github.com/golang/protobuf/jsonpb
 e  github.com/golang/protobuf/proto
 e  github.com/golang/protobuf/ptypes
 e  github.com/golang/protobuf/ptypes/any
 e  github.com/golang/protobuf/ptypes/duration
 e  github.com/golang/protobuf/ptypes/struct
 e  github.com/golang/protobuf/ptypes/timestamp
 e  github.com/google/uuid
 e  github.com/hashicorp/golang-lru/simplelru
 e  github.com/prometheus/client_golang/prometheus
 e  github.com/prometheus/client_golang/prometheus/internal
 e  github.com/prometheus/client_golang/prometheus/promhttp
 e  github.com/prometheus/client_model/go
 e  github.com/prometheus/common/expfmt
 e  github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
 e  github.com/prometheus/common/model
 e  github.com/prometheus/procfs
 e  go.opencensus.io
 e  go.opencensus.io/internal
 e  go.opencensus.io/internal/tagencoding
 e  go.opencensus.io/metric/metricdata
 e  go.opencensus.io/metric/metricexport
 e  go.opencensus.io/metric/metricproducer
 e  go.opencensus.io/plugin/ocgrpc
 e  go.opencensus.io/resource
 e  go.opencensus.io/stats
 e  go.opencensus.io/stats/internal
 e  go.opencensus.io/stats/view
 e  go.opencensus.io/tag
 e  go.opencensus.io/trace
 e  go.opencensus.io/trace/internal
 e  go.opencensus.io/trace/propagation
 e  go.opencensus.io/trace/tracestate
 e  go.opencensus.io/zpages
 e  go.opencensus.io/zpages/internal
 e  golang.org/x/crypto/ssh/terminal
 e  golang.org/x/net/context
 e  golang.org/x/net/http2
 e  golang.org/x/net/http2/hpack
 e  golang.org/x/net/internal/timeseries
 e  golang.org/x/net/trace
 e  golang.org/x/sync/semaphore
 e  golang.org/x/sys/windows
 e  google.golang.org/api/support/bundler
 e  google.golang.org/genproto/googleapis/rpc/status
 e  google.golang.org/grpc
 e  google.golang.org/grpc/balancer
 e  google.golang.org/grpc/balancer/base
 e  google.golang.org/grpc/balancer/roundrobin
 e  google.golang.org/grpc/binarylog/grpc_binarylog_v1
 e  google.golang.org/grpc/codes
 e  google.golang.org/grpc/connectivity
 e  google.golang.org/grpc/credentials
 e  google.golang.org/grpc/credentials/internal
 e  google.golang.org/grpc/encoding
 e  google.golang.org/grpc/encoding/gzip
 e  google.golang.org/grpc/encoding/proto
 e  google.golang.org/grpc/grpclog
 e  google.golang.org/grpc/health
 e  google.golang.org/grpc/health/grpc_health_v1
 e  google.golang.org/grpc/internal
 e  google.golang.org/grpc/internal/backoff
 e  google.golang.org/grpc/internal/balancerload
 e  google.golang.org/grpc/internal/binarylog
 e  google.golang.org/grpc/internal/channelz
 e  google.golang.org/grpc/internal/envconfig
 e  google.golang.org/grpc/internal/grpcrand
 e  google.golang.org/grpc/internal/grpcsync
 e  google.golang.org/grpc/internal/syscall
 e  google.golang.org/grpc/internal/transport
 e  google.golang.org/grpc/keepalive
 e  google.golang.org/grpc/metadata
 e  google.golang.org/grpc/naming
 e  google.golang.org/grpc/peer
 e  google.golang.org/grpc/resolver
 e  google.golang.org/grpc/resolver/dns
 e  google.golang.org/grpc/resolver/passthrough
 e  google.golang.org/grpc/stats
 e  google.golang.org/grpc/status
 e  google.golang.org/grpc/tap

Vendored in each external dependency:

govendor update github.com/dgraph-io/dgo/...
govendor update github.com/pkg/errors/...

govendor update dgrijalva/jwt-go/...

govendor update google/uuid/...

govendor update github.com/hashigcorp/golang-lru/simplelru/...

govendor update github.com/prometheus/client_golang/prometheus/...

govendor update github.com/prometheus/client_model/go/...

govendor update github.com/prometheus/common/...

govendor update github.com/prometheus/procfs/...

govendor update github.com/dustin/go-humanize/english/...

govendor update github.com/apache/thrift/lib/go/thrift/...

# OpenCensus
govendor update go.opencensus.io
govendor update go.opencensus.io/internal/...
govendor update go.opencensus.io/internal/tagencoding/...
govendor update go.opencensus.io/metric/metricdata/...
govendor update go.opencensus.io/metric/metricexport/...
govendor update go.opencensus.io/metric/metricproducer/...
govendor update go.opencensus.io/plugin/ocgrpc/...
govendor update go.opencensus.io/resource/...
govendor update go.opencensus.io/stats/...
govendor update go.opencensus.io/stats/internal/...
govendor update go.opencensus.io/stats/view/...
govendor update go.opencensus.io/tag/...
govendor update go.opencensus.io/trace/...
govendor update go.opencensus.io/trace/internal/...
govendor update go.opencensus.io/trace/propagation/...
govendor update go.opencensus.io/trace/tracestate/...
govendor update go.opencensus.io/zpages/...
govendor update go.opencensus.io/zpages/internal/...

govendor update google.golang.org/api/support/bundler/...

govendor update google.golang.org/genproto/googleapis/rpc/status/...

govendor update golang.org/x/crypto/ssh/terminal/...
govendor update golang.org/x/net/context/...
govendor update golang.org/x/net/http2/...
govendor update golang.org/x/net/http2/hpack/...
govendor update golang.org/x/net/internal/timeseries/...
govendor update golang.org/x/net/trace/...
govendor update golang.org/x/sync/semaphore/...
govendor update golang.org/x/sys/windows/...
govendor update golang.org/x/sys/unix/...

# Protobuf and gRPC
govendor update github.com/golang/protobuf/jsonpb/...
govendor update github.com/golang/protobuf/proto/...
govendor update github.com/golang/protobuf/ptypes/...
govendor update github.com/golang/protobuf/ptypes/any/...
govendor update github.com/golang/protobuf/ptypes/duration/...
govendor update github.com/golang/protobuf/ptypes/struct/...
govendor update github.com/golang/protobuf/ptypes/timestamp/...
govendor update google.golang.org/grpc                                                    
govendor update google.golang.org/grpc/balancer/...
govendor update google.golang.org/grpc/balancer/base/...
govendor update google.golang.org/grpc/balancer/roundrobin/...
govendor update google.golang.org/grpc/binarylog/grpc_binarylog_v1/...
govendor update google.golang.org/grpc/codes/...
govendor update google.golang.org/grpc/connectivity/...
govendor update google.golang.org/grpc/credentials/...
govendor update google.golang.org/grpc/credentials/internal/...
govendor update google.golang.org/grpc/encoding/...
govendor update google.golang.org/grpc/encoding/gzip/...
govendor update google.golang.org/grpc/encoding/proto/...
govendor update google.golang.org/grpc/grpclog/...
govendor update google.golang.org/grpc/health/...
govendor update google.golang.org/grpc/health/grpc_health_v1/...
govendor update google.golang.org/grpc/internal/...
govendor update google.golang.org/grpc/internal/backoff/...
govendor update google.golang.org/grpc/internal/balancerload/...
govendor update google.golang.org/grpc/internal/binarylog/...
govendor update google.golang.org/grpc/internal/channelz/...
govendor update google.golang.org/grpc/internal/envconfig/...
govendor update google.golang.org/grpc/internal/grpcrand/...
govendor update google.golang.org/grpc/internal/grpcsync/...
govendor update google.golang.org/grpc/internal/syscall/...
govendor update google.golang.org/grpc/internal/transport/...
govendor update google.golang.org/grpc/keepalive/...
govendor update google.golang.org/grpc/metadata/...
govendor update google.golang.org/grpc/naming/...
govendor update google.golang.org/grpc/peer/...
govendor update google.golang.org/grpc/resolver/...
govendor update google.golang.org/grpc/resolver/dns/...
govendor update google.golang.org/grpc/resolver/passthrough/...
govendor update google.golang.org/grpc/stats/...
govendor update google.golang.org/grpc/status/...
govendor update google.golang.org/grpc/tap/...

Make sure that gRPC is locked to release version v1.20.1:

govendor fetch google.golang.org/[email protected]

Remove unused vendor dependencies. In govendor list unused vendored packages are marked as u.

govendor remove github.com/MakeNowJust/heredoc

This change is Reviewable

@danielmai danielmai requested review from manishrjain and a team as code owners May 2, 2019 02:54
@campoy
Copy link
Contributor

campoy commented May 17, 2019

This change is necessary so people not using govendor will be able to use dgraph, but it seems they were already vendored?

Changed the title to "updating vendored dependencies" maybe.

Other than that, LGTM

$ govendor list | awk '$1 ~ "e"' | awk '{ printf("govendor update %s/...\n", $2) }' | bash -x
+ govendor update github.com/apache/thrift/lib/go/thrift/...
+ govendor update github.com/dgraph-io/dgo/x/...
+ govendor update github.com/dgrijalva/jwt-go/...
+ govendor update github.com/dustin/go-humanize/english/...
+ govendor update github.com/golang/protobuf/jsonpb/...
+ govendor update github.com/golang/protobuf/ptypes/...
+ govendor update github.com/golang/protobuf/ptypes/any/...
+ govendor update github.com/golang/protobuf/ptypes/duration/...
+ govendor update github.com/golang/protobuf/ptypes/struct/...
+ govendor update github.com/golang/protobuf/ptypes/timestamp/...
+ govendor update github.com/google/uuid/...
+ govendor update go.opencensus.io/plugin/ocgrpc/...
+ govendor update go.opencensus.io/trace/propagation/...
+ govendor update go.opencensus.io/zpages/...
+ govendor update go.opencensus.io/zpages/internal/...
+ govendor update golang.org/x/crypto/ssh/terminal/...
+ govendor update golang.org/x/net/context/...
+ govendor update golang.org/x/net/http2/...
+ govendor update golang.org/x/net/http2/hpack/...
+ govendor update golang.org/x/net/internal/timeseries/...
+ govendor update golang.org/x/net/trace/...
+ govendor update golang.org/x/sync/semaphore/...
+ govendor update golang.org/x/sys/windows/...
+ govendor update google.golang.org/api/support/bundler/...
+ govendor update google.golang.org/genproto/googleapis/rpc/status/...
+ govendor update google.golang.org/grpc/...
+ govendor update google.golang.org/grpc/balancer/...
+ govendor update google.golang.org/grpc/balancer/base/...
+ govendor update google.golang.org/grpc/balancer/roundrobin/...
+ govendor update google.golang.org/grpc/binarylog/grpc_binarylog_v1/...
+ govendor update google.golang.org/grpc/codes/...
+ govendor update google.golang.org/grpc/connectivity/...
+ govendor update google.golang.org/grpc/credentials/...
+ govendor update google.golang.org/grpc/credentials/internal/...
+ govendor update google.golang.org/grpc/encoding/...
+ govendor update google.golang.org/grpc/encoding/gzip/...
+ govendor update google.golang.org/grpc/encoding/proto/...
+ govendor update google.golang.org/grpc/grpclog/...
+ govendor update google.golang.org/grpc/health/...
+ govendor update google.golang.org/grpc/health/grpc_health_v1/...
+ govendor update google.golang.org/grpc/internal/...
+ govendor update google.golang.org/grpc/internal/backoff/...
+ govendor update google.golang.org/grpc/internal/balancerload/...
+ govendor update google.golang.org/grpc/internal/binarylog/...
+ govendor update google.golang.org/grpc/internal/channelz/...
+ govendor update google.golang.org/grpc/internal/envconfig/...
+ govendor update google.golang.org/grpc/internal/grpcrand/...
+ govendor update google.golang.org/grpc/internal/grpcsync/...
+ govendor update google.golang.org/grpc/internal/syscall/...
+ govendor update google.golang.org/grpc/internal/transport/...
+ govendor update google.golang.org/grpc/keepalive/...
+ govendor update google.golang.org/grpc/metadata/...
+ govendor update google.golang.org/grpc/naming/...
+ govendor update google.golang.org/grpc/peer/...
+ govendor update google.golang.org/grpc/resolver/...
+ govendor update google.golang.org/grpc/resolver/dns/...
+ govendor update google.golang.org/grpc/resolver/passthrough/...
+ govendor update google.golang.org/grpc/stats/...
+ govendor update google.golang.org/grpc/status/...
+ govendor update google.golang.org/grpc/tap/...

$ govendor update golang.org/x/sys/unix/...

$ govendor update github.com/pkg/errors/...
@danielmai danielmai force-pushed the danielmai/vendor-all-the-things branch from 32a56b6 to 4a47697 Compare May 21, 2019 02:34
Copy link

@gitlw gitlw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: 0 of 552 files reviewed, all discussions resolved (waiting on @manishrjain)

Copy link
Contributor

@manishrjain manishrjain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 552 of 552 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@danielmai danielmai changed the title Vendor in external dependencies. Update vendored dependencies. May 22, 2019
@danielmai danielmai merged commit a1a1ae7 into master May 22, 2019
@danielmai danielmai deleted the danielmai/vendor-all-the-things branch May 22, 2019 23:42
dna2github pushed a commit to dna2fork/dgraph that referenced this pull request Jul 19, 2019
* Vendor in external dependencies that are externally referenced.

$ govendor list | awk '$1 ~ "e"' | awk '{ printf("govendor update %s/...\n", $2) }' | bash -x
+ govendor update github.com/apache/thrift/lib/go/thrift/...
+ govendor update github.com/dgraph-io/dgo/x/...
+ govendor update github.com/dgrijalva/jwt-go/...
+ govendor update github.com/dustin/go-humanize/english/...
+ govendor update github.com/golang/protobuf/jsonpb/...
+ govendor update github.com/golang/protobuf/ptypes/...
+ govendor update github.com/golang/protobuf/ptypes/any/...
+ govendor update github.com/golang/protobuf/ptypes/duration/...
+ govendor update github.com/golang/protobuf/ptypes/struct/...
+ govendor update github.com/golang/protobuf/ptypes/timestamp/...
+ govendor update github.com/google/uuid/...
+ govendor update go.opencensus.io/plugin/ocgrpc/...
+ govendor update go.opencensus.io/trace/propagation/...
+ govendor update go.opencensus.io/zpages/...
+ govendor update go.opencensus.io/zpages/internal/...
+ govendor update golang.org/x/crypto/ssh/terminal/...
+ govendor update golang.org/x/net/context/...
+ govendor update golang.org/x/net/http2/...
+ govendor update golang.org/x/net/http2/hpack/...
+ govendor update golang.org/x/net/internal/timeseries/...
+ govendor update golang.org/x/net/trace/...
+ govendor update golang.org/x/sync/semaphore/...
+ govendor update golang.org/x/sys/windows/...
+ govendor update google.golang.org/api/support/bundler/...
+ govendor update google.golang.org/genproto/googleapis/rpc/status/...
+ govendor update google.golang.org/grpc/...
+ govendor update google.golang.org/grpc/balancer/...
+ govendor update google.golang.org/grpc/balancer/base/...
+ govendor update google.golang.org/grpc/balancer/roundrobin/...
+ govendor update google.golang.org/grpc/binarylog/grpc_binarylog_v1/...
+ govendor update google.golang.org/grpc/codes/...
+ govendor update google.golang.org/grpc/connectivity/...
+ govendor update google.golang.org/grpc/credentials/...
+ govendor update google.golang.org/grpc/credentials/internal/...
+ govendor update google.golang.org/grpc/encoding/...
+ govendor update google.golang.org/grpc/encoding/gzip/...
+ govendor update google.golang.org/grpc/encoding/proto/...
+ govendor update google.golang.org/grpc/grpclog/...
+ govendor update google.golang.org/grpc/health/...
+ govendor update google.golang.org/grpc/health/grpc_health_v1/...
+ govendor update google.golang.org/grpc/internal/...
+ govendor update google.golang.org/grpc/internal/backoff/...
+ govendor update google.golang.org/grpc/internal/balancerload/...
+ govendor update google.golang.org/grpc/internal/binarylog/...
+ govendor update google.golang.org/grpc/internal/channelz/...
+ govendor update google.golang.org/grpc/internal/envconfig/...
+ govendor update google.golang.org/grpc/internal/grpcrand/...
+ govendor update google.golang.org/grpc/internal/grpcsync/...
+ govendor update google.golang.org/grpc/internal/syscall/...
+ govendor update google.golang.org/grpc/internal/transport/...
+ govendor update google.golang.org/grpc/keepalive/...
+ govendor update google.golang.org/grpc/metadata/...
+ govendor update google.golang.org/grpc/naming/...
+ govendor update google.golang.org/grpc/peer/...
+ govendor update google.golang.org/grpc/resolver/...
+ govendor update google.golang.org/grpc/resolver/dns/...
+ govendor update google.golang.org/grpc/resolver/passthrough/...
+ govendor update google.golang.org/grpc/stats/...
+ govendor update google.golang.org/grpc/status/...
+ govendor update google.golang.org/grpc/tap/...

$ govendor update golang.org/x/sys/unix/...

$ govendor update github.com/pkg/errors/...

* Vendor in grpc v1.20.1.

* Vendor in opencensus-go v0.21.0.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants