move env var handling into rust and expose summarize env as a command

vercel · Mar 28, 2023 · 7d6a2af · 7d6a2af
1 parent 0f3d967
commit 7d6a2af
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/cli/internal/run/run.go b/cli/internal/run/run.go
@@ -3,7 +3,6 @@ package run
 import (
 	gocontext "context"
 	"fmt"
-	"os"
 	"sort"
 	"sync"
 	"time"
@@ -81,6 +80,7 @@ func optsFromArgs(args *turbostate.ParsedArgsFromRust) (*Opts, error) {
 	opts.cacheOpts.OverrideDir = runPayload.CacheDir
 	opts.cacheOpts.Workers = runPayload.CacheWorkers
 	opts.runOpts.logPrefix = runPayload.LogPrefix
+	opts.runOpts.summarize = runPayload.Summarize
 	opts.runOpts.experimentalSpaceID = runPayload.ExperimentalSpaceID
 
 	// Runcache flags
@@ -136,18 +136,6 @@ func optsFromArgs(args *turbostate.ParsedArgsFromRust) (*Opts, error) {
 }
 
 func configureRun(base *cmdutil.CmdBase, opts *Opts, signalWatcher *signals.Watcher) *run {
-	if os.Getenv("TURBO_FORCE") == "true" {
-		opts.runcacheOpts.SkipReads = true
-	}
-
-	if os.Getenv("TURBO_REMOTE_ONLY") == "true" {
-		opts.cacheOpts.SkipFilesystem = true
-	}
-
-	if os.Getenv("TURBO_RUN_SUMMARY") == "true" {
-		opts.runOpts.summarize = true
-	}
-
 	processes := process.NewManager(base.Logger.Named("processes"))
 	signalWatcher.AddOnClose(processes.Close)
 	return &run{

diff --git a/cli/internal/turbostate/turbostate.go b/cli/internal/turbostate/turbostate.go
@@ -59,6 +59,7 @@ type RunPayload struct {
 	Scope               []string `json:"scope"`
 	Since               string   `json:"since"`
 	SinglePackage       bool     `json:"single_package"`
+	Summarize           bool     `json:"summarize"`
 	Tasks               []string `json:"tasks"`
 	PkgInferenceRoot    string   `json:"pkg_inference_root"`
 	LogPrefix           string   `json:"log_prefix"`

diff --git a/crates/turborepo-lib/Cargo.toml b/crates/turborepo-lib/Cargo.toml
@@ -26,7 +26,7 @@ atty = { workspace = true }
 axum = "0.6.2"
 axum-server = "0.4.4"
 chrono = { workspace = true, features = ["serde"] }
-clap = { workspace = true, features = ["derive"] }
+clap = { workspace = true, features = ["derive", "env"] }
 clap_complete = { workspace = true }
 command-group = { version = "2.1.0", features = ["with-tokio"] }
 config = "0.13"

diff --git a/crates/turborepo-lib/src/cli.rs b/crates/turborepo-lib/src/cli.rs
@@ -298,7 +298,7 @@ pub struct RunArgs {
     #[clap(long, action = ArgAction::Append)]
     pub filter: Vec<String>,
     /// Ignore the existing cache (to force execution)
-    #[clap(long)]
+    #[clap(long, env = "TURBO_FORCE")]
     pub force: bool,
     /// Specify glob of global filesystem dependencies to be hashed. Useful
     /// for .env and files
@@ -347,7 +347,7 @@ pub struct RunArgs {
     pub profile: Option<String>,
     /// Ignore the local filesystem cache for all tasks. Only
     /// allow reading and caching artifacts using the remote cache.
-    #[clap(long)]
+    #[clap(long, env = "TURBO_REMOTE_ONLY")]
     pub remote_only: bool,
     /// Specify package(s) to act as entry points for task execution.
     /// Supports globs.
@@ -358,6 +358,9 @@ pub struct RunArgs {
     /// to identify which packages have changed.
     #[clap(long)]
     pub since: Option<String>,
+    /// Opt in to using the turbo run summary.
+    #[clap(long, hide = true, env = "TURBO_RUN_SUMMARY")]
+    pub summarize: Option<bool>,
     /// Use "none" to remove prefixes from task logs. Note that tasks running
     /// in parallel interleave their logs and prefix is the only way
     /// to identify which task produced a log.