Merge pull request #1413 from diggerhq/feat/load-env-vars-correctly

Ensure that env variables are loaded correctly

Author: ZIJ

action.yml

@@ -309,7 +309,7 @@ runs:
         NO_BACKEND: ${{ inputs.no-backend }}
         DEBUG: 'true'
         TF_PLUGIN_CACHE_DIR: ${{ github.workspace }}/cache
-        TERRAGRUNT_PROVIDER_CACHE:  ${{ inputs.cache-dependencies == 'true' && "1" || "0" }}
+        TERRAGRUNT_PROVIDER_CACHE: "0"
         TERRAGRUNT_PROVIDER_CACHE_DIR: ${{ github.workspace }}/cache
       run: |
           cd $GITHUB_ACTION_PATH/cli
@@ -339,7 +339,7 @@ runs:
         INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL: ${{ inputs.drift-detection-slack-notification-url }}
         NO_BACKEND: ${{ inputs.no-backend }}
         TF_PLUGIN_CACHE_DIR: ${{ github.workspace }}/cache
-        TERRAGRUNT_PROVIDER_CACHE:  ${{ inputs.cache-dependencies == 'true' && "1" || "0" }}
+        TERRAGRUNT_PROVIDER_CACHE: "0"
         TERRAGRUNT_PROVIDER_CACHE_DIR: ${{ github.workspace }}/cache
       id: digger
       shell: bash

cli/cmd/digger/main.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/samber/lo"
 	"log"
 	"net/http"
 	"os"
@@ -177,6 +178,18 @@ func gitHubCI(lock core_locking.Lock, policyChecker core_policy.Checker, backend
 			reportErrorAndExit(githubActor, fmt.Sprintf("Failed to run commands. %s", err), 5)
 		}
 
+		diggerConfig, _, _, err := digger_config.LoadDiggerConfig("./")
+		if err != nil {
+			reportErrorAndExit(githubActor, fmt.Sprintf("Failed to read Digger digger_config. %s", err), 4)
+		}
+		log.Printf("Digger digger_config read successfully\n")
+
+		// Override the values of StateEnvVars and CommandEnvVars from workflow value_from values
+		workflow := diggerConfig.Workflows[job.ProjectName]
+		stateEnvVars, commandEnvVars := digger_config.CollectTerraformEnvConfig(workflow.EnvVars)
+		job.StateEnvVars = lo.Assign(job.StateEnvVars, stateEnvVars)
+		job.CommandEnvVars = lo.Assign(job.CommandEnvVars, commandEnvVars)
+
 		jobs := []orchestrator.Job{orchestrator.JsonToJob(job)}
 
 		_, _, err = digger.RunJobs(jobs, &githubPrService, &githubPrService, lock, reporter, planStorage, policyChecker, commentUpdater, backendApi, inputs.Id, true, commentId64, currentDir)