Merge pull request #117 from debricked/fix-exclusion-issues

Fix exclusion issues, matching too many files in debricked-scan
debricked · Sep 15, 2023 · 8aba7c1 · 8aba7c1
2 parents 3aaa3e3 + c062bed
commit 8aba7c1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/debricked.yml b/.github/workflows/debricked.yml
@@ -24,4 +24,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
       - run: |
-          go run cmd/debricked/main.go scan -t ${{ secrets.DEBRICKED_TOKEN }} -e "pkg/**" -e "test/**"
+          go run cmd/debricked/main.go scan -t ${{ secrets.DEBRICKED_TOKEN }} -e "pkg/**" -e "test/**" -e "**/testdata/**"
diff --git a/internal/file/finder_test.go b/internal/file/finder_test.go
@@ -215,6 +215,11 @@ func TestExclude(t *testing.T) {
 			exclusions:         []string{"**/yarn/**"},
 			expectedExclusions: []string{"yarn", "yarn.lock"},
 		},
+		{
+			name:               "TestDirectoryExclusionWithDoublestar",
+			exclusions:         []string{"testdata/test/**"},
+			expectedExclusions: []string{"test", "test-file"},
+		},
 	}
 
 	for _, c := range cases {

diff --git a/internal/file/testdata/misc/package.json b/internal/file/testdata/misc/package.json
@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "chart.js": "^2.9.3"
-  }
-}

diff --git a/internal/file/testdata/test/test-file b/internal/file/testdata/test/test-file