add block excludes (#2659)

* feat: block-level excludes

Author: s1ntaxe770r

cli/pkg/github/github.go

@@ -221,6 +221,12 @@ func GitHubCI(lock core_locking.Lock, policyCheckerProvider core_policy.PolicyCh
 					continue
 				}
 			}
+			if len(projectConfig.DriftIncludePatterns) > 0 || len(projectConfig.DriftExcludePatterns) > 0 {
+				if !digger_config.MatchIncludeExcludePatternsToFile(projectConfig.Dir, projectConfig.DriftIncludePatterns, projectConfig.DriftExcludePatterns) {
+					slog.Info("Project excluded by block-level drift patterns, skipping", "project", projectConfig.Name, "dir", projectConfig.Dir, "block", projectConfig.BlockName)
+					continue
+				}
+			}
 			workflow := diggerConfig.Workflows[projectConfig.Workflow]
 
 			stateEnvVars, commandEnvVars := digger_config.CollectTerraformEnvConfig(workflow.EnvVars, true)

docs/ce/drift/backendless-scoping-projects.mdx

@@ -82,10 +82,33 @@ generate_projects:
 
 Only projects whose `dir` matches an include pattern and does not match an exclude pattern  will run drift detection. Exclude patterns are evaluated after include patterns.
 
+## Using per-block drift patterns
+
+You can also place `drift_include_patterns` and `drift_exclude_patterns` **inside a block**. They apply only to projects generated by that block and are matched against each project's `dir`.
+
+```yaml
+generate_projects:
+  blocks:
+    - block_name: crdb
+      workflow: default
+      include: "projects/CRDB/**"
+      drift_exclude_patterns:
+        - "projects/CRDB/aws/dev/staging/us-east-1/ec2/**"
+    - block_name: dev
+      workflow: default
+      include: "infra/dev/**"
+```
+
+Here, every project generated from the `crdb` block whose directory matches `projects/CRDB/aws/dev/staging/us-east-1/ec2/**` is skipped during drift detection, while everything else in the block runs as usual. The `dev` block is unaffected.
+
+Per-block patterns and top-level patterns compose: a project must pass both checks to run drift detection.
+
 ## Notes
 
-- Patterns use [doublestar](https://github.com/bmatcuk/doublestar) glob matching against the project directory path.
-- Both fields default to `[]`. If `drift_include_patterns` is empty, all projects are included.
+- `drift_include_patterns` / `drift_exclude_patterns` use [doublestar](https://github.com/bmatcuk/doublestar) glob matching against the project directory path.
+- Per-block patterns apply only to projects generated by that block. Explicit `projects:` entries and projects from other blocks are unaffected.
+- Top-level patterns under `generate_projects` apply to every generated project. When both are set, a project must satisfy each independently.
+- All fields default to `[]`. If the include list is empty, every project passes the include step.
 
 ## Related
 

docs/ce/reference/digger.yml.mdx

@@ -417,6 +417,14 @@ Automatically generate projects from directory structure using the `generate_pro
       List of directory glob patterns to exclude from generated projects.
     </ParamField>
 
+    <ParamField path="drift_include_patterns" type="array" default="[]">
+      Glob patterns matched against the `dir` of each project generated by this block. Only matching projects run drift detection. If empty, every project the block generates passes the include step. Evaluated alongside the top-level `drift_include_patterns` — a project must pass both. See [Backendless: Scope Drift to Specific Projects](/ce/drift/backendless-scoping-projects).
+    </ParamField>
+
+    <ParamField path="drift_exclude_patterns" type="array" default="[]">
+      Glob patterns matched against the `dir` of each project generated by this block. Matching projects are skipped during drift detection. Evaluated after this block's `drift_include_patterns`.
+    </ParamField>
+
     <ParamField path="workflow" type="string" default="default">
       Workflow to use for projects in this block.
     </ParamField>

drift/controllers/drift.go

@@ -92,6 +92,15 @@ func (mc MainController) TriggerDriftRunForProject(c *gin.Context) {
 		}
 	}
 
+	// Apply drift include/exclude patterns from the project's source block
+	if len(theProject.DriftIncludePatterns) > 0 || len(theProject.DriftExcludePatterns) > 0 {
+		if !dg_configuration.MatchIncludeExcludePatternsToFile(theProject.Dir, theProject.DriftIncludePatterns, theProject.DriftExcludePatterns) {
+			log.Printf("Project %v dir %v excluded by block-level drift patterns, skipping", project.Name, theProject.Dir)
+			c.String(http.StatusOK, "project excluded by block-level drift patterns")
+			return
+		}
+	}
+
 	projects := []dg_configuration.Project{*theProject}
 
 	jobsForImpactedProjects, err := generic.CreateJobsForProjects(projects, command, "drift", repoFullName, "digger", config.Workflows, &issueNumber, nil, branch, branch, false)

libs/digger_config/config.go

@@ -72,6 +72,8 @@ type Project struct {
 	AwsCognitoOidcConfig *AwsCognitoOidcConfig
 	Generated            bool
 	PulumiStack          string
+	DriftIncludePatterns []string
+	DriftExcludePatterns []string
 }
 
 type Workflow struct {

libs/digger_config/converters.go

@@ -104,6 +104,8 @@ func copyProjects(projects []*ProjectYaml) []Project {
 			awsCognitoOidc,
 			p.Generated,
 			workspace,
+			p.DriftIncludePatterns,
+			p.DriftExcludePatterns,
 		}
 		result[i] = item
 	}

libs/digger_config/digger_config.go

@@ -448,7 +448,7 @@ func HandleYamlProjectGeneration(config *DiggerConfigYaml, terraformDir string,
 								"blockName", b.BlockName)
 							return nil, err
 						}
-						if len(b.IncludePatterns) > 0 || len(b.ExcludePatterns) > 0 {
+						if len(b.IncludePatterns) > 0 || len(b.ExcludePatterns) > 0 || len(b.DriftIncludePatterns) > 0 || len(b.DriftExcludePatterns) > 0 {
 							for _, project := range config.Projects {
 								if project.BlockName == b.BlockName && project.Terragrunt {
 									if len(b.IncludePatterns) > 0 {
@@ -465,6 +465,12 @@ func HandleYamlProjectGeneration(config *DiggerConfigYaml, terraformDir string,
 											"blockName", b.BlockName,
 											"excludePatterns", project.ExcludePatterns)
 									}
+									if len(b.DriftIncludePatterns) > 0 {
+										project.DriftIncludePatterns = append(project.DriftIncludePatterns, b.DriftIncludePatterns...)
+									}
+									if len(b.DriftExcludePatterns) > 0 {
+										project.DriftExcludePatterns = append(project.DriftExcludePatterns, b.DriftExcludePatterns...)
+									}
 								}
 							}
 						}
@@ -499,6 +505,7 @@ func HandleYamlProjectGeneration(config *DiggerConfigYaml, terraformDir string,
 								"projectName", projectName)
 
 							project := ProjectYaml{
+								BlockName:            b.BlockName,
 								Name:                 projectName,
 								Dir:                  dir,
 								Workflow:             workflow,
@@ -510,6 +517,8 @@ func HandleYamlProjectGeneration(config *DiggerConfigYaml, terraformDir string,
 								WorkflowFile:         b.WorkflowFile,
 								IncludePatterns:      b.IncludePatterns,
 								ExcludePatterns:      b.ExcludePatterns,
+								DriftIncludePatterns: b.DriftIncludePatterns,
+								DriftExcludePatterns: b.DriftExcludePatterns,
 							}
 							config.Projects = append(config.Projects, &project)
 						}

libs/digger_config/yaml.go

@@ -65,6 +65,8 @@ type ProjectYaml struct {
 	Generated            bool                        `yaml:"generated"`
 	AwsCognitoOidcConfig *AwsCognitoOidcConfig       `yaml:"aws_cognito_oidc,omitempty"`
 	PulumiStack          string                      `yaml:"pulumi_stack"`
+	DriftIncludePatterns []string                    `yaml:"drift_include_patterns,omitempty"`
+	DriftExcludePatterns []string                    `yaml:"drift_exclude_patterns,omitempty"`
 }
 
 type WorkflowYaml struct {
@@ -121,6 +123,9 @@ type BlockYaml struct {
 	IncludePatterns []string `yaml:"include_patterns,omitempty"`
 	ExcludePatterns []string `yaml:"exclude_patterns,omitempty"`
 
+	DriftIncludePatterns []string `yaml:"drift_include_patterns,omitempty"`
+	DriftExcludePatterns []string `yaml:"drift_exclude_patterns,omitempty"`
+
 	// these flags are only for terragrunt
 	Terragrunt              bool                     `yaml:"terragrunt"`
 	RootDir                 *string                  `yaml:"root_dir"`