Skip to content

Commit

Permalink
cmd/go: mod vendor: emit error if any replacement in vendor directory
Browse files Browse the repository at this point in the history
Fixes #29169

Change-Id: I3a0fd506c45ad999a2fc6f75f9b3e8a5118ad91b
Reviewed-on: https://go-review.googlesource.com/c/go/+/156400
Auto-Submit: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
  • Loading branch information
rleungx authored and gopherbot committed Nov 9, 2022
1 parent f5d21ff commit d02fceb
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/cmd/go/internal/modcmd/vendor.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ func moduleLine(m, r module.Version) string {
b.WriteString(m.Version)
}
if r.Path != "" {
if strings.HasPrefix(r.Path, "./vendor") || strings.HasPrefix(r.Path, ".\vendor") {
base.Fatalf("go: replacement path %s inside vendor directory", r.Path)
}
b.WriteString(" => ")
b.WriteString(r.Path)
if r.Version != "" {
Expand Down
20 changes: 20 additions & 0 deletions src/cmd/go/testdata/script/mod_vendor_replace.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
env GO111MODULE=on

# Replacement should not use a vendor directory as the target.
! go mod vendor
stderr 'replacement path ./vendor/not-rsc.io/quote/v3 inside vendor directory'

cp go.mod1 go.mod
rm -r vendor

# Before vendoring, we expect to see the original directory.
go list -f '{{with .Module}}{{.Version}}{{end}} {{.Dir}}' rsc.io/quote/v3
stdout 'v3.0.0'
Expand Down Expand Up @@ -34,8 +41,15 @@ stderr 'rsc.io/quote/v3@v3.0.0 used for two different module paths \(not-rsc.io/
-- go.mod --
module example.com/replace

require rsc.io/quote/v3 v3.0.0
replace rsc.io/quote/v3 => ./vendor/not-rsc.io/quote/v3

-- go.mod1 --
module example.com/replace

require rsc.io/quote/v3 v3.0.0
replace rsc.io/quote/v3 => ./local/not-rsc.io/quote/v3

-- imports.go --
package replace

Expand Down Expand Up @@ -67,3 +81,9 @@ replace not-rsc.io/quote/v3 => rsc.io/quote/v3 v3.0.0
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
rsc.io/quote/v3 v3.0.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

-- vendor/not-rsc.io/quote/v3/go.mod --
module not-rsc.io/quote/v3

-- vendor/not-rsc.io/quote/v3/quote.go --
package quote

0 comments on commit d02fceb

Please sign in to comment.