diff options
| author | Bryan C. Mills <bcmills@google.com> | 2019-12-06 15:51:34 -0500 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2019-12-06 23:45:07 +0000 |
| commit | ea89ce1ea2924138591cbf7362eb23d4e1399ded (patch) | |
| tree | 7c640ae1e7772593fad80615cfe6ebce75034041 /src/cmd/go/internal/modcmd/edit.go | |
| parent | 94ddb2d6217e3d031cfacb8eed68786df9227bf1 (diff) | |
| download | go-ea89ce1ea2924138591cbf7362eb23d4e1399ded.tar.gz go-ea89ce1ea2924138591cbf7362eb23d4e1399ded.zip | |
cmd/go/internal/modcmd: loosen path validation in "go mod edit"
Replaced modules require only valid import paths, not full
module paths that can be fetched with 'go get'.
The 'go' command does not in general reject manually-edited go.mod
files with these paths, so 'go mod edit' should not reject them
either.
Fixes #30513
Change-Id: I4f1a5c65937f91d41478f8d218c8018e0c70f320
Reviewed-on: https://go-review.googlesource.com/c/go/+/210343
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Diffstat (limited to 'src/cmd/go/internal/modcmd/edit.go')
| -rw-r--r-- | src/cmd/go/internal/modcmd/edit.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/go/internal/modcmd/edit.go b/src/cmd/go/internal/modcmd/edit.go index ae8966bab1..2cb4566796 100644 --- a/src/cmd/go/internal/modcmd/edit.go +++ b/src/cmd/go/internal/modcmd/edit.go @@ -164,7 +164,7 @@ func runEdit(cmd *base.Command, args []string) { } if *editModule != "" { - if err := module.CheckPath(*editModule); err != nil { + if err := module.CheckImportPath(*editModule); err != nil { base.Fatalf("go mod: invalid -module: %v", err) } } @@ -242,7 +242,7 @@ func parsePathVersion(flag, arg string) (path, version string) { base.Fatalf("go mod: -%s=%s: need path@version", flag, arg) } path, version = strings.TrimSpace(arg[:i]), strings.TrimSpace(arg[i+1:]) - if err := module.CheckPath(path); err != nil { + if err := module.CheckImportPath(path); err != nil { base.Fatalf("go mod: -%s=%s: invalid path: %v", flag, arg, err) } @@ -264,7 +264,7 @@ func parsePath(flag, arg string) (path string) { base.Fatalf("go mod: -%s=%s: need just path, not path@version", flag, arg) } path = arg - if err := module.CheckPath(path); err != nil { + if err := module.CheckImportPath(path); err != nil { base.Fatalf("go mod: -%s=%s: invalid path: %v", flag, arg, err) } return path @@ -278,7 +278,7 @@ func parsePathVersionOptional(adj, arg string, allowDirPath bool) (path, version } else { path, version = strings.TrimSpace(arg[:i]), strings.TrimSpace(arg[i+1:]) } - if err := module.CheckPath(path); err != nil { + if err := module.CheckImportPath(path); err != nil { if !allowDirPath || !modfile.IsDirectoryPath(path) { return path, version, fmt.Errorf("invalid %s path: %v", adj, err) } |