Add passthrough env vars to run summary.

vercel · Apr 11, 2023 · 6e1f7ec · 6e1f7ec
1 parent 2d46c2a
commit 6e1f7ec
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/cli/internal/run/run.go b/cli/internal/run/run.go
@@ -15,6 +15,7 @@ import (
 	"github.com/vercel/turbo/cli/internal/core"
 	"github.com/vercel/turbo/cli/internal/daemon"
 	"github.com/vercel/turbo/cli/internal/daemonclient"
+	"github.com/vercel/turbo/cli/internal/env"
 	"github.com/vercel/turbo/cli/internal/fs"
 	"github.com/vercel/turbo/cli/internal/graph"
 	"github.com/vercel/turbo/cli/internal/process"
@@ -340,6 +341,11 @@ func (r *run) run(ctx gocontext.Context, targets []string) error {
 		}
 	}
 
+	var envVarPassthroughMap env.EnvironmentVariableMap
+	if envVarPassthroughDetailedMap, err := env.GetHashableEnvVars(globalHashable.envVarPassthroughs, nil, ""); err != nil {
+		envVarPassthroughMap = envVarPassthroughDetailedMap.All
+	}
+
 	// RunSummary contains information that is statically analyzable about
 	// the tasks that we expect to run based on the user command.
 	summary := runsummary.NewRunSummary(
@@ -354,6 +360,7 @@ func (r *run) run(ctx gocontext.Context, targets []string) error {
 			globalHashable.globalFileHashMap,
 			globalHashable.rootExternalDepsHash,
 			globalHashable.envVars,
+			envVarPassthroughMap,
 			globalHashable.globalCacheKey,
 			globalHashable.pipeline,
 		),

diff --git a/cli/internal/runsummary/format_json.go b/cli/internal/runsummary/format_json.go
@@ -30,6 +30,7 @@ func (rsm *Meta) FormatJSON() ([]byte, error) {
 func (rsm *Meta) normalize() {
 	for _, t := range rsm.RunSummary.Tasks {
 		t.EnvVars.Global = rsm.RunSummary.GlobalHashSummary.envVars
+		t.EnvVars.GlobalPassthrough = rsm.RunSummary.GlobalHashSummary.passthroughEnvVars
 	}
 
 	// Remove execution summary for dry runs

diff --git a/cli/internal/runsummary/globalhash_summary.go b/cli/internal/runsummary/globalhash_summary.go
@@ -14,19 +14,22 @@ type GlobalHashSummary struct {
 	Pipeline             fs.PristinePipeline                   `json:"rootPipeline"`
 
 	// This is a private field because and not in JSON, because we'll add it to each task
-	envVars env.EnvironmentVariablePairs
+	envVars            env.EnvironmentVariablePairs
+	passthroughEnvVars env.EnvironmentVariablePairs
 }
 
 // NewGlobalHashSummary creates a GlobalHashSummary struct from a set of fields.
 func NewGlobalHashSummary(
 	fileHashMap map[turbopath.AnchoredUnixPath]string,
 	rootExternalDepsHash string,
 	envVars env.DetailedMap,
+	passthroughEnvVars env.EnvironmentVariableMap,
 	globalCacheKey string,
 	pipeline fs.PristinePipeline,
 ) *GlobalHashSummary {
 	return &GlobalHashSummary{
 		envVars:              envVars.All.ToSecretHashable(),
+		passthroughEnvVars:   passthroughEnvVars.ToSecretHashable(),
 		GlobalFileHashMap:    fileHashMap,
 		RootExternalDepsHash: rootExternalDepsHash,
 		GlobalCacheKey:       globalCacheKey,

diff --git a/cli/internal/runsummary/task_summary.go b/cli/internal/runsummary/task_summary.go
@@ -37,9 +37,11 @@ type TaskSummary struct {
 
 // TaskEnvVarSummary contains the environment variables that impacted a task's hash
 type TaskEnvVarSummary struct {
-	Configured []string `json:"configured"`
-	Inferred   []string `json:"inferred"`
-	Global     []string `json:"global"`
+	Configured        []string `json:"configured"`
+	Inferred          []string `json:"inferred"`
+	Global            []string `json:"global"`
+	GlobalPassthrough []string `json:"globalPassthrough"`
+	Passthrough       []string `json:"passthrough"`
 }
 
 // cleanForSinglePackage converts a TaskSummary to remove references to workspaces