it's alive! :rocket

Author: rentziass

patrol/repo.go

@@ -3,6 +3,7 @@ package patrol
 import (
 	"go/parser"
 	"go/token"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -120,6 +121,11 @@ func (r *Repo) ChangesFrom(revision string) ([]string, error) {
 		return nil, err
 	}
 
+	err = r.detectGoModulesChanges(revision)
+	if err != nil {
+		return nil, err
+	}
+
 	var changedOwnedPackages []string
 	for _, pkg := range r.Packages {
 		if pkg.PartOfModule && pkg.Changed {
@@ -173,13 +179,64 @@ func (r *Repo) detectInternalChangesFrom(revision string) error {
 			continue
 		}
 
-		pkgName := r.ModuleName() + "/" + filepath.Dir(change.From.Name)
+		var pkgName string
+		if strings.HasPrefix(change.From.Name, "vendor/") {
+			pkgName = strings.TrimPrefix(filepath.Dir(change.From.Name), "vendor/")
+		}
+
+		if pkgName == "" {
+			pkgName = r.ModuleName() + "/" + filepath.Dir(change.From.Name)
+		}
+
 		r.flagPackageAsChanged(pkgName)
 	}
 
 	return nil
 }
 
+func (r *Repo) detectGoModulesChanges(revision string) error {
+	// get old go.mod
+	// find differences with current one
+	repo, err := git.PlainOpen(r.path)
+	if err != nil {
+		return err
+	}
+
+	ref := plumbing.NewHash(revision)
+	then, err := repo.CommitObject(ref)
+	if err != nil {
+		return err
+	}
+
+	file, err := then.File("go.mod")
+	if err != nil {
+		return err
+	}
+
+	reader, err := file.Reader()
+	if err != nil {
+		return err
+	}
+	defer reader.Close()
+
+	b, err := ioutil.ReadAll(reader)
+	if err != nil {
+		return err
+	}
+
+	mod, err := modfile.Parse(filepath.Join(r.path, "go.mod"), b, nil)
+	if err != nil {
+		return err
+	}
+
+	differentModules := goModDifferences(mod, r.Module)
+	for _, module := range differentModules {
+		r.flagPackageAsChanged(module)
+	}
+
+	return nil
+}
+
 func (r *Repo) flagPackageAsChanged(name string) {
 	pkg, exists := r.Packages[name]
 	if !exists {
@@ -192,10 +249,10 @@ func (r *Repo) flagPackageAsChanged(name string) {
 		return
 	}
 
-	pkg.Changed = true
 	for _, d := range pkg.Dependants {
-		d.Changed = true
+		r.flagPackageAsChanged(d.Name)
 	}
+	pkg.Changed = true
 }
 
 func (r *Repo) ModuleName() string {
@@ -216,3 +273,52 @@ type Package struct {
 func directoryShouldBeIgnored(path string) bool {
 	return strings.Contains(path, ".git")
 }
+
+// goModDifferences returns the list of packages name that were added, removed
+// and/or updated between the two go.mod files
+func goModDifferences(a, b *modfile.File) []string {
+	differences := map[string]interface{}{} // keeping a map of unique differences
+	// map is [package name]: version
+	oldRequires := map[string]string{}
+	for _, r := range a.Require {
+		oldRequires[r.Mod.Path] = r.Mod.Version
+	}
+
+	newRequires := map[string]string{}
+	for _, r := range b.Require {
+		newRequires[r.Mod.Path] = r.Mod.Version
+	}
+
+	for oldPkg, oldVersion := range oldRequires {
+		newVersion, exists := newRequires[oldPkg]
+		if !exists {
+			differences[oldPkg] = struct{}{}
+			continue
+		}
+
+		if oldVersion != newVersion {
+			differences[oldPkg] = struct{}{}
+			continue
+		}
+	}
+
+	for newPkg, newVersion := range newRequires {
+		oldVersion, exists := oldRequires[newPkg]
+		if !exists {
+			differences[newPkg] = struct{}{}
+			continue
+		}
+
+		if oldVersion != newVersion {
+			differences[newPkg] = struct{}{}
+			continue
+		}
+	}
+
+	var results []string
+	for pkg := range differences {
+		results = append(results, pkg)
+	}
+
+	return results
+}

patrol/repo_test.go

@@ -13,6 +13,7 @@ func TestRepo(t *testing.T) {
 			ExpectedChangedPackages: []string{
 				"github.com/utilitywarehouse/internalchange/internal/bar",
 				"github.com/utilitywarehouse/internalchange/pkg/foo",
+				"github.com/utilitywarehouse/internalchange/pkg/cat",
 			},
 		},
 		RepoTest{
@@ -25,6 +26,16 @@ func TestRepo(t *testing.T) {
 				"github.com/utilitywarehouse/modules",
 			},
 		},
+		RepoTest{
+			TestdataFolder: "vendoring",
+			Name:           "change in vendored dependencies",
+			Description: "A change to a vendored dependency\n" +
+				"should flag depending packages as changed",
+			TestAgainstRevision: "HEAD~1",
+			ExpectedChangedPackages: []string{
+				"github.com/utilitywarehouse/vendoring",
+			},
+		},
 	}
 
 	tests.Run(t)

patrol/testdata/internalchange/commits/1/pkg/cat/cat.go

@@ -0,0 +1,7 @@
+package cat
+
+import "github.com/utilitywarehouse/internalchange/pkg/foo"
+
+type Cat struct {
+	foo foo.Foo
+}

patrol/testdata/internalchange/commits/2/pkg/cat/cat.go

@@ -0,0 +1,7 @@
+package cat
+
+import "github.com/utilitywarehouse/internalchange/pkg/foo"
+
+type Cat struct {
+	foo foo.Foo
+}

patrol/testdata/internalchange/commits/3/pkg/cat/cat.go

@@ -0,0 +1,7 @@
+package cat
+
+import "github.com/utilitywarehouse/internalchange/pkg/foo"
+
+type Cat struct {
+	foo foo.Foo
+}

patrol/testdata/vendoring/commits/1/go.mod

@@ -0,0 +1,7 @@
+module github.com/utilitywarehouse/vendoring
+
+go 1.17
+
+require golang.org/x/mod v0.5.1
+
+require golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect

patrol/testdata/vendoring/commits/1/go.sum

@@ -0,0 +1,4 @@
+golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
+golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

patrol/testdata/vendoring/commits/1/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "golang.org/x/mod/modfile"
+
+func main() {
+	modfile.Comment
+}