Skip to content

Conversation

@AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Dec 16, 2016

- What I did

Updated gcplogs deps.

The aim of this PR is to vendor golang/oauth2@96382aa for PR #29478, so as to fix issue #29344.

Also closes #25403

- How I did it

The first commit vendors the latest oauth2 and its deps.
So basically we only need the first commit.

However, the first commit is not enough because it vendors both google.golang.org/cloud and cloud.google.com/go.
So the second commit removes google.golang.org/cloud and completely migrates to cloud.google.com/go.

- How to verify it

docker run --log-driver=gcplogs ...

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@AkihiroSuda
Copy link
Member Author

cc @mikedanese

@thaJeztah
Copy link
Member

ping @justincormack as well 👍

vendor.conf Outdated
golang.org/x/oauth2 2baa8a1b9338cf13d9eeb27696d761155fa480be
golang.org/x/oauth2 96382aa079b72d8c014eb0c50f6c223d1e6a2de0
google.golang.org/api dc6d2353af16e2a2b0ff6986af051d473a4ed468
# TODO: remove google.golang.org/cloud, which has been replaced by cloud.google.com/go
Copy link
Member

Choose a reason for hiding this comment

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

oh, we have an issue for that #25403

@thaJeztah
Copy link
Member

Looks like #25403 will be fixed by this as well, or are there more instances?

google.golang.org/api 3cc2e591b550923a2c5f0ab5a803feda924d5823
cloud.google.com/go 9d965e63e8cceb1b5d7977a202f0fcb8866d6525
github.com/googleapis/gax-go da06d194a00e19ce00d9011a13931c3f6f6887c7
google.golang.org/genproto 9359a8d303c45e3212571b77610f1cefb0c6f3eb
Copy link
Member Author

@AkihiroSuda AkihiroSuda Dec 16, 2016

Choose a reason for hiding this comment

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

Just note that I didn't use the latest genproto, so as to avoid undefined: grpc.SupportPackageIsVersion4 compilation error (messy! 😭)

https://github.com/google/go-genproto/commits/master

Copy link
Member Author

@AkihiroSuda AkihiroSuda Dec 16, 2016

Choose a reason for hiding this comment

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

Also, google.golang.org/api is not the latest one, because vendoring the latest one was somehow messy

https://github.com/google/google-api-go-client/commits/master

@AkihiroSuda
Copy link
Member Author

@thaJeztah Yes, this PR will close #25403 as well

Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83 cpuguy83 merged commit b0aab6e into moby:master Dec 28, 2016
@GordonTheTurtle GordonTheTurtle added this to the 1.14.0 milestone Dec 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

update Google Cloud API client import paths and more

5 participants