revert filterPaths modification

Author: motatoes

backend/controllers/github.go

@@ -376,6 +376,7 @@ func handlePullRequestEvent(gh utils.GithubClientProvider, payload *github.PullR
 	diggerYmlStr, ghService, config, projectsGraph, _, _, changedFiles, err := getDiggerConfigForPR(gh, organisationId, prLabelsStr, installationId, repoFullName, repoOwner, repoName, cloneURL, prNumber)
 	if err != nil {
 		log.Printf("getDiggerConfigForPR error: %v", err)
+		commentReporterManager.UpdateComment(fmt.Sprintf(":x: Error loading digger config: %v", err))
 		return fmt.Errorf("error getting digger config")
 	}
 

libs/digger_config/digger_config.go

@@ -299,7 +299,7 @@ func HandleYamlProjectGeneration(config *DiggerConfigYaml, terraformDir string,
 							CreateProjectName:    true,
 							DefaultWorkflow:      workflow,
 							WorkflowFile:         b.WorkflowFile,
-							FilterPaths:          []string{path.Join(terraformDir, *b.RootDir)},
+							FilterPath:           path.Join(terraformDir, *b.RootDir),
 							AwsRoleToAssume:      b.AwsRoleToAssume,
 							AwsCognitoOidcConfig: b.AwsCognitoOidcConfig,
 						}
@@ -522,7 +522,7 @@ func hydrateDiggerConfigYamlWithTerragrunt(configYaml *DiggerConfigYaml, parsing
 		projectExternalChilds,
 		parsingConfig.AutoMerge,
 		parallel,
-		parsingConfig.FilterPaths,
+		parsingConfig.FilterPath,
 		parsingConfig.CreateHclProjectChilds,
 		ignoreParentTerragrunt,
 		parsingConfig.IgnoreDependencyBlocks,

libs/digger_config/terragrunt/atlantis/generate.go

@@ -598,7 +598,7 @@ func createHclProject(defaultWorkflow string, defaultApplyRequirements []string,
 }
 
 // Finds the absolute paths of all terragrunt.hcl files
-func getAllTerragruntFiles(filterPaths []string, projectHclFiles []string, path string) ([]string, error) {
+func getAllTerragruntFiles(filterPath string, projectHclFiles []string, path string) ([]string, error) {
 	options, err := options.NewTerragruntOptionsWithConfigPath(path)
 	if err != nil {
 		return nil, err
@@ -610,15 +610,11 @@ func getAllTerragruntFiles(filterPaths []string, projectHclFiles []string, path
 	workingPaths := []string{path}
 
 	// filters are not working (yet) if using project hcl files (which are kind of filters by themselves)
-	if len(filterPaths) > 0 && len(projectHclFiles) == 0 {
-		workingPaths = []string{}
-		for _, filterPath := range filterPaths {
-			// get all matching folders
-			theseWorkingPaths, err := filepath.Glob(filterPath)
-			if err != nil {
-				return nil, err
-			}
-			workingPaths = append(workingPaths, theseWorkingPaths...)
+	if filterPath != "" && len(projectHclFiles) == 0 {
+		// get all matching folders
+		workingPaths, err = filepath.Glob(filterPath)
+		if err != nil {
+			return nil, err
 		}
 	}
 
@@ -682,7 +678,7 @@ func getAllTerragruntProjectHclFiles(projectHclFiles []string, gitRoot string) m
 	return uniqueHclFileAbsPaths
 }
 
-func Parse(gitRoot string, projectHclFiles []string, createHclProjectExternalChilds bool, autoMerge bool, parallel bool, filterPaths []string, createHclProjectChilds bool, ignoreParentTerragrunt bool, ignoreDependencyBlocks bool, cascadeDependencies bool, defaultWorkflow string, defaultApplyRequirements []string, autoPlan bool, defaultTerraformVersion string, createProjectName bool, createWorkspace bool, preserveProjects bool, useProjectMarkers bool, executionOrderGroups bool, triggerProjectsFromDirOnly bool) (*AtlantisConfig, map[string][]string, error) {
+func Parse(gitRoot string, projectHclFiles []string, createHclProjectExternalChilds bool, autoMerge bool, parallel bool, filterPath string, createHclProjectChilds bool, ignoreParentTerragrunt bool, ignoreDependencyBlocks bool, cascadeDependencies bool, defaultWorkflow string, defaultApplyRequirements []string, autoPlan bool, defaultTerraformVersion string, createProjectName bool, createWorkspace bool, preserveProjects bool, useProjectMarkers bool, executionOrderGroups bool, triggerProjectsFromDirOnly bool) (*AtlantisConfig, map[string][]string, error) {
 	// Ensure the gitRoot has a trailing slash and is an absolute path
 	absoluteGitRoot, err := filepath.Abs(gitRoot)
 	if err != nil {
@@ -718,7 +714,7 @@ func Parse(gitRoot string, projectHclFiles []string, createHclProjectExternalChi
 	sem := semaphore.NewWeighted(10)
 	projectDependenciesMap := sync.Map{}
 	for _, workingDir := range workingDirs {
-		terragruntFiles, err := getAllTerragruntFiles(filterPaths, projectHclFiles, workingDir)
+		terragruntFiles, err := getAllTerragruntFiles(filterPath, projectHclFiles, workingDir)
 		if err != nil {
 			return nil, nil, err
 		}

libs/digger_config/utils.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"path"
 	"path/filepath"
-	"strings"
 )
 
 func GetPatternsRelativeToRepo(projectPath string, patterns []string) ([]string, error) {
@@ -16,16 +15,6 @@ func GetPatternsRelativeToRepo(projectPath string, patterns []string) ([]string,
 	return res, nil
 }
 
-func FilterPathsOutsideOfProjectPath(projectPath string, patterns []string) ([]string, error) {
-	res := make([]string, 0)
-	for _, pattern := range patterns {
-		if strings.HasPrefix(pattern, projectPath) {
-			res = append(res, pattern)
-		}
-	}
-	return res, nil
-}
-
 func NormalizeFileName(fileName string) string {
 	res, err := filepath.Abs(path.Join("/", fileName))
 	if err != nil {

libs/digger_config/utils_test.go

@@ -45,13 +45,3 @@ func TestGetPatternsRelativeToRepo(t *testing.T) {
 	assert.Equal(t, "myProject/terraform/environments/devel/*.hcl", res[0])
 
 }
-
-func TestFilterPathsOutsideOfProjectPath(t *testing.T) {
-	projectDir := "staging/aws/us-east-1/k8s"
-	includePatterns := []string{"staging/aws/us-east-1/k8s/*.hcl", "staging/terragrunt-root.hcl vpc/*.tf*", "staging/aws/us-east-1/aws_region.tfvars", "staging/aws/aws_assume_role_arn.tfvars", "staging/aws/us-east-1/k8s/*.tf*"}
-	res, _ := FilterPathsOutsideOfProjectPath(projectDir, includePatterns)
-	assert.Equal(t, 2, len(res))
-	assert.Equal(t, "staging/aws/us-east-1/k8s/*.hcl", res[0])
-	assert.Equal(t, "staging/aws/us-east-1/k8s/*.tf*", res[1])
-
-}

libs/digger_config/yaml.go

@@ -149,7 +149,7 @@ type TerragruntParsingConfig struct {
 	CreateProjectName          bool     `yaml:"createProjectName"`
 	DefaultTerraformVersion    string   `yaml:"defaultTerraformVersion"`
 	DefaultWorkflow            string   `yaml:"defaultWorkflow"`
-	FilterPaths                []string `yaml:"filterPath"`
+	FilterPath                 string   `yaml:"filterPath"`
 	OutputPath                 string   `yaml:"outputPath"`
 	PreserveWorkflows          *bool    `yaml:"preserveWorkflows,omitempty"`
 	PreserveProjects           bool     `yaml:"preserveProjects"`