exclude git-ops-update files by default

airfocusio · Nov 14, 2021 · a3b1f7d · a3b1f7d
1 parent 323b4e2
commit a3b1f7d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ files:
     - '\.yaml$'
   excludes:
     - '\.generated\.yaml$'
+    - '\/system\/.*\.yaml$'
 ```
 
 ### Define registries

diff --git a/example/.git-ops-update.yaml b/example/.git-ops-update.yaml
@@ -2,7 +2,8 @@ files:
   includes:
     - '\.yaml$'
   excludes:
-    - '\.git-ops-update(\.cache)?\.yaml$'
+    - '\.generated\.yaml$'
+    - '\/system\/.*\.yaml$'
 registries:
   my-docker-registry:
     interval: 1h

diff --git a/internal/util.go b/internal/util.go
@@ -8,6 +8,7 @@ import (
 )
 
 func fileList(dir string, includes []regexp.Regexp, excludes []regexp.Regexp) (*[]string, error) {
+	defaultExclude := regexp.MustCompile(`\/\.git-ops-update(\.cache)?\.yaml$`)
 	files := []string{}
 	err := filepath.Walk(dir, func(path string, f os.FileInfo, err error) error {
 		if err != nil {
@@ -17,12 +18,16 @@ func fileList(dir string, includes []regexp.Regexp, excludes []regexp.Regexp) (*
 		if err != nil {
 			return err
 		}
+		pathRel = "/" + pathRel
 
 		for _, i := range includes {
 			if i.Match([]byte(pathRel)) {
 				excluded := false
+				if defaultExclude.MatchString(pathRel) {
+					excluded = true
+				}
 				for _, e := range excludes {
-					if e.Match([]byte(pathRel)) {
+					if e.MatchString(pathRel) {
 						excluded = true
 					}
 				}