Merge branch 'main' into fix-terragrunt-dir-in-stack

Author: james03160927

.circleci/config.yml

@@ -12,7 +12,7 @@ env: &env
 
 defaults: &defaults
   docker:
-    - image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:go1.24.3-tf1.5-tg58.8-pck1.8-ci58.2
+    - image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:go1.24.4-tf1.5-tg58.8-pck1.8-ci58.2
 
 version: 2.1
 jobs:
@@ -36,7 +36,7 @@ jobs:
       - attach_workspace:
           at: .
       - go/install:
-          version: "1.24.3"
+          version: "1.24.4"
       - run:
           name: Install sign-binary-helpers
           command: |
@@ -73,7 +73,7 @@ jobs:
       - attach_workspace:
           at: .
       - go/install:
-          version: "1.24.3"
+          version: "1.24.4"
       - run:
           name: Install sign-binary-helpers
           command: |

.github/workflows/pages.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Ruby
-        uses: ruby/setup-ruby@cb0fda56a307b8c78d38320cd40d9eb22a3bf04e # v1.242.0
+        uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
         with:
           ruby-version: '3.3'
           bundler-cache: true

cli/commands/scaffold/scaffold.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/url"
 	"os"
+	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -236,33 +237,50 @@ func generateDefaultTemplate(boilerplateDir string) (string, error) {
 	return boilerplateDir, nil
 }
 
-// downloadTemplate - parse URL and download files
+// downloadTemplate - parse URL, download files, and handle subfolders
 func downloadTemplate(ctx context.Context, l log.Logger, opts *options.TerragruntOptions, templateURL string, tempDir string) (string, error) {
 	parsedTemplateURL, err := tf.ToSourceURL(templateURL, tempDir)
 	if err != nil {
 		return "", errors.New(err)
 	}
 
-	parsedTemplateURL, err = rewriteTemplateURL(ctx, l, opts, parsedTemplateURL)
+	// Split the processed URL to get the base URL and subfolder
+	baseURL, subFolder, err := tf.SplitSourceURL(l, parsedTemplateURL)
 	if err != nil {
 		return "", errors.New(err)
 	}
-	// regenerate template url with all changes
-	templateURL = parsedTemplateURL.String()
 
-	// prepare temporary directory for template
-	templateDir, err := os.MkdirTemp("", "template")
+	// Go-getter expects a pathspec or . for file paths
+	if baseURL.Scheme == "" || baseURL.Scheme == "file" {
+		baseURL.Path = filepath.ToSlash(strings.TrimSuffix(baseURL.Path, "/")) + "//."
+	}
+
+	baseURL, err = rewriteTemplateURL(ctx, l, opts, baseURL)
 	if err != nil {
 		return "", errors.New(err)
 	}
 
-	// downloading templateURL
-	l.Infof("Using template from %s", templateURL)
+	templateDir, err := os.MkdirTemp(tempDir, "template")
+	if err != nil {
+		return "", errors.New(err)
+	}
 
-	if _, err := getter.GetAny(ctx, templateDir, templateURL); err != nil {
+	l.Infof("Downloading template from %s into %s", baseURL.String(), templateDir)
+	// Downloading baseURL to support boilerplate dependencies and partials. Go-getter discards all but specified folder if one is provided.
+	if _, err := getter.GetAny(ctx, templateDir, baseURL.String()); err != nil {
 		return "", errors.New(err)
 	}
 
+	// Add subfolder to templateDir if provided, as scaffold needs path to boilerplate.yml file
+	if subFolder != "" {
+		subFolder = strings.TrimPrefix(subFolder, "/")
+		templateDir = filepath.Join(templateDir, subFolder)
+		// Verify that subfolder exists
+		if _, err := os.Stat(templateDir); os.IsNotExist(err) {
+			return "", errors.Errorf("subfolder \"//%s\" not found in downloaded template from %s", subFolder, templateURL)
+		}
+	}
+
 	return templateDir, nil
 }
 
@@ -298,7 +316,7 @@ func prepareBoilerplateFiles(ctx context.Context, l log.Logger, opts *options.Te
 
 			boilerplateDir = tempTemplateDir
 		} else {
-			defaultTempDir, err := os.MkdirTemp("", "boilerplate")
+			defaultTempDir, err := os.MkdirTemp(tempDir, "boilerplate")
 			if err != nil {
 				return "", errors.New(err)
 			}

cli/commands/stack/cli.go

@@ -15,7 +15,6 @@ const (
 	OutputFormatFlagName = "format"
 	JSONFormatFlagName   = "json"
 	RawFormatFlagName    = "raw"
-	NoStackGenerate      = "no-stack-generate"
 	NoStackValidate      = "no-stack-validate"
 
 	generateCommandName = "generate"

cli/commands/stack/stack.go

@@ -30,6 +30,8 @@ func RunGenerate(ctx context.Context, l log.Logger, opts *options.TerragruntOpti
 		return nil
 	}
 
+	opts.StackAction = "generate"
+
 	return telemetry.TelemeterFromContext(ctx).Collect(ctx, "stack_generate", map[string]any{
 		"stack_config_path": opts.TerragruntStackConfigPath,
 		"working_dir":       opts.WorkingDir,
@@ -40,6 +42,8 @@ func RunGenerate(ctx context.Context, l log.Logger, opts *options.TerragruntOpti
 
 // Run execute stack command.
 func Run(ctx context.Context, l log.Logger, opts *options.TerragruntOptions) error {
+	opts.StackAction = "run"
+
 	err := telemetry.TelemeterFromContext(ctx).Collect(ctx, "stack_run", map[string]any{
 		"stack_config_path": opts.TerragruntStackConfigPath,
 		"working_dir":       opts.WorkingDir,
@@ -52,12 +56,17 @@ func Run(ctx context.Context, l log.Logger, opts *options.TerragruntOptions) err
 	}
 
 	opts.WorkingDir = filepath.Join(opts.WorkingDir, stackDir)
+	if _, err := os.Stat(opts.WorkingDir); os.IsNotExist(err) {
+		return errors.Errorf("Stack directory does not exist or is not accessible: %s", opts.WorkingDir)
+	}
 
 	return runall.Run(ctx, l, opts)
 }
 
 // RunOutput stack output.
 func RunOutput(ctx context.Context, l log.Logger, opts *options.TerragruntOptions, index string) error {
+	opts.StackAction = "output"
+
 	var outputs cty.Value
 
 	// collect outputs

config/config.go

@@ -1189,6 +1189,10 @@ func ParseConfigFile(ctx *ParsingContext, l log.Logger, configPath string, inclu
 
 		fileInfo, err := os.Stat(configPath)
 		if err != nil {
+			if os.IsNotExist(err) {
+				return TerragruntConfigNotFoundError{Path: configPath}
+			}
+
 			return errors.Errorf("failed to get file info: %w", err)
 		}
 

config/config_partial.go

@@ -284,6 +284,10 @@ func PartialParseConfigFile(ctx *ParsingContext, l log.Logger, configPath string
 
 	fileInfo, err := os.Stat(configPath)
 	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, TerragruntConfigNotFoundError{Path: configPath}
+		}
+
 		return nil, errors.New(err)
 	}
 

config/errors.go

@@ -142,7 +142,7 @@ type TerragruntConfigNotFoundError struct {
 }
 
 func (err TerragruntConfigNotFoundError) Error() string {
-	return fmt.Sprintf("Terragrunt config %s not found", err.Path)
+	return fmt.Sprintf("You attempted to run terragrunt in a folder that does not contain a terragrunt.hcl file. Please add a terragrunt.hcl file and try again.\n\nPath: %q", err.Path)
 }
 
 type InvalidSourceURLError struct {

config/stack.go

@@ -89,6 +89,14 @@ func GenerateStacks(ctx context.Context, l log.Logger, opts *options.TerragruntO
 		return errors.Errorf("Failed to list stack files in %s %w", opts.WorkingDir, err)
 	}
 
+	if len(foundFiles) == 0 {
+		if opts.StackAction == "generate" {
+			l.Warnf("No stack files found in %s Nothing to generate.", opts.WorkingDir)
+		}
+
+		return nil
+	}
+
 	for {
 		// check if we have already processed the files
 		processedNewFiles := false
@@ -169,6 +177,11 @@ func StackOutput(ctx context.Context, l log.Logger, opts *options.TerragruntOpti
 		return cty.NilVal, errors.Errorf("Failed to list stack files in %s: %w", opts.WorkingDir, err)
 	}
 
+	if len(foundFiles) == 0 {
+		l.Warnf("No stack files found in %s Nothing to generate.", opts.WorkingDir)
+		return cty.NilVal, nil
+	}
+
 	outputs := make(map[string]map[string]cty.Value)
 	declaredStacks := make(map[string]string)
 	declaredUnits := make(map[string]*Unit)

configstack/running_module.go

@@ -221,7 +221,34 @@ func (module *RunningModule) moduleFinished(moduleErr error, r *report.Report, r
 
 		if reportExperiment {
 			if err := r.EndRun(module.Module.Path); err != nil {
-				module.Logger.Errorf("Error ending run for module %s: %v", module.Module.Path, err)
+				// If the run is not found in the report, it likely means this module was an external dependency
+				// that was excluded from the queue (e.g., with --queue-exclude-external).
+				if !errors.Is(err, report.ErrRunNotFound) {
+					module.Logger.Errorf("Error ending run for unit %s: %v", module.Module.Path, err)
+
+					return
+				}
+
+				if module.Module.AssumeAlreadyApplied {
+					run, err := report.NewRun(module.Module.Path)
+					if err != nil {
+						module.Logger.Errorf("Error creating run for unit %s: %v", module.Module.Path, err)
+						return
+					}
+
+					if err := r.AddRun(run); err != nil {
+						module.Logger.Errorf("Error adding run for unit %s: %v", module.Module.Path, err)
+						return
+					}
+
+					if err := r.EndRun(
+						run.Path,
+						report.WithResult(report.ResultExcluded),
+						report.WithReason(report.ReasonExcludeExternal),
+					); err != nil {
+						module.Logger.Errorf("Error ending run for unit %s: %v", module.Module.Path, err)
+					}
+				}
 			}
 		}
 	} else {
@@ -234,10 +261,6 @@ func (module *RunningModule) moduleFinished(moduleErr error, r *report.Report, r
 				report.WithReason(report.ReasonRunError),
 				report.WithCauseRunError(moduleErr.Error()),
 			); err != nil {
-				// If we can't find the run, then it never started,
-				// So we should start it and then end it as a failed run.
-				//
-				// Early exit runs should already be ended at this point.
 				if errors.Is(err, report.ErrRunNotFound) {
 					run, err := report.NewRun(module.Module.Path)
 					if err != nil {