Merge branch 'main' into 4211/fix/setting-correct-exit-code-for-validate

Author: yhakbar

.github/cloud-nuke/config.yml

@@ -0,0 +1,5 @@
+s3:
+  timeout: 10m
+  include:
+    names_regex:
+      - "^terragrunt-test-bucket-[a-zA-Z0-9]{6}.*"

.github/workflows/cloud-nuke.yml

@@ -0,0 +1,47 @@
+name: Daily Cloud Nuke
+on:
+  schedule:
+    - cron: "0 0 * * *" # Runs every day at midnight UTC
+  workflow_dispatch:
+
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  run_cloud_nuke:
+    name: Nuke
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install cloud-nuke
+        run: |
+            wget -O /usr/local/bin/cloud-nuke \
+                --header="Authorization: Bearer ${GITHUB_TOKEN}" \
+                "https://github.com/gruntwork-io/cloud-nuke/releases/download/v${VERSION}/cloud-nuke_linux_amd64"
+
+            chmod +x /usr/local/bin/cloud-nuke
+        env:
+            # Authenticate to reduce the likelihood of hitting rate limit issues.
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            VERSION: 0.40.0
+
+      - name: Authenticate to AWS
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.CLOUD_NUKE_ROLE }}
+          aws-region: us-east-1
+
+      - name: Run cloud-nuke
+        run: |
+            cloud-nuke aws \
+                --force \
+                --log-level debug \
+                --resource-type s3 \
+                --region us-east-1 \
+                --region us-west-2 \
+                --older-than 24h \
+                --config .github/cloud-nuke/config.yml

.github/workflows/markdownlint.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run markdownlint
-        uses: DavidAnson/markdownlint-cli2-action@v19
+        uses: DavidAnson/markdownlint-cli2-action@v20
         with:
           globs: |
             docs/**/*.md

.github/workflows/pages.yml

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

.gitignore

@@ -18,3 +18,4 @@ mocks/
 .terragrunt-stack
 .devcontainer.json
 .cursor/
+.env

.markdownlint-cli2.yaml

@@ -4,3 +4,6 @@ config:
 
   # Disable multiple headers with the same content
   MD024: false
+
+  # Disable requirement for descriptive links (e.g. allow click [here]())
+  MD059: false

cli/commands/run/cli.go

@@ -2,13 +2,18 @@
 package run
 
 import (
+	"context"
+	"path/filepath"
 	"strings"
 
 	"github.com/gruntwork-io/go-commons/collections"
 	"github.com/gruntwork-io/terragrunt/cli/commands/common/graph"
 	"github.com/gruntwork-io/terragrunt/cli/commands/common/runall"
+	"github.com/gruntwork-io/terragrunt/config"
 	"github.com/gruntwork-io/terragrunt/internal/cli"
+	"github.com/gruntwork-io/terragrunt/internal/errors"
 	"github.com/gruntwork-io/terragrunt/options"
+	"github.com/gruntwork-io/terragrunt/telemetry"
 	"github.com/gruntwork-io/terragrunt/tf"
 )
 
@@ -42,6 +47,7 @@ func NewCommand(opts *options.TerragruntOptions) *cli.Command {
 
 	cmd = runall.WrapCommand(opts, cmd, Run)
 	cmd = graph.WrapCommand(opts, cmd, Run)
+	cmd = wrapWithStackGenerate(opts, cmd)
 
 	return cmd
 }
@@ -96,3 +102,42 @@ func validateCommand(opts *options.TerragruntOptions) error {
 func isTerraformPath(opts *options.TerragruntOptions) bool {
 	return strings.HasSuffix(opts.TerraformPath, options.TerraformDefaultPath)
 }
+
+// wrapWithStackGenerate wraps a CLI command to handle automatic stack generation.
+// It generates a stack configuration file when running terragrunt with --all or --graph flags,
+// unless explicitly disabled with --no-stack-generate.
+func wrapWithStackGenerate(opts *options.TerragruntOptions, cmd *cli.Command) *cli.Command {
+	// Wrap the command's action to inject stack generation logic
+	cmd = cmd.WrapAction(func(ctx *cli.Context, action cli.ActionFunc) error {
+		// Determine if stack generation should occur based on command flags
+		// Stack generation is triggered by --all or --graph flags, unless --no-stack-generate is set
+		shouldGenerateStack := (opts.RunAll || opts.Graph) && !opts.NoStackGenerate
+
+		// Skip stack generation if not needed
+		if !shouldGenerateStack {
+			opts.Logger.Debugf("Skipping stack generation in %s", opts.WorkingDir)
+			return action(ctx)
+		}
+
+		// Set the stack config path to the default location in the working directory
+		opts.TerragruntStackConfigPath = filepath.Join(opts.WorkingDir, config.DefaultStackFile)
+
+		// Generate the stack configuration with telemetry tracking
+		err := telemetry.TelemeterFromContext(ctx).Collect(ctx, "stack_generate", map[string]any{
+			"stack_config_path": opts.TerragruntStackConfigPath,
+			"working_dir":       opts.WorkingDir,
+		}, func(ctx context.Context) error {
+			return config.GenerateStacks(ctx, opts)
+		})
+
+		// Handle any errors during stack generation
+		if err != nil {
+			return errors.Errorf("failed to generate stack file: %w", err)
+		}
+
+		// Execute the original command action after successful stack generation
+		return action(ctx)
+	})
+
+	return cmd
+}

cli/commands/run/flags.go

@@ -38,6 +38,8 @@ const (
 	SourceMapFlagName    = "source-map"
 	SourceUpdateFlagName = "source-update"
 
+	NoStackGenerate = "no-stack-generate"
+
 	// Assume IAM Role flags.
 
 	IAMAssumeRoleFlagName                 = "iam-assume-role"
@@ -119,6 +121,15 @@ func NewFlags(opts *options.TerragruntOptions, prefix flags.Prefix) cli.Flags {
 		},
 			flags.WithDeprecatedName(terragruntPrefix.FlagName("graph-root"), terragruntPrefixControl)),
 
+		// `--all` and `--graph` related flags.
+
+		flags.NewFlag(&cli.BoolFlag{
+			Name:        NoStackGenerate,
+			EnvVars:     tgPrefix.EnvVars(NoStackGenerate),
+			Destination: &opts.NoStackGenerate,
+			Usage:       "Disable automatic stack regeneration before running the command.",
+		}),
+
 		//  Backward compatibility with `terragrunt-` prefix flags.
 
 		flags.NewFlag(&cli.GenericFlag[string]{

cli/commands/stack/cli.go

@@ -76,12 +76,6 @@ func defaultFlags(opts *options.TerragruntOptions, prefix flags.Prefix) cli.Flag
 	tgPrefix := prefix.Prepend(flags.TgPrefix)
 
 	flags := cli.Flags{
-		flags.NewFlag(&cli.BoolFlag{
-			Name:        NoStackGenerate,
-			EnvVars:     tgPrefix.EnvVars(NoStackGenerate),
-			Destination: &opts.NoStackGenerate,
-			Usage:       "Disable automatic stack regeneration before running the command.",
-		}),
 		flags.NewFlag(&cli.BoolFlag{
 			Name:        NoStackValidate,
 			EnvVars:     tgPrefix.EnvVars(NoStackValidate),

docs-starlight/src/styles/global.css

@@ -34,3 +34,7 @@
   --color-gray-900: var(--color-zinc-900);
   --color-gray-950: var(--color-zinc-950);
 }
+
+:root {
+  --sl-nav-height: 5rem;
+}

go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/gruntwork-io/boilerplate v0.6.1
 	github.com/gruntwork-io/go-commons v0.17.2
 	github.com/gruntwork-io/terragrunt-engine-go v0.0.14
-	github.com/gruntwork-io/terratest v0.48.2
+	github.com/gruntwork-io/terratest v0.49.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-getter v1.7.8
 	github.com/hashicorp/go-getter/v2 v2.2.3

go.sum

@@ -1235,8 +1235,8 @@ github.com/gruntwork-io/go-commons v0.17.2 h1:14dsCJ7M5Vv2X3BIPKeG9Kdy6vTMGhM8L4
 github.com/gruntwork-io/go-commons v0.17.2/go.mod h1:zs7Q2AbUKuTarBPy19CIxJVUX/rBamfW8IwuWKniWkE=
 github.com/gruntwork-io/terragrunt-engine-go v0.0.14 h1:8sdQNufNTlqNr+LFsBV7y6YqIFioHj/cQjgro8uqZLE=
 github.com/gruntwork-io/terragrunt-engine-go v0.0.14/go.mod h1:jkMUtnJlr/BUUnU+pEjQL+uIzX9P0ui2WfUaldwo2mY=
-github.com/gruntwork-io/terratest v0.48.2 h1:+VwfODchq8jxZZWD+s8gBlhD1z6/C4bFLNrhpm9ONrs=
-github.com/gruntwork-io/terratest v0.48.2/go.mod h1:Y5ETyD4ZQ2MZhasPno272fWuCpKwvTPYDi8Y0tIMqTE=
+github.com/gruntwork-io/terratest v0.49.0 h1:GurfpHEOEr8vntB77QcxDh+P7aiQRUgPFdgb6q9PuWI=
+github.com/gruntwork-io/terratest v0.49.0/go.mod h1:/+dfGio9NqUpvvukuPo29B8zy6U5FYJn9PdmvwztK4A=
 github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY=
 github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

test/fixtures/download/remote-relative-with-slash/terragrunt.hcl

@@ -3,5 +3,5 @@ inputs = {
 }
 
 terraform {
-  source = "github.com/gruntwork-io/terragrunt.git?ref=v0.77.22//test/fixtures/download/relative"
+  source = "github.com/gruntwork-io/terragrunt.git?ref=v0.78.4//test/fixtures/download/relative"
 }

test/integration_docs_aws_test.go

@@ -33,11 +33,13 @@ func TestAwsDocsOverview(t *testing.T) {
 		tmpEnvPath := helpers.CopyEnvironment(t, stepPath)
 		rootPath := util.JoinPath(tmpEnvPath, stepPath)
 
-		defer helpers.DeleteS3Bucket(t, region, s3BucketName)
-		defer func() {
+		t.Cleanup(func() {
+			helpers.DeleteS3Bucket(t, region, s3BucketName)
+		})
+		t.Cleanup(func() {
 			_, _, err := helpers.RunTerragruntCommandWithOutput(t, "terragrunt destroy -auto-approve --non-interactive --working-dir "+rootPath)
 			require.NoError(t, err)
-		}()
+		})
 
 		rootTerragruntConfigPath := util.JoinPath(rootPath, config.DefaultTerragruntConfigPath)
 		helpers.CopyTerragruntConfigAndFillPlaceholders(t, rootTerragruntConfigPath, rootTerragruntConfigPath, s3BucketName, "not-used", region)
@@ -57,11 +59,13 @@ func TestAwsDocsOverview(t *testing.T) {
 		tmpEnvPath := helpers.CopyEnvironment(t, stepPath)
 		rootPath := util.JoinPath(tmpEnvPath, stepPath)
 
-		defer helpers.DeleteS3Bucket(t, region, s3BucketName)
-		defer func() {
+		t.Cleanup(func() {
+			helpers.DeleteS3Bucket(t, region, s3BucketName)
+		})
+		t.Cleanup(func() {
 			_, _, err := helpers.RunTerragruntCommandWithOutput(t, "terragrunt run --all --non-interactive --working-dir "+rootPath+" -- destroy -auto-approve")
 			require.NoError(t, err)
-		}()
+		})
 
 		rootTerragruntConfigPath := util.JoinPath(rootPath, "root.hcl")
 		helpers.CopyTerragruntConfigAndFillPlaceholders(t, rootTerragruntConfigPath, rootTerragruntConfigPath, s3BucketName, "not-used", region)
@@ -81,11 +85,13 @@ func TestAwsDocsOverview(t *testing.T) {
 		tmpEnvPath := helpers.CopyEnvironment(t, stepPath)
 		rootPath := util.JoinPath(tmpEnvPath, stepPath)
 
-		defer helpers.DeleteS3Bucket(t, region, s3BucketName)
-		defer func() {
+		t.Cleanup(func() {
+			helpers.DeleteS3Bucket(t, region, s3BucketName)
+		})
+		t.Cleanup(func() {
 			_, _, err := helpers.RunTerragruntCommandWithOutput(t, "terragrunt run --all --non-interactive --working-dir "+rootPath+" -- destroy -auto-approve")
 			require.NoError(t, err)
-		}()
+		})
 
 		rootTerragruntConfigPath := util.JoinPath(rootPath, "root.hcl")
 		helpers.CopyTerragruntConfigAndFillPlaceholders(t, rootTerragruntConfigPath, rootTerragruntConfigPath, s3BucketName, "not-used", region)
@@ -105,11 +111,13 @@ func TestAwsDocsOverview(t *testing.T) {
 		tmpEnvPath := helpers.CopyEnvironment(t, stepPath)
 		rootPath := util.JoinPath(tmpEnvPath, stepPath)
 
-		defer helpers.DeleteS3Bucket(t, region, s3BucketName)
-		defer func() {
+		t.Cleanup(func() {
+			helpers.DeleteS3Bucket(t, region, s3BucketName)
+		})
+		t.Cleanup(func() {
 			_, _, err := helpers.RunTerragruntCommandWithOutput(t, "terragrunt run --all --non-interactive --working-dir "+rootPath+" -- destroy -auto-approve")
 			require.NoError(t, err)
-		}()
+		})
 
 		rootTerragruntConfigPath := util.JoinPath(rootPath, "root.hcl")
 		helpers.CopyTerragruntConfigAndFillPlaceholders(t, rootTerragruntConfigPath, rootTerragruntConfigPath, s3BucketName, "not-used", region)
@@ -129,11 +137,13 @@ func TestAwsDocsOverview(t *testing.T) {
 		tmpEnvPath := helpers.CopyEnvironment(t, stepPath)
 		rootPath := util.JoinPath(tmpEnvPath, stepPath)
 
-		defer helpers.DeleteS3Bucket(t, region, s3BucketName)
-		defer func() {
+		t.Cleanup(func() {
+			helpers.DeleteS3Bucket(t, region, s3BucketName)
+		})
+		t.Cleanup(func() {
 			_, _, err := helpers.RunTerragruntCommandWithOutput(t, "terragrunt run --all --non-interactive --working-dir "+rootPath+" -- destroy -auto-approve")
 			require.NoError(t, err)
-		}()
+		})
 
 		rootTerragruntConfigPath := util.JoinPath(rootPath, "root.hcl")
 		helpers.CopyTerragruntConfigAndFillPlaceholders(t, rootTerragruntConfigPath, rootTerragruntConfigPath, s3BucketName, "not-used", region)