Skip to content

zip: allow packages containing non-top-level /vendor/ part #24

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −2
Open

zip: allow packages containing non-top-level /vendor/ part #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions zip/vendor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ var pre124 []string = []string{

var after124 []string = []string{"go1.24.0", "go1.24", "go1.99.0"}

var (
pre125 = append(pre124, "go1.24.0")
after125 = []string{"go1.25.0"}
)

var allVers []string = append(pre124, after124...)

func TestIsVendoredPackage(t *testing.T) {
Expand All @@ -29,8 +34,6 @@ func TestIsVendoredPackage(t *testing.T) {
versions []string
}{
{path: "vendor/foo/foo.go", want: true, versions: allVers},
{path: "pkg/vendor/foo/foo.go", want: true, versions: allVers},
{path: "longpackagename/vendor/foo/foo.go", want: true, versions: allVers},
{path: "vendor/vendor.go", want: false, versions: allVers},
{path: "vendor/foo/modules.txt", want: true, versions: allVers},
{path: "modules.txt", want: false, versions: allVers},
Expand All @@ -45,6 +48,11 @@ func TestIsVendoredPackage(t *testing.T) {
{path: "pkg/vendor/vendor.go", want: false, versions: after124},
{path: "longpackagename/vendor/vendor.go", want: true, versions: pre124},
{path: "longpackagename/vendor/vendor.go", want: false, versions: after124},
// allow vendor package names in non-root of the module
{path: "pkg/vendor/foo/foo.go", want: true, versions: pre125},
{path: "longpackagename/vendor/foo/foo.go", want: true, versions: pre125},
{path: "pkg/vendor/foo/foo.go", want: false, versions: after125},
{path: "longpackagename/vendor/foo/foo.go", want: false, versions: after125},
} {
for _, v := range tc.versions {
got := isVendoredPackage(tc.path, v)
Expand Down
8 changes: 8 additions & 0 deletions zip/zip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import (
"os/exec"
"path"
"path/filepath"
"regexp"
"strings"
"time"
"unicode"
Expand Down Expand Up @@ -797,6 +798,13 @@ func isVendoredPackage(name string, vers string) bool {
if version.Compare(vers, "go1.24") >= 0 && name == "vendor/modules.txt" {
return true
}

if version.Compare(vers, "go1.25") >= 0 {
// ref: https://golang.org/issues/71785
// allows non-top-level vendor packages.
return regexp.MustCompile("^vendor/.*/").MatchString(name)
}

var i int
if strings.HasPrefix(name, "vendor/") {
i += len("vendor/")
Expand Down