From 8b51c295a1e87fedf43c712adaf81678eaa15409 Mon Sep 17 00:00:00 2001 From: Katrina Verey Date: Thu, 2 Feb 2023 11:33:46 -0500 Subject: [PATCH] Allow gorepomod to update plugin mod files --- cmd/gorepomod/internal/arguments/args.go | 1 - cmd/gorepomod/internal/repo/dotgitdata.go | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/gorepomod/internal/arguments/args.go b/cmd/gorepomod/internal/arguments/args.go index 43548c6ee..2051bb855 100644 --- a/cmd/gorepomod/internal/arguments/args.go +++ b/cmd/gorepomod/internal/arguments/args.go @@ -36,7 +36,6 @@ var ( "docs", "examples", "hack", - "plugin", "releasing", "site", } diff --git a/cmd/gorepomod/internal/repo/dotgitdata.go b/cmd/gorepomod/internal/repo/dotgitdata.go index 2127ae2d8..157753964 100644 --- a/cmd/gorepomod/internal/repo/dotgitdata.go +++ b/cmd/gorepomod/internal/repo/dotgitdata.go @@ -45,8 +45,9 @@ func (dg *DotGitData) AbsPath() string { // NewDotGitDataFromPath wants the incoming path to hold dotGit // E.g. -// ~/gopath/src/sigs.k8s.io/kustomize -// ~/gopath/src/github.com/monopole/gorepomod +// +// ~/gopath/src/sigs.k8s.io/kustomize +// ~/gopath/src/github.com/monopole/gorepomod func NewDotGitDataFromPath(path string) (*DotGitData, error) { if !utils.DirExists(filepath.Join(path, dotGitFileName)) { return nil, fmt.Errorf( @@ -126,7 +127,7 @@ func (dg *DotGitData) checkModules(modules []*protoModule) error { } } else { // Do the relative path and short name make sense? - if !strings.HasSuffix(pm.PathToGoMod(), string(shortName)) { + if !strings.HasPrefix(string(shortName), "plugin/") && !strings.HasSuffix(pm.PathToGoMod(), string(shortName)) { return fmt.Errorf( "in %q, the module name %q doesn't match the file's pathToGoMod %q", file, shortName, pm.PathToGoMod())