Make behaviour consistent

Author: Leon Sodhi

server/events/project_finder.go

@@ -82,20 +82,20 @@ func (p *DefaultProjectFinder) DetermineProjectsViaConfig(log *logging.SimpleLog
 	var projects []valid.Project
 	for _, project := range config.Projects {
 		log.Debug("checking if project at dir %q workspace %q was modified", project.Dir, project.Workspace)
-		// Prepend project dir to when modified patterns because the patterns
-		// are relative to the project dirs but our list of modified files is
-		// relative to the repo root.
 		var whenModifiedRelToRepoRoot []string
 		for _, wm := range project.Autoplan.WhenModified {
-			exclusion := false
 			wm = strings.TrimSpace(wm)
-			if wm == "" {
-				continue
-			}
-			if wm[0] == '!' {
+			// An exclusion uses a '!' at the beginning. If it's there, we need
+			// to remove it, then add in the project path, then add it back.
+			exclusion := false
+			if wm != "" && wm[0] == '!' {
 				wm = wm[1:]
 				exclusion = true
 			}
+
+			// Prepend project dir to when modified patterns because the patterns
+			// are relative to the project dirs but our list of modified files is
+			// relative to the repo root.
 			wmRelPath := filepath.Join(project.Dir, wm)
 			if exclusion {
 				wmRelPath = "!" + wmRelPath

server/events/project_finder_test.go

@@ -397,7 +397,7 @@ func TestDefaultProjectFinder_DetermineProjectsViaConfig(t *testing.T) {
 			expProjPaths: []string{"project2"},
 		},
 		{
-			description: "all files excluded",
+			description: "file excluded",
 			config: valid.RepoCfg{
 				Projects: []valid.Project{
 					{
@@ -428,6 +428,22 @@ func TestDefaultProjectFinder_DetermineProjectsViaConfig(t *testing.T) {
 			modified:     []string{"project1/exclude-me.tf", "project1/include-me.tf"},
 			expProjPaths: []string{"project1"},
 		},
+		{
+			description: "multiple dirs excluded",
+			config: valid.RepoCfg{
+				Projects: []valid.Project{
+					{
+						Dir: "project1",
+						Autoplan: valid.Autoplan{
+							Enabled:      true,
+							WhenModified: []string{"**/*.tf", "!subdir1/*", "!subdir2/*"},
+						},
+					},
+				},
+			},
+			modified:     []string{"project1/subdir1/main.tf", "project1/subdir2/main.tf"},
+			expProjPaths: nil,
+		},
 	}
 
 	for _, c := range cases {