Merge remote-tracking branch 'origin/main' into chore/dropping-utils

denis256 · denis256 · commit aaa0ceed8286 · 2025-12-15T14:44:53.000Z
diff --git a/.github/workflows/base-test.yml b/.github/workflows/base-test.yml
@@ -34,13 +34,13 @@ jobs:
         shell: bash
 
       - name: Go Build Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}-${{ matrix.os }}-amd64
 
       - name: Go Mod Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.go-cache-paths.outputs.go-mod }}
           key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}-${{ matrix.os }}-amd64
@@ -56,7 +56,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Report (${{ matrix.os }})
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-report-${{ matrix.os }}
           path: result.xml
diff --git a/.github/workflows/build-no-proxy.yml b/.github/workflows/build-no-proxy.yml
@@ -43,7 +43,7 @@ jobs:
           echo "go-build=$(go env GOCACHE)" >> "$GITHUB_OUTPUT"
 
       - name: Go Build Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}-${{ matrix.os }}-${{ matrix.arch }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -66,7 +66,7 @@ jobs:
           echo "go-build=$(go env GOCACHE)" >> "$GITHUB_OUTPUT"
 
       - name: Go Build Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}-${{ matrix.os }}-${{ matrix.arch }}
@@ -97,7 +97,7 @@ jobs:
           .github/scripts/release/verify-static-binary.sh "${OUTPUT}" "${GOOS}" "${GOARCH}"
 
       - name: Upload Build Artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: terragrunt_${{ matrix.os }}_${{ matrix.arch }}
           path: bin/terragrunt_${{ matrix.os }}_${{ matrix.arch }}*
@@ -127,7 +127,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Download macOS signed binaries
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: macos-signed-files
           path: bin/
@@ -175,13 +175,13 @@ jobs:
           done
 
       - name: Download Windows signed binaries
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: windows-signed-files
           path: bin/
 
       - name: Download Linux binaries (unsigned)
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           pattern: terragrunt_linux_*
           path: bin/
@@ -193,7 +193,7 @@ jobs:
           ls -lahrt bin/*
 
       - name: Upload All Signed Binaries
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: all-signed-binaries
           path: bin/*
diff --git a/.github/workflows/flake.yml b/.github/workflows/flake.yml
@@ -43,7 +43,7 @@ jobs:
         shell: bash
 
       - name: Go Build Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}-${{ matrix.flake.os }}-amd64
@@ -61,7 +61,7 @@ jobs:
           TIMEOUT: ${{ matrix.flake.timeout }}
 
       - name: Upload Report (${{ matrix.flake.name }})
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-report-${{ matrix.flake.name }}
           path: result.xml
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -216,7 +216,7 @@ jobs:
         shell: bash
 
       - name: Go Build Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}-${{ matrix.integration.os }}-amd64
@@ -250,7 +250,7 @@ jobs:
           HAS_DOCKER: ${{ runner.os == 'Linux' }}
 
       - name: Upload Test Results (${{ matrix.integration.name }})
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-results-${{ matrix.integration.name }}
           path: |
diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml
@@ -32,7 +32,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload License Check Report
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: license-check-report-ubuntu
           path: license-check.log
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -32,19 +32,19 @@ jobs:
         echo "golanci-lint-cache=/home/runner/.cache/golangci-lint" >> "$GITHUB_OUTPUT"
 
     - name: Go Build Cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ steps.go-cache-paths.outputs.go-build }}
         key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}-linux-amd64
 
     - name: Go Mod Cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ steps.go-cache-paths.outputs.go-mod }}
         key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}-linux-amd64
 
     - name: golangci-lint Cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ steps.go-cache-paths.outputs.golanci-lint-cache }}
         key: ${{ runner.os }}-golangci-lint-${{ hashFiles('**/go.sum') }}-linux-amd64
diff --git a/.github/workflows/oidc-integration-test.yml b/.github/workflows/oidc-integration-test.yml
@@ -93,7 +93,7 @@ jobs:
         shell: bash
 
       - name: Go Build Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}-${{ matrix.integration.os }}-amd64
@@ -120,7 +120,7 @@ jobs:
           TEST_ARGS: ${{ matrix.integration.test_args }}
 
       - name: Upload Report (${{ matrix.integration.name }})
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-report-${{ matrix.integration.name }}
           path: result.xml
diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml
@@ -28,7 +28,7 @@ jobs:
           echo "go-build=$(go env GOCACHE)" >> "$GITHUB_OUTPUT"
 
       - name: Go Build Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.go-cache-paths.outputs.go-build }}
           key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}-linux-amd64
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,7 +55,7 @@ jobs:
         run: .github/scripts/release/check-release-exists.sh
 
       - name: Download pre-built signed binaries
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: all-signed-binaries
           path: bin/
diff --git a/.github/workflows/sign-macos.yml b/.github/workflows/sign-macos.yml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Download macOS build artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           pattern: ${{ inputs.artifact-pattern }}
           path: artifacts/
@@ -57,7 +57,7 @@ jobs:
 
       - name: Cache gon binary
         id: cache-gon
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: gon
           key: gon-${{ env.GON_VERSION }}
@@ -91,7 +91,7 @@ jobs:
           done
 
       - name: Upload Signed MacOS Binaries
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ inputs.upload-artifact-name }}
           path: bin/terragrunt_darwin_*
diff --git a/.github/workflows/sign-windows.yml b/.github/workflows/sign-windows.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Download Windows build artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           pattern: ${{ inputs.artifact_pattern }}
           path: artifacts/
@@ -73,7 +73,7 @@ jobs:
 
       # Upload Windows binaries (signed amd64 + unsigned 386)
       - name: Upload Windows Binaries
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ inputs.upload_artifact_name }}
           path: |
diff --git a/cli/commands/scaffold/scaffold.go b/cli/commands/scaffold/scaffold.go
@@ -54,7 +54,7 @@ variables:
     type: string
 `
 	DefaultTerragruntTemplate = `
-# This is a Terragrunt module generated by boilerplate.
+# This is a Terragrunt unit generated by Gruntwork Boilerplate (https://github.com/gruntwork-io/boilerplate).
 terraform {
   source = "{{ .sourceUrl }}"
 }
diff --git a/docs-starlight/src/content/docs/01-getting-started/04-terminology.md b/docs-starlight/src/content/docs/01-getting-started/04-terminology.md
@@ -166,7 +166,7 @@ Terragrunt will always attempt to run until the Run Queue is empty.
 
 The Runner Pool is the pool of available resources that Terragrunt can use to execute runs.
 
-Units are dequeued from the Runner Pool into the Runner Pool depending on factors like [parallelism](/docs/reference/cli/commands/run#parallelism) and the DAG.
+Units are dequeued from the Run Queue into the Runner Pool depending on factors like [parallelism](/docs/reference/cli/commands/run#parallelism) and the DAG.
 
 Units are only considered "running" when they are in the Runner Pool.
 
diff --git a/docs-starlight/src/content/docs/03-features/07-scaffold.md b/docs-starlight/src/content/docs/03-features/07-scaffold.md
@@ -19,9 +19,9 @@ Description:
 - `MODULE_URL` - This parameter specifies the URL to an OpenTofu/Terraform module. It can be a local file path, git URL, registry URL, or any other [module source URL](https://developer.hashicorp.com/terraform/language/modules/sources).
 - `TEMPLATE_URL` - This optional parameter specifies the URL to a custom boilerplate template to generate HCL files. It can be a local file path, git URL, registry URL, or any other [module source URL](https://developer.hashicorp.com/terraform/language/modules/sources). If not specified, Terragrunt will:
   - Look for a `.boilerplate` folder in the module at `MODULE_URL`, and if found, use the boilerplate template in that folder.
-  - Failing to find that, Terragrunt will use a default boilerplate template that is built-in, which creates a best-practices `terragrunt.hcl` for deploying a single OpenTofu/Terraform module.
+  - Failing to find that, Terragrunt will use a default boilerplate template that is built-in, which creates a simple Terragrunt unit for deploying that OpenTofu/Terraform module.
 
-For example, here's how you can generate a `terragrunt.hcl` file to configure an [example MySQL OpenTofu/Terraform module](https://github.com/gruntwork-io/terragrunt-infrastructure-modules-example/tree/master/mysql) for deployment:
+For example, here's how you can generate a `terragrunt.hcl` file to instantiate an [example MySQL OpenTofu/Terraform module](https://github.com/gruntwork-io/terragrunt-infrastructure-modules-example/tree/master/mysql) for deployment:
 
 ```bash
 terragrunt scaffold github.com/gruntwork-io/terragrunt-infrastructure-modules-example//modules/mysql
@@ -32,7 +32,7 @@ This will create a `terragrunt.hcl` in your current working directory, with roug
 ```hcl
 # terragrunt.hcl
 
-# This is a Terragrunt module generated by boilerplate.
+# This is a Terragrunt unit generated by Gruntwork Boilerplate (https://github.com/gruntwork-io/boilerplate).
 terraform {
   source = "git::https://github.com/gruntwork-io/terragrunt-infrastructure-modules-example.git//modules/mysql?ref=v0.8.1"
 }
@@ -61,7 +61,7 @@ inputs = {
 Important notes:
 
 - The `source` URL is configured for you automatically, with the `ref` pointing to the latest "release" tag of the module (found by scanning git tags).
-- The `inputs` section is generated for you automatically, and will list all required and optional variables from the module, with their types, descriptions, and defaults, so you can easily fill them in to configure the module as you like.
+- The `inputs` section is generated for you automatically, and will list all required and optional variables from the module, with their types, descriptions, and defaults, so you can easily fill them in to configure the unit as you like.
 
 ## Custom templates for scaffolding
 
@@ -75,8 +75,8 @@ If you define input variables in your boilerplate template, Terragrunt will prom
 There are also a set of variables that Terragrunt will automatically expose to your boilerplate templates for rendering:
 
 - `sourceUrl` - URL to module
-- `requiredVariables` - list of required variables in the module being scaffolded (see below)
-- `optionalVariables` - list of optional variables in the module being scaffolded (see below)
+- `requiredVariables` - list of required variables in the unit being scaffolded (see below)
+- `optionalVariables` - list of optional variables in the unit being scaffolded (see below)
 
 The elements in the `requiredVariables` and `optionalVariables` lists are structs with the following fields:
 
@@ -89,7 +89,7 @@ The elements in the `requiredVariables` and `optionalVariables` lists are struct
 Optional variables which can be passed to `scaffold` command:
 
 - `Ref` - git tag or branch name for module to be used
-- `EnableRootInclude` - add in default `terragrunt.hcl` inclusion for the root module, by default `true`
+- `EnableRootInclude` - add in default `terragrunt.hcl` inclusion for the root unit, by default `true`
 - `RootFileName` - name of the root configuration file, by default `terragrunt.hcl` \*
 - `SourceUrlType` - if set to `git-ssh` module url will be converted to Git/SSH format
 - `SourceGitSshUser` - git user for Git/SSH format, by default `git`
@@ -100,7 +100,7 @@ Optional variables which can be passed to `scaffold` command:
 
 ### Convenience flags
 
-- `--no-include-root` - Disable inclusion of the root module in the generated `terragrunt.hcl` file (equivalent to using `--var=EnableRootInclude=false`, and will be overridden if the corresponding `var` value is set).
+- `--no-include-root` - Disable inclusion of the root include in the generated `terragrunt.hcl` file (equivalent to using `--var=EnableRootInclude=false`, and will be overridden if the corresponding `var` value is set).
 - `--root-file-name` - Set the name of the root configuration file to include in the generated `terragrunt.hcl` file (equivalent to using `--var=RootFileName=<name>`, and will be overridden if the corresponding `var` value is set).
 - `--no-dependency-prompt` - Disable dependency confirmation, but keep the interactive mode enabled (skip asking for confirmation about including dependencies defined in the boilerplate template).
 
