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

manual rebase of #25554 #29200

Merged
merged 1 commit into from
Jul 20, 2021
Merged

manual rebase of #25554 #29200

merged 1 commit into from
Jul 20, 2021

Conversation

jbardin
Copy link
Member

@jbardin jbardin commented Jul 20, 2021

Rebased commit from #25554. This updates the client and removes a lot of old dependencies. There are newer module-compatible releases of the client since the commit being pulled here was released, but there appears to be some breaking changes between the versions, so I left the commit at the specified has rather than attempting to update further.


etcd rewrote its import path from coreos/etcd to go.etcd.io/etcd.
Changed the imports path in this commit, which also updates the code
version.

This lets us remove the github.com/ugorji/go/codec dependency, which
was pinned to a fairly old version. The net change is a loss of 30,000
lines of code in the vendor directory. (I first noticed this problem
because the outdated go/codec dependency was causing a dependency
failure when I tried to put Terraform and another project in the same
vendor directory.)

Note the version shows up funkily in go.mod, but I verified
visually it's the same commit as the "release-3.4" tag in
github.com/coreos/etcd. The etcd team plans to fix the release version
tagging in v3.5, which should be released soon.

etcd rewrote its import path from coreos/etcd to go.etcd.io/etcd.
Changed the imports path in this commit, which also updates the code
version.

This lets us remove the github.com/ugorji/go/codec dependency, which
was pinned to a fairly old version. The net change is a loss of 30,000
lines of code in the vendor directory. (I first noticed this problem
because the outdated go/codec dependency was causing a dependency
failure when I tried to put Terraform and another project in the same
vendor directory.)

Note the version shows up funkily in go.mod, but I verified
visually it's the same commit as the "release-3.4" tag in
github.com/coreos/etcd. The etcd team plans to fix the release version
tagging in v3.5, which should be released soon.
Copy link
Contributor

@mildwonkey mildwonkey left a comment

Choose a reason for hiding this comment

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

I like your decision to pin to the version from the original pr 👍

@jbardin
Copy link
Member Author

jbardin commented Jul 20, 2021

ACC tests can be checked now that #28128 is merged.

--- PASS: TestBackend_impl (0.00s)
--- PASS: TestBackend (7.64s)
--- PASS: TestBackend_lockDisabled (0.13s)
--- PASS: TestRemoteClient_impl (0.00s)
--- PASS: TestRemoteClient (0.32s)
--- PASS: TestEtcdv3_stateLock (2.58s)
--- PASS: TestEtcdv3_destroyLock (0.45s)

@jbardin jbardin merged commit dd330e5 into main Jul 20, 2021
@jbardin jbardin deleted the jbardin/rebase-25554 branch July 20, 2021 18:30
@github-actions
Copy link
Contributor

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 20, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants