coder · mafredri · Jan 20, 2025 · Jan 16, 2025 · Jan 20, 2025 · Jan 20, 2025
diff --git a/cli/provisionerjobs.go b/cli/provisionerjobs.go
@@ -0,0 +1,126 @@
+package cli
+
+import (
+	"fmt"
+	"slices"
+
+	"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) provisionerJobs() *serpent.Command {
+	cmd := &serpent.Command{
+		Use:   "jobs",
+		Short: "View and manage provisioner jobs",
+		Handler: func(inv *serpent.Invocation) error {
+			return inv.Command.HelpHandler(inv)
+		},
+		Aliases: []string{"job"},
+		Children: []*serpent.Command{
+			r.provisionerJobsList(),
+		},
+	}
+	return cmd
+}
+
+func (r *RootCmd) provisionerJobsList() *serpent.Command {
+	type provisionerJobRow struct {
+		codersdk.ProvisionerJob `table:"provisioner_job,recursive_inline,nosort"`
+		OrganizationName        string `json:"organization_name" table:"organization"`
+		Queue                   string `json:"-" table:"queue"`
+	}
+
+	var (
+		client     = new(codersdk.Client)
+		orgContext = NewOrganizationContext()
+		formatter  = cliui.NewOutputFormatter(
+			cliui.TableFormat([]provisionerJobRow{}, []string{"created at", "id", "organization", "status", "type", "queue", "tags"}),
+			cliui.JSONFormat(),
+		)
+		status []string
+		limit  int64
+	)
+
+	cmd := &serpent.Command{
+		Use:     "list",
+		Short:   "List provisioner jobs",
+		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)
+			}
+
+			jobs, err := client.OrganizationProvisionerJobs(ctx, org.ID, &codersdk.OrganizationProvisionerJobsOptions{
+				Status: slice.StringEnums[codersdk.ProvisionerJobStatus](status),
+				Limit:  int(limit),
+			})
+			if err != nil {
+				return xerrors.Errorf("list provisioner jobs: %w", err)
+			}
+
+			if len(jobs) == 0 {
+				_, _ = fmt.Fprintln(inv.Stdout, "No provisioner jobs found")
+				return nil
+			}
+
+			var rows []provisionerJobRow
+			for _, job := range jobs {
+				row := provisionerJobRow{
+					ProvisionerJob:   job,
+					OrganizationName: org.HumanName(),
+				}
+				if job.Status == codersdk.ProvisionerJobPending {
+					row.Queue = fmt.Sprintf("%d/%d", job.QueuePosition, job.QueueSize)
+				}
+				rows = append(rows, row)
+			}
+			// Sort manually because the cliui table truncates timestamps and
+			// produces an unstable sort with timestamps that are all the same.
+			slices.SortStableFunc(rows, func(a provisionerJobRow, b provisionerJobRow) int {
+				return a.CreatedAt.Compare(b.CreatedAt)
+			})
+
+			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:          "status",
+			FlagShorthand: "s",
+			Env:           "CODER_PROVISIONER_JOB_LIST_STATUS",
+			Description:   "Filter by job status.",
+			Value:         serpent.EnumArrayOf(&status, slice.ToStrings(codersdk.ProvisionerJobStatusEnums())...),
+		},
+		{
+			Flag:          "limit",
+			FlagShorthand: "l",
+			Env:           "CODER_PROVISIONER_JOB_LIST_LIMIT",
+			Description:   "Limit the number of jobs returned.",
+			Default:       "50",
+			Value:         serpent.Int64Of(&limit),
+		},
+	}...)
+
+	orgContext.AttachOptions(cmd)
+	formatter.AttachOptions(&cmd.Options)
+
+	return cmd
+}
diff --git a/cli/provisioners.go b/cli/provisioners.go
@@ -0,0 +1,93 @@
+package cli
+
+import (
+	"fmt"
+
+	"golang.org/x/xerrors"
+
+	"github.com/coder/coder/v2/cli/cliui"
+	"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{"name", "organization", "status", "key name", "created at", "last seen at", "version", "tags"}),
+			cliui.JSONFormat(),
+		)
+	)
+
+	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, nil)
+			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
+		},
+	}
+
+	orgContext.AttachOptions(cmd)
+	formatter.AttachOptions(&cmd.Options)
+
+	return cmd
+}