Tests for filters

Author: cardil

go.mod

@@ -8,10 +8,12 @@ require (
 	github.com/fatih/color v1.18.0
 	github.com/go-git/go-billy/v5 v5.6.2
 	github.com/go-git/go-git/v5 v5.13.2
+	github.com/gobwas/glob v0.2.3
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/openshift-knative/hack v0.0.0-20250530124021-bed35e443a23
 	github.com/spf13/cobra v1.9.1
+	github.com/stretchr/testify v1.10.0
 	github.com/wavesoftware/go-commandline v1.3.0
 	github.com/xanzy/ssh-agent v0.3.3
 	gotest.tools/v3 v3.5.2
@@ -236,7 +238,6 @@ require (
 	github.com/spf13/viper v1.18.2 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tektoncd/pipeline v0.61.0 // indirect
 	github.com/theupdateframework/go-tuf v0.7.0 // indirect

go.sum

@@ -390,6 +390,8 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
 github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=

pkg/files/filters.go

@@ -1,27 +1,47 @@
 package files
 
-import "path"
+import "github.com/gobwas/glob"
 
 // Filters represents what files to include, and which to exclude from copying operations.
 type Filters struct {
 	Include []string `json:"include"`
 	Exclude []string `json:"exclude"`
 }
 
-func (f Filters) Matches(pth string) bool {
+func (f Filters) Matcher() Matcher {
+	m := Matcher{
+		Include: make([]glob.Glob, 0, len(f.Include)),
+		Exclude: make([]glob.Glob, 0, len(f.Exclude)),
+	}
+	separators := []rune{'/'}
+	for _, p := range f.Include {
+		g := glob.MustCompile(p, separators...)
+		m.Include = append(m.Include, g)
+	}
+	for _, p := range f.Exclude {
+		g := glob.MustCompile(p, separators...)
+		m.Exclude = append(m.Exclude, g)
+	}
+	return m
+}
+
+type Matcher struct {
+	Include []glob.Glob
+	Exclude []glob.Glob
+}
+
+func (m Matcher) Matches(pth string) bool {
 	result := false
-	for _, pattern := range f.Include {
-		matched, _ := path.Match(pattern, pth)
-		if matched {
+	for _, pattern := range m.Include {
+		if pattern.Match(pth) {
 			result = true
 		}
 	}
 	if !result {
 		return false
 	}
-	for _, pattern := range f.Exclude {
-		matched, _ := path.Match(pattern, pth)
-		if matched {
+	for _, pattern := range m.Exclude {
+		if pattern.Match(pth) {
 			return false
 		}
 	}

pkg/files/filters_test.go

@@ -0,0 +1,65 @@
+package files_test
+
+import (
+	"testing"
+
+	"github.com/openshift-knative/deviate/pkg/files"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFilters_Match(t *testing.T) {
+	filelist := []string{
+		"a/b/c.txt",
+		"a/d.txt",
+		"a/b/d.md",
+		"a/b/d.txt",
+		"a.txt",
+		"b.md",
+	}
+	tcs := []testFiltersMatchCases{{
+		name: "all md files",
+		Filters: files.Filters{
+			Include: []string{"**/*.md", "*.md"},
+		},
+		want: []string{
+			"a/b/d.md",
+			"b.md",
+		},
+	}, {
+		name: "root level md files",
+		Filters: files.Filters{
+			Include: []string{"*.md"},
+		},
+		want: []string{
+			"b.md",
+		},
+	}, {
+		"just one txt",
+		files.Filters{
+			Include: []string{"**.txt"},
+			Exclude: []string{"a/b**", "a.txt"},
+		},
+		[]string{
+			"a/d.txt",
+		},
+	}}
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			matcher := tc.Matcher()
+			got := make([]string, 0, len(tc.want))
+			for _, f := range filelist {
+				if matcher.Matches(f) {
+					got = append(got, f)
+				}
+			}
+
+			assert.Equal(t, tc.want, got)
+		})
+	}
+}
+
+type testFiltersMatchCases struct {
+	name string
+	files.Filters
+	want []string
+}

pkg/git/checkout.go

@@ -99,21 +99,22 @@ func (o onGoingCheckout) OntoWorkspace(filters files.Filters) error {
 	if err != nil {
 		return errors.Wrap(err, ErrLocalOperationFailed)
 	}
-	return o.applyTree(wt, "/", filters)
+	matcher := filters.Matcher()
+	return o.applyTree(wt, "/", matcher)
 }
 
-func (o onGoingCheckout) applyTree(fs billy.Filesystem, dir string, filters files.Filters) error {
+func (o onGoingCheckout) applyTree(fs billy.Filesystem, dir string, matcher files.Matcher) error {
 	infos, err := fs.ReadDir(dir)
 	if err != nil {
 		return errors.Wrap(err, ErrLocalOperationFailed)
 	}
 	for _, f := range infos {
 		fp := path.Join(dir, f.Name())
-		if !filters.Matches(fp) {
+		if !matcher.Matches(fp) {
 			continue
 		}
 		if f.IsDir() {
-			err = o.applyTree(fs, fp, filters)
+			err = o.applyTree(fs, fp, matcher)
 			if err != nil {
 				return err
 			}

pkg/sync/remove_unwanted_upstream_files.go

@@ -11,12 +11,13 @@ import (
 
 func (o Operation) removeUnwantedUpstreamFiles() error {
 	o.Println("- Remove unwanted upstream files")
+	matcher := o.Config.DeleteFromUpstream.Matcher()
 
 	return errors.Wrap(filepath.WalkDir(o.State.Project.Path, func(pth string, _ fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
-		if o.Config.DeleteFromUpstream.Matches(pth) {
+		if matcher.Matches(pth) {
 			fp := path.Join(o.State.Project.Path, pth)
 			return os.RemoveAll(fp)
 		}