blocks support block name in generated project (#1998)

* support additiona parsing arguments

* propagate projectName to projects

Author: motatoes

libs/digger_config/config.go

@@ -42,6 +42,7 @@ type AssumeRoleForProject struct {
 }
 
 type Project struct {
+	BlockName            string // the block name if this is a generated project
 	Name                 string
 	Dir                  string
 	Workspace            string

libs/digger_config/converters.go

@@ -69,7 +69,9 @@ func copyProjects(projects []*ProjectYaml) []Project {
 			workspace = p.Workspace
 		}
 
-		item := Project{p.Name,
+		item := Project{
+			p.BlockName,
+			p.Name,
 			p.Dir,
 			workspace,
 			p.Terragrunt,

libs/digger_config/digger_config.go

@@ -329,7 +329,7 @@ func HandleYamlProjectGeneration(config *DiggerConfigYaml, terraformDir string,
 		slog.Warn("terragrunt generation using top level config is deprecated",
 			"recommendation", "https://docs.digger.dev/howto/generate-projects#blocks-syntax-with-terragrunt")
 
-		err := hydrateDiggerConfigYamlWithTerragrunt(config, *config.GenerateProjectsConfig.TerragruntParsingConfig, terraformDir)
+		err := hydrateDiggerConfigYamlWithTerragrunt(config, *config.GenerateProjectsConfig.TerragruntParsingConfig, terraformDir, "")
 		if err != nil {
 			slog.Error("failed to hydrate config with terragrunt", "error", err)
 			return err
@@ -338,7 +338,7 @@ func HandleYamlProjectGeneration(config *DiggerConfigYaml, terraformDir string,
 		slog.Warn("terragrunt generation using top level config is deprecated",
 			"recommendation", "https://docs.digger.dev/howto/generate-projects#blocks-syntax-with-terragrunt")
 
-		err := hydrateDiggerConfigYamlWithTerragrunt(config, TerragruntParsingConfig{}, terraformDir)
+		err := hydrateDiggerConfigYamlWithTerragrunt(config, TerragruntParsingConfig{}, terraformDir, "")
 		if err != nil {
 			slog.Error("failed to hydrate config with terragrunt", "error", err)
 			return err
@@ -408,16 +408,19 @@ func HandleYamlProjectGeneration(config *DiggerConfigYaml, terraformDir string,
 							workflow = b.Workflow
 						}
 
-						tgParsingConfig := TerragruntParsingConfig{
-							CreateProjectName:    true,
-							DefaultWorkflow:      workflow,
-							WorkflowFile:         b.WorkflowFile,
-							FilterPath:           path.Join(terraformDir, *b.RootDir),
-							AwsRoleToAssume:      b.AwsRoleToAssume,
-							AwsCognitoOidcConfig: b.AwsCognitoOidcConfig,
+						// load the parsing config and override the block values
+						tgParsingConfig := b.TerragruntParsingConfig
+						if tgParsingConfig == nil {
+							tgParsingConfig = &TerragruntParsingConfig{}
 						}
-
-						err := hydrateDiggerConfigYamlWithTerragrunt(config, tgParsingConfig, terraformDir)
+						tgParsingConfig.CreateProjectName = true
+						tgParsingConfig.DefaultWorkflow = workflow
+						tgParsingConfig.WorkflowFile = b.WorkflowFile
+						tgParsingConfig.FilterPath = path.Join(terraformDir, *b.RootDir)
+						tgParsingConfig.AwsRoleToAssume = b.AwsRoleToAssume
+						tgParsingConfig.AwsCognitoOidcConfig = b.AwsCognitoOidcConfig
+
+						err := hydrateDiggerConfigYamlWithTerragrunt(config, *tgParsingConfig, terraformDir, b.BlockName)
 						if err != nil {
 							slog.Error("failed to hydrate config with terragrunt",
 								"error", err,
@@ -696,7 +699,7 @@ func ValidateDiggerConfig(config *DiggerConfig) error {
 	return nil
 }
 
-func hydrateDiggerConfigYamlWithTerragrunt(configYaml *DiggerConfigYaml, parsingConfig TerragruntParsingConfig, workingDir string) error {
+func hydrateDiggerConfigYamlWithTerragrunt(configYaml *DiggerConfigYaml, parsingConfig TerragruntParsingConfig, workingDir string, blockName string) error {
 	slog.Info("hydrating config with terragrunt projects",
 		"workingDir", workingDir,
 		"filterPath", parsingConfig.FilterPath)
@@ -803,6 +806,7 @@ func hydrateDiggerConfigYamlWithTerragrunt(configYaml *DiggerConfigYaml, parsing
 			"workspace", atlantisProject.Workspace)
 
 		diggerProject := &ProjectYaml{
+			BlockName:            blockName,
 			Name:                 atlantisProject.Name,
 			Dir:                  projectDir,
 			Workspace:            atlantisProject.Workspace,

libs/digger_config/yaml.go

@@ -35,6 +35,7 @@ type DependencyConfigurationYaml struct {
 }
 
 type ProjectYaml struct {
+	BlockName            string                      `yaml:"block_name"`
 	Name                 string                      `yaml:"name"`
 	Dir                  string                      `yaml:"dir"`
 	Workspace            string                      `yaml:"workspace"`
@@ -108,8 +109,9 @@ type BlockYaml struct {
 	ExcludePatterns []string `yaml:"exclude_patterns,omitempty"`
 
 	// these flags are only for terragrunt
-	Terragrunt bool    `yaml:"terragrunt"`
-	RootDir    *string `yaml:"root_dir"`
+	Terragrunt              bool                     `yaml:"terragrunt"`
+	RootDir                 *string                  `yaml:"root_dir"`
+	TerragruntParsingConfig *TerragruntParsingConfig `yaml:"terragrunt_parsing,omitempty"`
 
 	// these flags are only for opentofu
 	OpenTofu bool `yaml:"opentofu"`