support `github.com/coreos/go-systemd/v22` by AkihiroSuda · Pull Request #87 · LK4D4/vndr

AkihiroSuda · 2020-01-09T10:53:08Z

Support vendoring github.com/coreos/go-systemd/v22 as follows:

foo.go:

package foo

import (
        "github.com/coreos/go-systemd/v22/dbus"
)

func Foo() (*dbus.Conn, error) {
        return dbus.New()
}

vendor.conf:

github.com/coreos/go-systemd/v22 v22.0.0
github.com/godbus/dbus/v5 v5.0.3

Now vndr checks out the contents of github.com/coreos/[email protected] repo
into the ./vendor/github.com/coreos/go-systemd/v22 directory.

Note that vndr does not verify the actual version number written in go.mod.
So vndr github.com/coreos/go-systemd/v23 v22.0.0 would vendor v22, not v23.

Fix containerd/cgroups#139

Support vendoring `github.com/coreos/go-systemd/v22` as follows: `foo.go`: ```go package foo import ( "github.com/coreos/go-systemd/v22/dbus" ) func Foo() (*dbus.Conn, error) { return dbus.New() } ``` `vendor.conf`: ``` github.com/coreos/go-systemd/v22 v22.0.0 github.com/godbus/dbus/v5 v5.0.3 ``` Now `vndr` checks out the contents of `github.com/coreos/[email protected]` repo into the `./vendor/github.com/coreos/go-systemd/v22` directory. Note that `vndr` does not verify the actual version number written in `go.mod`. So `vndr github.com/coreos/go-systemd/v23 v22.0.0` would vendor v22, not v23. Fix containerd/cgroups#139 Signed-off-by: Akihiro Suda <[email protected]>

thaJeztah · 2020-01-09T11:07:03Z

Thanks!!

Double checking: dependencies that use the "subdirectory approach" would still need to use the "old" way, right?

So if dependency github.com/foo/bar has a v2 (v<major version>) directory in the repository itself, I would do:

github.com/foo/bar      v2.3.4
github.com/bar/baz      v9.0.1

But for dependencies that only use a tag for v2+, I would use

github.com/foo/bar/v2     v2.3.4
github.com/bar/baz/v9     v9.0.1

thaJeztah · 2020-01-09T11:10:43Z

Working on some things, but I'll give this one a try; also thinking if this would support multiple versions of the same package, so

github.com/some/dep     v1.0.1
github.com/some/dep/v2  v2.0.3

I guess that could be supported, but only in the "no subdirectory" case 🤔

AkihiroSuda · 2020-01-09T11:13:01Z

So if dependency github.com/foo/bar has a v2 (v) directory in the repository itself, I would do:

Yes

But for dependencies that only use a tag for v2+, I would use

string in go.mod, not (git) tag?

if this would support multiple versions of the same package, so

Can be another PR?
Is there any specific package that we (Moby & containerd community) want to import in that way?

thaJeztah · 2020-01-09T11:20:00Z

string in go.mod, not (git) tag?

Ah, yes, probably (not exactly sure how go mod uses combinations of tags and version in go mod; what does it do if I have a git v2.0.0 tag, but v1 in my go.mod ?

Can be another PR?

Sure! Just thinking out loud

Is there any specific package that we (Moby & containerd community) want to import in that way?

I noticed that the containerd/cgroups package currently uses both a < v2 and v5 version of the godbus/dbus package containerd/cgroups#139 (comment)

(I suspect that's a bug/oversight though; if it is, I'll open a PR to fix that)

AkihiroSuda · 2020-01-09T11:29:54Z

what does it do if I have a git v2.0.0 tag, but v1 in my go.mod ?

Disallowed combo, perhaps?

(I suspect that's a bug/oversight though; if it is, I'll open a PR to fix that)

already fixed in containerd/cgroups#140 😄

thaJeztah · 2020-01-09T11:38:31Z

already fixed in containerd/cgroups#140 😄

haha, looks like I'm "too slow" today

thaJeztah

LGTM

not super-pretty, but I tried this, and it works

thaJeztah · 2020-01-09T12:23:56Z

ping @LK4D4 PTAL 🤗 (perhaps a new v0.1.0 version/tag for this would be good?)

LK4D4 · 2020-01-09T18:34:59Z

Could we please in next PR add such case to test/testdata/dumproject somewhere? not sure of vndr init supports it at all, though.
I will merge and release new version in the meantime.
Thanks!

With this change, go packages/modules that use versioned import paths (github.com/foo/bar/v2), but don't use a directory in the repository, can now be supported. For example: ``` github.com/coreos/go-systemd/v22 v22.0.0 ``` will vendor the github.com/coreos/go-systemd repository into `vendor/github.com/coreos/go-systemd/v22`. full diff: LK4D4/vndr@f5ab8fc...v0.1.0 - LK4D4/vndr#83 migrate bitbucket to api 2.0 - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone - LK4D4/vndr#86 Replace sort.Sort with sort.Strings - LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22` Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah · 2020-01-09T21:03:03Z

Thanks @LK4D4! Yes, I can try finding some time to make up a test case 👍

AkihiroSuda · 2020-01-10T03:38:34Z

sorry, vndr init doesn't seem to work, and not sure how we can support it without parsing go.mod.

#88

Follow-up to LK4D4#87 Signed-off-by: Akihiro Suda <[email protected]>

Follow-up to #87 Signed-off-by: Akihiro Suda <[email protected]>

With this change, go packages/modules that use versioned import paths (github.com/foo/bar/v2), but don't use a directory in the repository, can now be supported. For example: ``` github.com/coreos/go-systemd/v22 v22.0.0 ``` will vendor the github.com/coreos/go-systemd repository into `vendor/github.com/coreos/go-systemd/v22`. full diff: LK4D4/vndr@f5ab8fc...v0.1.0 - LK4D4/vndr#83 migrate bitbucket to api 2.0 - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone - LK4D4/vndr#86 Replace sort.Sort with sort.Strings - LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22` Signed-off-by: Sebastiaan van Stijn <[email protected]> Upstream-commit: d4f05c168d4497944a1427d830bdf9e69fb2f4c7 Component: engine

With this change, go packages/modules that use versioned import paths (github.com/foo/bar/v2), but don't use a directory in the repository, can now be supported. For example: ``` github.com/coreos/go-systemd/v22 v22.0.0 ``` will vendor the github.com/coreos/go-systemd repository into `vendor/github.com/coreos/go-systemd/v22`. full diff: LK4D4/vndr@f5ab8fc...v0.1.0 LK4D4/vndr@f5ab8fc...v0.1.0 - LK4D4/vndr#79 Add more clear messages around clone failures - LK4D4/vndr#80 add riscv64 support - LK4D4/vndr#83 migrate bitbucket to api 2.0 - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone - LK4D4/vndr#86 Replace sort.Sort with sort.Strings - LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22` Signed-off-by: Sebastiaan van Stijn <[email protected]>

With this change, go packages/modules that use versioned import paths (github.com/foo/bar/v2), but don't use a directory in the repository, can now be supported. For example: ``` github.com/coreos/go-systemd/v22 v22.0.0 ``` will vendor the github.com/coreos/go-systemd repository into `vendor/github.com/coreos/go-systemd/v22`. full diff: LK4D4/vndr@b177b58...v0.1.0 - LK4D4/vndr#79 Add more clear messages around clone failures - LK4D4/vndr#80 add riscv64 support - LK4D4/vndr#83 migrate bitbucket to api 2.0 - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone - LK4D4/vndr#86 Replace sort.Sort with sort.Strings - LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22` Signed-off-by: Sebastiaan van Stijn <[email protected]>

With this change, go packages/modules that use versioned import paths (github.com/foo/bar/v2), but don't use a directory in the repository, can now be supported. For example: ``` github.com/coreos/go-systemd/v22 v22.0.0 ``` will vendor the github.com/coreos/go-systemd repository into `vendor/github.com/coreos/go-systemd/v22`. full diff: LK4D4/vndr@b177b58...v0.1.0 - LK4D4/vndr#79 Add more clear messages around clone failures - LK4D4/vndr#80 add riscv64 support - LK4D4/vndr#83 migrate bitbucket to api 2.0 - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone - LK4D4/vndr#86 Replace sort.Sort with sort.Strings - LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22` Signed-off-by: Sebastiaan van Stijn <[email protected]> Upstream-commit: 7904c23df8cbb8cd8b4c8c3e197c61e91e81548b Component: cli

With this change, go packages/modules that use versioned import paths (github.com/foo/bar/v2), but don't use a directory in the repository, can now be supported. For example: ``` github.com/coreos/go-systemd/v22 v22.0.0 ``` will vendor the github.com/coreos/go-systemd repository into `vendor/github.com/coreos/go-systemd/v22`. full diff: LK4D4/vndr@f5ab8fc...v0.1.0 - LK4D4/vndr#83 migrate bitbucket to api 2.0 - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone - LK4D4/vndr#86 Replace sort.Sort with sort.Strings - LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22` Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit d4f05c1) Signed-off-by: Sebastiaan van Stijn <[email protected]>

With this change, go packages/modules that use versioned import paths (github.com/foo/bar/v2), but don't use a directory in the repository, can now be supported. For example: ``` github.com/coreos/go-systemd/v22 v22.0.0 ``` will vendor the github.com/coreos/go-systemd repository into `vendor/github.com/coreos/go-systemd/v22`. full diff: LK4D4/vndr@b177b58...v0.1.0 - LK4D4/vndr#79 Add more clear messages around clone failures - LK4D4/vndr#80 add riscv64 support - LK4D4/vndr#83 migrate bitbucket to api 2.0 - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone - LK4D4/vndr#86 Replace sort.Sort with sort.Strings - LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22` Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 7904c23) Signed-off-by: Sebastiaan van Stijn <[email protected]>

With this change, go packages/modules that use versioned import paths (github.com/foo/bar/v2), but don't use a directory in the repository, can now be supported. For example: ``` github.com/coreos/go-systemd/v22 v22.0.0 ``` will vendor the github.com/coreos/go-systemd repository into `vendor/github.com/coreos/go-systemd/v22`. full diff: LK4D4/vndr@b177b58...v0.1.0 - LK4D4/vndr#79 Add more clear messages around clone failures - LK4D4/vndr#80 add riscv64 support - LK4D4/vndr#83 migrate bitbucket to api 2.0 - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone - LK4D4/vndr#86 Replace sort.Sort with sort.Strings - LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22` Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 7904c23df8cbb8cd8b4c8c3e197c61e91e81548b) Signed-off-by: Sebastiaan van Stijn <[email protected]> Upstream-commit: 950dcedd97f04d2ae9431312fc1256eca6b0e325 Component: cli

With this change, go packages/modules that use versioned import paths (github.com/foo/bar/v2), but don't use a directory in the repository, can now be supported. For example: ``` github.com/coreos/go-systemd/v22 v22.0.0 ``` will vendor the github.com/coreos/go-systemd repository into `vendor/github.com/coreos/go-systemd/v22`. full diff: LK4D4/vndr@b177b58...v0.1.0 - LK4D4/vndr#79 Add more clear messages around clone failures - LK4D4/vndr#80 add riscv64 support - LK4D4/vndr#83 migrate bitbucket to api 2.0 - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone - LK4D4/vndr#86 Replace sort.Sort with sort.Strings - LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22` Signed-off-by: Sebastiaan van Stijn <[email protected]>

AkihiroSuda force-pushed the support-versioned branch from acda339 to 781e3d6 Compare January 9, 2020 10:56

AkihiroSuda mentioned this pull request Jan 9, 2020

The package cannot be vendored with vndr (regression in #137) containerd/cgroups#139

Closed

AkihiroSuda changed the title ~~support github.com/foo/bar/v42~~ support "github.com/coreos/go-systemd/v22" Jan 9, 2020

AkihiroSuda force-pushed the support-versioned branch from 781e3d6 to dfcd470 Compare January 9, 2020 11:01

AkihiroSuda changed the title ~~support "github.com/coreos/go-systemd/v22"~~ support github.com/coreos/go-systemd/v22 Jan 9, 2020

thaJeztah approved these changes Jan 9, 2020

View reviewed changes

LK4D4 merged commit d385c05 into LK4D4:master Jan 9, 2020

thaJeztah mentioned this pull request Jan 9, 2020

bump vndr v0.1.0 to support versioned import paths moby/moby#40359

Merged

AkihiroSuda added a commit to AkihiroSuda/vndr that referenced this pull request Jan 10, 2020

add TestVersioned

2f73135

Follow-up to LK4D4#87 Signed-off-by: Akihiro Suda <[email protected]>

AkihiroSuda added a commit to AkihiroSuda/vndr that referenced this pull request Jan 10, 2020

add TestVersioned

a583118

Follow-up to LK4D4#87 Signed-off-by: Akihiro Suda <[email protected]>

AkihiroSuda mentioned this pull request Jan 10, 2020

add TestVersioned #89

Merged

LK4D4 pushed a commit that referenced this pull request Jan 10, 2020

add TestVersioned

d4692b7

Follow-up to #87 Signed-off-by: Akihiro Suda <[email protected]>

thaJeztah mentioned this pull request Jan 20, 2020

Bump vndr v0.1.0, mjibson/esc v0.2.0, gotestsum v0.4.0 docker/cli#2275

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support `github.com/coreos/go-systemd/v22`#87

support `github.com/coreos/go-systemd/v22`#87
LK4D4 merged 1 commit intoLK4D4:masterfrom
AkihiroSuda:support-versioned

AkihiroSuda commented Jan 9, 2020 •

edited

Loading

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

AkihiroSuda commented Jan 9, 2020

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

AkihiroSuda commented Jan 9, 2020

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

thaJeztah left a comment

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

LK4D4 commented Jan 9, 2020

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

AkihiroSuda commented Jan 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

AkihiroSuda commented Jan 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

AkihiroSuda commented Jan 9, 2020

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

AkihiroSuda commented Jan 9, 2020

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

LK4D4 commented Jan 9, 2020

Uh oh!

thaJeztah commented Jan 9, 2020

Uh oh!

AkihiroSuda commented Jan 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

AkihiroSuda commented Jan 9, 2020 •

edited

Loading