Skip to content

feat: rename graph command as console #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pchalamet merged 1 commit into from
Jan 16, 2026
Merged

feat: rename graph command as console #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ terrabuild:
#

ui: webui
$(terrabuild) graph --no-open --port 5179
$(terrabuild) console --no-open --port 5179

test-scaffold:
$(terrabuild) scaffold --workspace tests/scaffold --debug --log
Expand Down
6 changes: 3 additions & 3 deletions src/Terrabuild/CLI.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ with
| Project _ -> "Select projets base on id."

[<RequireQualifiedAccess>]
type GraphArgs =
type ConsoleArgs =
| [<Unique; AltCommandLine("-w")>] Workspace of path:string
| [<Unique>] No_Open
| [<Unique; Hidden; AltCommandLine("-p")>] Port of port:int
Expand Down Expand Up @@ -158,7 +158,7 @@ type TerrabuildArgs =
| [<CliPrefix(CliPrefix.None)>] Logs of ParseResults<LogsArgs>
| [<CliPrefix(CliPrefix.None)>] Run of ParseResults<RunArgs>
| [<CliPrefix(CliPrefix.None)>] Serve of ParseResults<ServeArgs>
| [<CliPrefix(CliPrefix.None)>] Graph of ParseResults<GraphArgs>
| [<CliPrefix(CliPrefix.None)>] Console of ParseResults<ConsoleArgs>
| [<CliPrefix(CliPrefix.None)>] Clear of ParseResults<ClearArgs>
| [<CliPrefix(CliPrefix.None)>] Login of ParseResults<LoginArgs>
| [<CliPrefix(CliPrefix.None)>] Logout of ParseResults<LogoutArgs>
Expand All @@ -173,7 +173,7 @@ with
| Logs _ -> "dump logs."
| Run _ -> "Run specified targets."
| Serve _ -> "Serve specified targets."
| Graph _ -> "Visualize and build graph in a web UI."
| Console _ -> "Visualize and build graph in a web UI."
| Clear _ -> "Clear specified caches."
| Login _ -> "Connect to backend."
| Logout _ -> "Disconnect from backend."
Expand Down
12 changes: 6 additions & 6 deletions src/Terrabuild/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,21 +301,21 @@ let processCommandLine (parser: ArgumentParser<TerrabuildArgs>) (result: ParseRe
RunTargetOptions.Engine = None }
runTarget options

let graph (graphArgs: ParseResults<GraphArgs>) =
let console (consoleArgs: ParseResults<ConsoleArgs>) =
let workspaceResult =
match graphArgs.TryGetResult(GraphArgs.Workspace) with
match consoleArgs.TryGetResult(ConsoleArgs.Workspace) with
| Some ws -> findWorkspace (ws |> FS.fullPath)
| None -> findWorkspace (currentDir())
match workspaceResult with
| None ->
"No workspace found. Start Terrabuild graph from a workspace directory or pass -w <path>."
"No workspace found. Start console from a workspace directory or pass -w <path>."
|> Terminal.writeLine
5
| Some _ ->
"Press Ctrl+C to exit graph server mode." |> Terminal.writeLine
"Press Ctrl+C to exit console server mode." |> Terminal.writeLine
Terminal.flush()
Terminal.mute()
GraphServer.start graphArgs (log || debug) debug |> ignore
GraphServer.start consoleArgs (log || debug) debug |> ignore
Terminal.unmute()
0

Expand Down Expand Up @@ -385,7 +385,7 @@ let processCommandLine (parser: ArgumentParser<TerrabuildArgs>) (result: ParseRe
| p when p.Contains(TerrabuildArgs.Logs) -> p.GetResult(TerrabuildArgs.Logs) |> logs
| p when p.Contains(TerrabuildArgs.Run) -> p.GetResult(TerrabuildArgs.Run) |> run
| p when p.Contains(TerrabuildArgs.Serve) -> p.GetResult(TerrabuildArgs.Serve) |> serve
| p when p.Contains(TerrabuildArgs.Graph) -> p.GetResult(TerrabuildArgs.Graph) |> graph
| p when p.Contains(TerrabuildArgs.Console) -> p.GetResult(TerrabuildArgs.Console) |> console
| p when p.Contains(TerrabuildArgs.Clear) -> p.GetResult(TerrabuildArgs.Clear) |> clear
| p when p.Contains(TerrabuildArgs.Login) -> p.GetResult(TerrabuildArgs.Login) |> login
| p when p.Contains(TerrabuildArgs.Logout) -> p.GetResult(TerrabuildArgs.Logout) |> logout
Expand Down
8 changes: 4 additions & 4 deletions src/Terrabuild/Web/GraphServer.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,11 +305,11 @@ let private startBuildProcess (workspace: string) (request: BuildRequest) (logSt
Ok proc.Id
)

let start (graphArgs: ParseResults<GraphArgs>) (logEnabled: bool) (debugEnabled: bool) =
let start (graphArgs: ParseResults<ConsoleArgs>) (logEnabled: bool) (debugEnabled: bool) =
let workspace =
graphArgs.TryGetResult(CLI.GraphArgs.Workspace)
graphArgs.TryGetResult(CLI.ConsoleArgs.Workspace)
|> resolveWorkspace
let shouldOpenBrowser = graphArgs.Contains(GraphArgs.No_Open) |> not
let shouldOpenBrowser = graphArgs.Contains(ConsoleArgs.No_Open) |> not
let processDir =
System.Environment.ProcessPath
|> Option.ofObj
Expand All @@ -326,7 +326,7 @@ let start (graphArgs: ParseResults<GraphArgs>) (logEnabled: bool) (debugEnabled:
]
|> List.append (processDir |> Option.map (fun dir -> Path.Combine(dir, "ui")) |> Option.toList)
|> List.map (fun path -> Path.GetFullPath(path))
let port = graphArgs.TryGetResult(GraphArgs.Port) |> Option.defaultValue 5179
let port = graphArgs.TryGetResult(ConsoleArgs.Port) |> Option.defaultValue 5179
let url = $"http://127.0.0.1:{port}"
let builder = WebApplication.CreateBuilder()
builder.Logging.ClearProviders() |> ignore
Expand Down