Import ignores with wildcards

Author: carolynvs

cmd/dep/testdata/harness_tests/init/govendor/case1/final/Gopkg.lock

@@ -1,8 +1,4 @@
-ignored = ["github.com/sdboyer/dep-test"]
-
-[[constraint]]
-  name = "github.com/carolynvs/go-dep-test"
-  version = "0.2.0"
+ignored = ["github.com/golang/notexist/samples*","github.com/sdboyer/dep-test*"]
 
 [[constraint]]
   name = "github.com/sdboyer/deptestdos"

cmd/dep/testdata/harness_tests/init/govendor/case1/final/Gopkg.toml

@@ -8,7 +8,6 @@
     "github.com/sdboyer/deptestdos": "5c607206be5decd28e6263ffffdcee067266015e"
   },
   "vendor-final": [
-    "github.com/carolynvs/go-dep-test",
     "github.com/sdboyer/deptest",
     "github.com/sdboyer/deptestdos"
   ]

cmd/dep/testdata/harness_tests/init/govendor/case1/testcase.json

@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 
@@ -80,11 +81,11 @@ func (g *Importer) load(projectDir string) error {
 	}
 	vb, err := ioutil.ReadFile(v)
 	if err != nil {
-		return errors.Wrapf(err, "Unable to read %s", v)
+		return errors.Wrapf(err, "unable to read %s", v)
 	}
 	err = json.Unmarshal(vb, &g.file)
 	if err != nil {
-		return errors.Wrapf(err, "Unable to parse %s", v)
+		return errors.Wrapf(err, "unable to parse %s", v)
 	}
 	return nil
 }
@@ -96,13 +97,13 @@ func (g *Importer) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error)
 	for _, pkg := range g.file.Package {
 		// Path must not be empty
 		if pkg.Path == "" {
-			err := errors.New("Invalid govendor configuration, Path is required")
+			err := errors.New("invalid govendor configuration, Path is required")
 			return nil, nil, err
 		}
 
 		// Revision must not be empty
 		if pkg.Revision == "" {
-			err := errors.New("Invalid govendor configuration, Revision is required")
+			err := errors.New("invalid govendor configuration, Revision is required")
 			return nil, nil, err
 		}
 
@@ -131,12 +132,20 @@ func (g *Importer) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error)
 				g.Logger.Printf("  Govendor was configured to ignore the %s build tag, but that isn't supported by dep yet, and will be ignored. See https://github.com/golang/dep/issues/291.", i)
 				continue
 			}
+
+			var ignorePattern string
 			_, err := g.SourceManager.DeduceProjectRoot(i)
-			if err == nil {
-				g.Manifest.Ignored = append(g.Manifest.Ignored, i)
-			} else {
-				g.Logger.Printf("  Govendor was configured to ignore the %s package prefix, but that isn't supported by dep yet, and will be ignored.", i)
+			if err == nil { // external package
+				ignorePattern = i
+			} else { // relative package path in the current project
+				ignorePattern = path.Join(string(pr), i)
 			}
+
+			// Convert to a a wildcard ignore
+			ignorePattern = strings.TrimRight(ignorePattern, "/")
+			ignorePattern += "*"
+
+			g.Manifest.Ignored = append(g.Manifest.Ignored, ignorePattern)
 		}
 	}
 

internal/importers/govendor/importer.go

@@ -66,7 +66,7 @@ func TestGovendorConfig_Import(t *testing.T) {
 	}
 }
 
-func TestGovendorConfig_Convert_Project(t *testing.T) {
+func TestGovendorConfig_Convert(t *testing.T) {
 	testCases := map[string]struct {
 		file govendorFile
 		importertest.TestCase
@@ -88,12 +88,28 @@ func TestGovendorConfig_Convert_Project(t *testing.T) {
 				WantVersion:    importertest.V1Tag,
 			},
 		},
-		"ignored package": {
+		"skipped build tags": {
 			govendorFile{
-				Ignore: "test github.com/sdboyer/deptest linux_amd64 github.com/sdboyer",
+				Ignore: "test linux_amd64",
 			},
 			importertest.TestCase{
-				WantIgnored: []string{"github.com/sdboyer/deptest"},
+				WantIgnored: nil,
+			},
+		},
+		"ignored external package": {
+			govendorFile{
+				Ignore: "github.com/sdboyer/deptest k8s.io/apimachinery",
+			},
+			importertest.TestCase{
+				WantIgnored: []string{"github.com/sdboyer/deptest*", "k8s.io/apimachinery*"},
+			},
+		},
+		"ignored internal package": {
+			govendorFile{
+				Ignore: "samples/ foo/bar",
+			},
+			importertest.TestCase{
+				WantIgnored: []string{importertest.RootProject + "/samples*", importertest.RootProject + "/foo/bar*"},
 			},
 		},
 		"missing package path": {

internal/importers/govendor/importer_test.go

@@ -79,7 +79,7 @@ func (tc TestCase) validate(manifest *dep.Manifest, lock *dep.Lock, convertErr e
 	}
 
 	if !equalSlice(manifest.Ignored, tc.WantIgnored) {
-		return errors.Errorf("unexpected set of ignored projects: \n\t(GOT) %v \n\t(WNT) %v",
+		return errors.Errorf("unexpected set of ignored projects: \n\t(GOT) %#v \n\t(WNT) %#v",
 			manifest.Ignored, tc.WantIgnored)
 	}