*: add workaround for go-resty import to go.mod and fix import paths

[tbg]

go-resty is imported under its old import path by grpc-gateway.
This works around that problem until we pick up a version of
grpc-gateway that has the imports fixed.

See: go-resty/resty#230

Also fix the import paths so that updatedep.sh works again.

[tbg]

I added two commits that show the result of updatedep.sh, and another commit that shows that things "work" when we just delete the self-vendored copies from vendor. I don't intend to merge this, we need to figure out why the self-vendoring happens. I tried but no dice yet.

[tbg]

$ go mod why -m github.com/coreos/etcd
# github.com/coreos/etcd
go.etcd.io/etcd/v3
go.etcd.io/etcd/etcdmain
github.com/coreos/etcd/clientv3

Doesn't come back via go list:

go list ./... | grep coreos

Also wasn't able to find anything that imported this by grepping through the sourcecode.

[codecov-io]

Codecov Report

Merging #10773 into master will increase coverage by 0.15%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #10773      +/-   ##
==========================================
+ Coverage   62.51%   62.67%   +0.15%     
==========================================
  Files         392      392              
  Lines       37157    37157              
==========================================
+ Hits        23230    23289      +59     
+ Misses      12330    12296      -34     
+ Partials     1597     1572      -25

Impacted Files	Coverage Δ
etcdserver/api/v2http/client_auth.go	53.24% <ø> (ø)	⬆️
clientv3/lease.go	91.11% <ø> (-0.75%)	⬇️
etcdctl/ctlv3/command/watch_command.go	44.26% <ø> (ø)	⬆️
etcdserver/api/rafthttp/peer.go	78.77% <ø> (+1.11%)	⬆️
etcdserver/api/v2http/http.go	66.66% <ø> (ø)	⬆️
etcdserver/api/v3rpc/util.go	51.61% <ø> (ø)	⬆️
etcdctl/ctlv2/command/set_dir_command.go	0% <ø> (ø)	⬆️
etcdserver/api/v2v3/server.go	0% <ø> (ø)	⬆️
etcdserver/api/membership/errors.go	100% <ø> (ø)	⬆️
etcdctl/ctlv3/command/member_command.go	32.43% <ø> (ø)	⬆️
... and 221 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2f7121b...0ffee56. Read the comment docs.

[jingyih]

I think I have seen similar issue after running the updatedep script. Could not figure out why. Thanks for digging into this.

[tbg]

PTAL, I think I got it (second commit)

[jingyih]

The versioned imports were reverted due to various issues. #10766
cc @gyuho

[jingyih]

I think I have seen similar issue after running the updatedep script. Could not figure out why. Thanks for digging into this.

When I tried this, we still have "v3" in all the import paths. So it might be a different issue.

[gyuho]

Can we try again removing v3 at the top of the line https://github.com/etcd-io/etcd/blob/master/go.mod? I forgot to delete that part. Sorry for delay.

[gyuho]

Please try #10781.

[tbg]

Yep, works! Closing this PR since it's no longer needed. Thanks @gyuho.

[gyuho]

@tbg Thanks!