cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-06 08:03:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd/go/internal/modload: do not resolve an arbitrary version for 'go list --versions'

Browse Source 
If we don't actually require the listed module, we previously
implicitly resolved "latest", but also (erroneously) forgot to apply
exclusions and retractions for it. But there is really no need to
resolve "latest" in this case at all — now we omit the version from
the reported module info entirely.

Fixes #44296

Change-Id: Id595f52f597c7213bd65b73bf066a678d9e1d694
Reviewed-on: https://go-review.googlesource.com/c/go/+/297150
Trust: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
This commit is contained in:
Bryan C. Mills 2021-02-26 17:40:18 -05:00
parent b65091c11d
commit 2a2f99eefb
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/go/internal/modload/build.go
View File

@ -113,7 +113,11 @@ func addVersions(ctx context.Context, m *modinfo.ModulePublic, listRetracted boo
if listRetracted { if listRetracted {
allowed = CheckExclusions allowed = CheckExclusions
} }
m.Versions, _ = versions(ctx, m.Path, allowed) var err error
m.Versions, err = versions(ctx, m.Path, allowed)
if err != nil && m.Error == nil {
m.Error = &modinfo.ModuleError{Err: err.Error()}
}
} }
// addRetraction fills in m.Retracted if the module was retracted by its author. // addRetraction fills in m.Retracted if the module was retracted by its author.

14
src/cmd/go/internal/modload/list.go
View File

@ -136,17 +136,9 @@ func listModules(ctx context.Context, args []string, listVersions, listRetracted
if listVersions { if listVersions {
// Don't make the user provide an explicit '@latest' when they're // Don't make the user provide an explicit '@latest' when they're
// explicitly asking what the available versions are. // explicitly asking what the available versions are.
// Instead, resolve the module, even if it isn't an existing dependency. // Instead, return a modinfo without a version,
info, err := Query(ctx, arg, "latest", "", nil) // to which we can attach the requested version list.
if err == nil { mods = append(mods, &modinfo.ModulePublic{Path: arg})
mod := moduleInfo(ctx, module.Version{Path: arg, Version: info.Version}, false, listRetracted)
mods = append(mods, mod)
} else {
mods = append(mods, &modinfo.ModulePublic{
Path: arg,
Error: modinfoError(arg, "", err),
})
}
continue continue
} }
if cfg.BuildMod == "vendor" { if cfg.BuildMod == "vendor" {

1
src/cmd/go/testdata/script/mod_proxy_https.txt vendored
View File

@ -10,6 +10,7 @@ stderr 'invalid proxy URL.*proxydir'
# GOPROXY HTTPS paths may elide the "https://" prefix. # GOPROXY HTTPS paths may elide the "https://" prefix.
# (See golang.org/issue/32191.) # (See golang.org/issue/32191.)
env GOPROXY=proxy.golang.org env GOPROXY=proxy.golang.org
env GOSUMDB=
go list -versions -m golang.org/x/text go list -versions -m golang.org/x/text
-- go.mod -- -- go.mod --

3
src/cmd/go/testdata/script/mod_retract_versions.txt vendored
View File

@ -10,9 +10,8 @@ go list -m -e -f $FMT example.com/retract/self/pseudo@latest
stdout '^example.com/retract/self/pseudo: "module example.com/retract/self/pseudo: no matching versions for query \\"latest\\"" "latest"$' stdout '^example.com/retract/self/pseudo: "module example.com/retract/self/pseudo: no matching versions for query \\"latest\\"" "latest"$'
# BUG(#44296): Adding --versions should not cause a retracted version to be reported.
go list -m -e -f $FMT --versions example.com/retract/self/pseudo go list -m -e -f $FMT --versions example.com/retract/self/pseudo
stdout '^example.com/retract/self/pseudo "v1.9.0"$' stdout '^example.com/retract/self/pseudo ""$'
go list -m -e -f $FMT --versions example.com/retract/self/pseudo@latest go list -m -e -f $FMT --versions example.com/retract/self/pseudo@latest
stdout '^example.com/retract/self/pseudo: "module example.com/retract/self/pseudo: no matching versions for query \\"latest\\"" "latest"$' stdout '^example.com/retract/self/pseudo: "module example.com/retract/self/pseudo: no matching versions for query \\"latest\\"" "latest"$'