Merge pull request #1417 from diggerhq/fix/fix-include-patterns-terragrunt

fix terragrunt relative paths by converting to absolute path

Author: ZIJ

libs/digger_config/digger_config.go

@@ -400,9 +400,17 @@ func hydrateDiggerConfigYamlWithTerragrunt(configYaml *DiggerConfigYaml, parsing
 	}
 
 	for _, atlantisProject := range atlantisConfig.Projects {
+
+		// normalize paths
+		projectDir := path.Join(pathPrefix, atlantisProject.Dir)
+		atlantisProject.Autoplan.WhenModified, err = GetPatternsRelativeToRepo(projectDir, atlantisProject.Autoplan.WhenModified)
+		if err != nil {
+			return fmt.Errorf("could not normalize patterns: %v", err)
+		}
+
 		configYaml.Projects = append(configYaml.Projects, &ProjectYaml{
 			Name:            atlantisProject.Name,
-			Dir:             path.Join(pathPrefix, atlantisProject.Dir),
+			Dir:             projectDir,
 			Workspace:       atlantisProject.Workspace,
 			Terragrunt:      true,
 			Workflow:        atlantisProject.Workflow,

libs/digger_config/utils.go

@@ -7,6 +7,14 @@ import (
 	"path/filepath"
 )
 
+func GetPatternsRelativeToRepo(projectPath string, patterns []string) ([]string, error) {
+	res := make([]string, 0)
+	for _, pattern := range patterns {
+		res = append(res, path.Join(projectPath, 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

@@ -20,3 +20,21 @@ func TestMatchIncludeExcludePatternsToFile(t *testing.T) {
 	result = MatchIncludeExcludePatternsToFile("projects/dev/project", includePatterns, excludePatterns)
 	assert.Equal(t, false, result)
 }
+
+func TestGetPatternsRelativeToRepo(t *testing.T) {
+	projectDir := "myProject/terraform/environments/devel"
+	includePatterns := []string{"../../*.tf*"}
+	res, _ := GetPatternsRelativeToRepo(projectDir, includePatterns)
+	assert.Equal(t, "myProject/terraform/*.tf*", res[0])
+
+	projectDir = "myProject/terraform/environments/devel"
+	includePatterns = []string{"*.tf"}
+	res, _ = GetPatternsRelativeToRepo(projectDir, includePatterns)
+	assert.Equal(t, "myProject/terraform/environments/devel/*.tf", res[0])
+
+	projectDir = "myProject/terraform/environments/devel"
+	includePatterns = []string{"*.hcl"}
+	res, _ = GetPatternsRelativeToRepo(projectDir, includePatterns)
+	assert.Equal(t, "myProject/terraform/environments/devel/*.hcl", res[0])
+
+}