Skip to content

Commit fdb01cc

Browse files
Update terragrunt version (#1884)
* Update terragrunt version * Fix missing closing bracket Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * Add support for backward compatibility --------- Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
1 parent 3c4d9c9 commit fdb01cc

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

action.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ inputs:
7272
terragrunt-version:
7373
description: Terragrunt version
7474
required: false
75-
default: v0.55.5
75+
default: v0.73.7
7676
opentofu-version:
7777
description: OpenTofu version
7878
required: false
@@ -272,6 +272,7 @@ runs:
272272
format('{0}/cache', github.workspace) ||
273273
inputs.terraform-cache-dir }}
274274
echo "TF_PLUGIN_CACHE_DIR=$CACHE_DIR" >> $GITHUB_ENV
275+
echo "TG_PROVIDER_CACHE_DIR=$CACHE_DIR" >> $GITHUB_ENV
275276
echo "TERRAGRUNT_PROVIDER_CACHE_DIR=$CACHE_DIR" >> $GITHUB_ENV
276277
277278
- uses: actions/cache/restore@v4
@@ -400,6 +401,7 @@ runs:
400401
INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL: ${{ inputs.drift-detection-slack-notification-url }}
401402
NO_BACKEND: ${{ inputs.no-backend }}
402403
DEBUG: 'true'
404+
TG_PROVIDER_CACHE: ${{ inputs.cache-dependencies == 'true' && 1 || 0 }}
403405
TERRAGRUNT_PROVIDER_CACHE: ${{ inputs.cache-dependencies == 'true' && 1 || 0 }}
404406
DIGGER_RUN_SPEC: ${{inputs.digger-spec}}
405407
run: |
@@ -439,6 +441,7 @@ runs:
439441
INPUT_DIGGER_COMMAND: ${{ inputs.command }}
440442
INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL: ${{ inputs.drift-detection-slack-notification-url }}
441443
NO_BACKEND: ${{ inputs.no-backend }}
444+
TG_PROVIDER_CACHE: ${{ inputs.cache-dependencies == 'true' && 1 || 0 }}
442445
TERRAGRUNT_PROVIDER_CACHE: ${{ inputs.cache-dependencies == 'true' && 1 || 0 }}
443446
DIGGER_RUN_SPEC: ${{inputs.digger-spec}}
444447
id: digger
@@ -460,7 +463,7 @@ runs:
460463
with:
461464
path: ${{ env.TF_PLUGIN_CACHE_DIR }}
462465
key: digger-cache-${{ hashFiles('**/cache') }}
463-
466+
464467
branding:
465468
icon: globe
466469
color: purple

cli/pkg/digger/digger.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ package digger
33
import (
44
"errors"
55
"fmt"
6+
"log"
7+
"os"
8+
"path"
9+
"strings"
10+
"time"
11+
612
"github.com/diggerhq/digger/libs/backendapi"
713
"github.com/diggerhq/digger/libs/ci"
814
comment_updater "github.com/diggerhq/digger/libs/comment_utils/summary"
@@ -12,11 +18,6 @@ import (
1218
"github.com/diggerhq/digger/libs/policy"
1319
orchestrator "github.com/diggerhq/digger/libs/scheduler"
1420
"github.com/diggerhq/digger/libs/storage"
15-
"log"
16-
"os"
17-
"path"
18-
"strings"
19-
"time"
2021

2122
core_drift "github.com/diggerhq/digger/cli/pkg/core/drift"
2223
"github.com/diggerhq/digger/cli/pkg/usage"
@@ -68,7 +69,8 @@ func RunJobs(jobs []orchestrator.Job, prService ci.PullRequestService, orgServic
6869
defer reporter.Flush()
6970

7071
log.Printf("Info: [TF_PLUGIN_CACHE_DIR=%v] ", os.Getenv("TF_PLUGIN_CACHE_DIR"))
71-
log.Printf("Info: [TERRAGRUNT_PROVIDER_CACHE_DIR=%v", os.Getenv("TERRAGRUNT_PROVIDER_CACHE_DIR"))
72+
log.Printf("Info: [TG_PROVIDER_CACHE_DIR=%v] ", os.Getenv("TG_PROVIDER_CACHE_DIR"))
73+
log.Printf("Info: [TERRAGRUNT_PROVIDER_CACHE_DIR=%v] ", os.Getenv("TERRAGRUNT_PROVIDER_CACHE_DIR"))
7274

7375
runStartedAt := time.Now()
7476

libs/execution/terragrunt.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,12 @@ func (terragrunt Terragrunt) runTerragruntCommand(command string, printOutputToS
104104
env := os.Environ()
105105
env = append(env, "TF_CLI_ARGS=-no-color")
106106
env = append(env, "TF_IN_AUTOMATION=true")
107+
env = append(env, "TERRAGRUNT_FORWARD_TF_STDOUT=1")
107108
env = append(env, "TERRAGRUNT_NO_COLOR=true")
108109
env = append(env, "TERRAGRUNT_NON_INTERACTIVE=true")
109-
env = append(env, "TERRAGRUNT_FORWARD_TF_STDOUT=1")
110+
env = append(env, "TG_NO_COLOR=true")
111+
env = append(env, "TG_NON_INTERACTIVE=true")
112+
env = append(env, "TG_TF_FORWARD_STDOUT=true")
110113

111114
for k, v := range envs {
112115
env = append(env, fmt.Sprintf("%s=%s", k, v))

0 commit comments

Comments
 (0)