mirror of
https://github.com/coder/coder.git
synced 2026-06-02 20:48:20 +00:00
ad5e6785f4
## Summary In this pull request we're adding support for additional filtering options to the `provisioners list` CLI command and the `/provisionerdaemons` API endpoint. Resolves: https://github.com/coder/coder/issues/18783 ### Changes #### Added CLI Options - `--show-offline`: When this option is provided, all provisioner daemons will be returned. This means that when `--show-offline` is not provided only `idle` and `busy` provisioner daemons will be returned. - `--status=<list_of_statuses>`: When this option is provided with a comma-separated list of valid statuses (`idle`, `busy`, or `offline`) only provisioner daemons that have these statuses will be returned. - `--max-age=<duration>`: When this option is provided with a valid duration value (e.g., `24h`, `30s`) only provisioner daemons with a `last_seen_at` timestamp within the provided max age will be returned. #### Query Params - `?offline=true`: Include offline provisioner daemons in the results. Offline provisioner daemons will be excluded if `?offline=false` or if offline is not provided. - `?status=<list_of_statuses>`: Include provisioner daemons with the specified statuses. - `?max_age=<duration>`: Include provisioner daemons with a `last_seen_at` timestamp within the max age duration. #### Frontend - Since offline provisioners will not be returned by default anymore (`--show-offline` has to be provided to see them), a checkbox was added to the provisioners list page to allow for offline provisioners to be displayed - A revamp of the provisioners page will be done in: https://github.com/coder/coder/issues/17156, this checkbox change was just added to maintain currently functionality with the backend updates Current provisioners page (without checkbox) <img width="1329" height="574" alt="Screenshot 2025-08-20 at 10 51 00 AM" src="https://github.com/user-attachments/assets/77b73650-0b62-44f0-a77f-acbe5710809f" /> Provisioners page with checkbox (unchecked) <img width="1314" height="626" alt="Screenshot 2025-08-20 at 10 48 40 AM" src="https://github.com/user-attachments/assets/7ba164ad-6d3f-417b-bd39-338c0161b145" /> Provisioner page with checkbox (checked) and URL updated with query parameters <img width="1306" height="597" alt="Screenshot 2025-08-20 at 10 50 14 AM" src="https://github.com/user-attachments/assets/e78d0986-bbf8-491b-9d56-b682973237a0" /> ### Show Offline vs Offline Status To list offline provisioner daemons, users can either: 1. Include the `--show-offline` option OR 2. Include `offline` in the list of values provided to the `--status` option
137 lines
3.5 KiB
Go
137 lines
3.5 KiB
Go
package cli
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"golang.org/x/xerrors"
|
|
|
|
"github.com/coder/coder/v2/cli/cliui"
|
|
"github.com/coder/coder/v2/coderd/util/slice"
|
|
"github.com/coder/coder/v2/codersdk"
|
|
"github.com/coder/serpent"
|
|
)
|
|
|
|
func (r *RootCmd) Provisioners() *serpent.Command {
|
|
cmd := &serpent.Command{
|
|
Use: "provisioner",
|
|
Short: "View and manage provisioner daemons and jobs",
|
|
Handler: func(inv *serpent.Invocation) error {
|
|
return inv.Command.HelpHandler(inv)
|
|
},
|
|
Aliases: []string{"provisioners"},
|
|
Children: []*serpent.Command{
|
|
r.provisionerList(),
|
|
r.provisionerJobs(),
|
|
},
|
|
}
|
|
|
|
return cmd
|
|
}
|
|
|
|
func (r *RootCmd) provisionerList() *serpent.Command {
|
|
type provisionerDaemonRow struct {
|
|
codersdk.ProvisionerDaemon `table:"provisioner_daemon,recursive_inline"`
|
|
OrganizationName string `json:"organization_name" table:"organization"`
|
|
}
|
|
var (
|
|
client = new(codersdk.Client)
|
|
orgContext = NewOrganizationContext()
|
|
formatter = cliui.NewOutputFormatter(
|
|
cliui.TableFormat([]provisionerDaemonRow{}, []string{"created at", "last seen at", "key name", "name", "version", "status", "tags"}),
|
|
cliui.JSONFormat(),
|
|
)
|
|
limit int64
|
|
offline bool
|
|
status []string
|
|
maxAge time.Duration
|
|
)
|
|
|
|
cmd := &serpent.Command{
|
|
Use: "list",
|
|
Short: "List provisioner daemons in an organization",
|
|
Aliases: []string{"ls"},
|
|
Middleware: serpent.Chain(
|
|
serpent.RequireNArgs(0),
|
|
r.InitClient(client),
|
|
),
|
|
Handler: func(inv *serpent.Invocation) error {
|
|
ctx := inv.Context()
|
|
|
|
org, err := orgContext.Selected(inv, client)
|
|
if err != nil {
|
|
return xerrors.Errorf("current organization: %w", err)
|
|
}
|
|
|
|
daemons, err := client.OrganizationProvisionerDaemons(ctx, org.ID, &codersdk.OrganizationProvisionerDaemonsOptions{
|
|
Limit: int(limit),
|
|
Offline: offline,
|
|
Status: slice.StringEnums[codersdk.ProvisionerDaemonStatus](status),
|
|
MaxAge: maxAge,
|
|
})
|
|
if err != nil {
|
|
return xerrors.Errorf("list provisioner daemons: %w", err)
|
|
}
|
|
|
|
if len(daemons) == 0 {
|
|
_, _ = fmt.Fprintln(inv.Stdout, "No provisioner daemons found")
|
|
return nil
|
|
}
|
|
|
|
var rows []provisionerDaemonRow
|
|
for _, daemon := range daemons {
|
|
rows = append(rows, provisionerDaemonRow{
|
|
ProvisionerDaemon: daemon,
|
|
OrganizationName: org.HumanName(),
|
|
})
|
|
}
|
|
|
|
out, err := formatter.Format(ctx, rows)
|
|
if err != nil {
|
|
return xerrors.Errorf("display provisioner daemons: %w", err)
|
|
}
|
|
|
|
_, _ = fmt.Fprintln(inv.Stdout, out)
|
|
|
|
return nil
|
|
},
|
|
}
|
|
|
|
cmd.Options = append(cmd.Options, []serpent.Option{
|
|
{
|
|
Flag: "limit",
|
|
FlagShorthand: "l",
|
|
Env: "CODER_PROVISIONER_LIST_LIMIT",
|
|
Description: "Limit the number of provisioners returned.",
|
|
Default: "50",
|
|
Value: serpent.Int64Of(&limit),
|
|
},
|
|
{
|
|
Flag: "show-offline",
|
|
FlagShorthand: "f",
|
|
Env: "CODER_PROVISIONER_SHOW_OFFLINE",
|
|
Description: "Show offline provisioners.",
|
|
Value: serpent.BoolOf(&offline),
|
|
},
|
|
{
|
|
Flag: "status",
|
|
FlagShorthand: "s",
|
|
Env: "CODER_PROVISIONER_LIST_STATUS",
|
|
Description: "Filter by provisioner status.",
|
|
Value: serpent.EnumArrayOf(&status, slice.ToStrings(codersdk.ProvisionerDaemonStatusEnums())...),
|
|
},
|
|
{
|
|
Flag: "max-age",
|
|
FlagShorthand: "m",
|
|
Env: "CODER_PROVISIONER_LIST_MAX_AGE",
|
|
Description: "Filter provisioners by maximum age.",
|
|
Value: serpent.DurationOf(&maxAge),
|
|
},
|
|
}...)
|
|
|
|
orgContext.AttachOptions(cmd)
|
|
formatter.AttachOptions(&cmd.Options)
|
|
|
|
return cmd
|
|
}
|