wip

coder · mafredri · Dec 19, 2024 · Dec 19, 2024 · Dec 19, 2024 · Dec 19, 2024
commit 449df5da84ad38747b25da41e6ced6cb8f6cca4c
diff --git a/cli/provisionerjobs.go b/cli/provisionerjobs.go
@@ -40,7 +40,7 @@ func (r *RootCmd) provisionerJobsList() *serpent.Command {
 			cliui.JSONFormat(),
 		)
 		status []string
-		limit  int64 = 50
+		limit  int64
 	)
 
 	cmd := &serpent.Command{
@@ -107,6 +107,7 @@ func (r *RootCmd) provisionerJobsList() *serpent.Command {
 			FlagShorthand: "l",
 			Env:           "CODER_PROVISIONER_JOB_LIST_LIMIT",
 			Description:   "Limit the number of jobs returned.",
+			Default:       "50",
 			Value:         serpent.Int64Of(&limit),
 		},
 	}...)

diff --git a/cli/testdata/coder_--help.golden b/cli/testdata/coder_--help.golden
@@ -35,6 +35,7 @@ SUBCOMMANDS:
     ping              Ping a workspace
     port-forward      Forward ports from a workspace to the local machine. For
                       reverse port forwarding, use "coder ssh -R".
+    provisioners      View and manage provisioner daemons and jobs
     publickey         Output your Coder public key used for Git operations
     rename            Rename a workspace
     reset-password    Directly connect to the database to reset a user's

diff --git a/cli/testdata/coder_list_--output_json.golden b/cli/testdata/coder_list_--output_json.golden
@@ -43,7 +43,12 @@
           "scope": "organization"
         },
         "queue_position": 0,
-        "queue_size": 0
+        "queue_size": 0,
+        "organization_id": "[first org ID]",
+        "input": {
+          "workspace_build_id": "[workspace build ID]"
+        },
+        "type": "workspace_build"
       },
       "reason": "initiator",
       "resources": [],

diff --git a/cli/testdata/coder_provisioners_--help.golden b/cli/testdata/coder_provisioners_--help.golden
@@ -0,0 +1,15 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners
+
+  View and manage provisioner daemons and jobs
+
+  Aliases: provisioner
+
+SUBCOMMANDS:
+    jobs    View and manage provisioner jobs
+    list    List provisioner daemons in an organization
+
+———
+Run `coder --help` for a list of global options.
diff --git a/cli/testdata/coder_provisioners_jobs_--help.golden b/cli/testdata/coder_provisioners_jobs_--help.golden
@@ -0,0 +1,14 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners jobs
+
+  View and manage provisioner jobs
+
+  Aliases: job
+
+SUBCOMMANDS:
+    list    List provisioner jobs
+
+———
+Run `coder --help` for a list of global options.
diff --git a/cli/testdata/coder_provisioners_jobs_list_--help.golden b/cli/testdata/coder_provisioners_jobs_list_--help.golden
@@ -0,0 +1,27 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners jobs list [flags]
+
+  List provisioner jobs
+
+  Aliases: ls
+
+OPTIONS:
+  -O, --org string, $CODER_ORGANIZATION
+          Select which organization (uuid or name) to use.
+
+  -c, --column [id|created at|started at|completed at|canceled at|error|error code|status|worker id|file id|tags|queue position|queue size|organization id|template version id|workspace build id|type|available workers|organization|queue] (default: created at,id,organization,status,type,queue,tags)
+          Columns to display in table output.
+
+  -l, --limit int, $CODER_PROVISIONER_JOB_LIST_LIMIT (default: 50)
+          Limit the number of jobs returned.
+
+  -o, --output table|json (default: table)
+          Output format.
+
+  -s, --status [pending|running|succeeded|canceling|canceled|failed|unknown], $CODER_PROVISIONER_JOB_LIST_STATUS
+          Filter by job status.
+
+———
+Run `coder --help` for a list of global options.
diff --git a/cli/testdata/coder_provisioners_list_--help.golden b/cli/testdata/coder_provisioners_list_--help.golden
@@ -0,0 +1,21 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners list [flags]
+
+  List provisioner daemons in an organization
+
+  Aliases: ls
+
+OPTIONS:
+  -O, --org string, $CODER_ORGANIZATION
+          Select which organization (uuid or name) to use.
+
+  -c, --column [id|organization id|created at|last seen at|name|version|api version|tags|status|current job id|current job status|previous job id|previous job status|organization] (default: name,organization,status,created at,last seen at,version,tags)
+          Columns to display in table output.
+
+  -o, --output table|json (default: table)
+          Output format.
+
+———
+Run `coder --help` for a list of global options.
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/provisionerdaemons.sql b/coderd/database/queries/provisionerdaemons.sql
@@ -39,13 +39,16 @@ SELECT
 			ELSE 'idle'
 		END
 	END::provisioner_daemon_status AS status,
+	pk.name AS type,
 	-- NOTE(mafredri): sqlc.embed doesn't support nullable tables nor renaming them.
 	current_job.id AS current_job_id,
 	current_job.job_status AS current_job_status,
 	previous_job.id AS previous_job_id,
 	previous_job.job_status AS previous_job_status
 FROM
 	provisioner_daemons pd
+JOIN
+	provisioner_keys pk ON pk.id = pd.key_id
 LEFT JOIN
 	provisioner_jobs current_job ON (
 		current_job.worker_id = pd.id

diff --git a/docs/manifest.json b/docs/manifest.json
@@ -1148,11 +1148,6 @@
 							"description": "View and manage provisioner jobs",
 							"path": "reference/cli/provisioners_jobs.md"
 						},
-						{
-							"title": "provisioners jobs cancel",
-							"description": "Cancel a provisioner job",
-							"path": "reference/cli/provisioners_jobs_cancel.md"
-						},
 						{
 							"title": "provisioners jobs list",
 							"description": "List provisioner jobs",

diff --git a/docs/reference/cli/provisioners_jobs.md b/docs/reference/cli/provisioners_jobs.md
diff --git a/docs/reference/cli/provisioners_jobs_cancel.md b/docs/reference/cli/provisioners_jobs_cancel.md
diff --git a/docs/reference/cli/provisioners_jobs_list.md b/docs/reference/cli/provisioners_jobs_list.md
diff --git a/docs/reference/cli/provisioners_keys_list.md b/docs/reference/cli/provisioners_keys_list.md
diff --git a/enterprise/cli/provisionerkeys.go b/enterprise/cli/provisionerkeys.go
@@ -138,8 +138,8 @@ func (r *RootCmd) provisionerKeysList() *serpent.Command {
 		},
 	}
 
-	cmd.Options = serpent.OptionSet{}
 	orgContext.AttachOptions(cmd)
+	formatter.AttachOptions(&cmd.Options)
 
 	return cmd
 }

diff --git a/enterprise/cli/testdata/coder_--help.golden b/enterprise/cli/testdata/coder_--help.golden
@@ -17,7 +17,7 @@ SUBCOMMANDS:
     features           List Enterprise features
     groups             Manage groups
     licenses           Add, delete, and list licenses
-    provisioner        Manage provisioner daemons
+    provisioners       View and manage provisioner daemons and jobs
     server             Start a Coder server
 
 GLOBAL OPTIONS: 

diff --git a/enterprise/cli/testdata/coder_provisioners_--help.golden b/enterprise/cli/testdata/coder_provisioners_--help.golden
@@ -0,0 +1,17 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners
+
+  View and manage provisioner daemons and jobs
+
+  Aliases: provisioner
+
+SUBCOMMANDS:
+    jobs     View and manage provisioner jobs
+    keys     Manage provisioner keys
+    list     List provisioner daemons in an organization
+    start    Run a provisioner daemon
+
+———
+Run `coder --help` for a list of global options.
diff --git a/enterprise/cli/testdata/coder_provisioners_jobs_--help.golden b/enterprise/cli/testdata/coder_provisioners_jobs_--help.golden
@@ -0,0 +1,14 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners jobs
+
+  View and manage provisioner jobs
+
+  Aliases: job
+
+SUBCOMMANDS:
+    list    List provisioner jobs
+
+———
+Run `coder --help` for a list of global options.
diff --git a/enterprise/cli/testdata/coder_provisioners_jobs_list_--help.golden b/enterprise/cli/testdata/coder_provisioners_jobs_list_--help.golden
@@ -0,0 +1,27 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners jobs list [flags]
+
+  List provisioner jobs
+
+  Aliases: ls
+
+OPTIONS:
+  -O, --org string, $CODER_ORGANIZATION
+          Select which organization (uuid or name) to use.
+
+  -c, --column [id|created at|started at|completed at|canceled at|error|error code|status|worker id|file id|tags|queue position|queue size|organization id|template version id|workspace build id|type|available workers|organization|queue] (default: created at,id,organization,status,type,queue,tags)
+          Columns to display in table output.
+
+  -l, --limit int, $CODER_PROVISIONER_JOB_LIST_LIMIT (default: 50)
+          Limit the number of jobs returned.
+
+  -o, --output table|json (default: table)
+          Output format.
+
+  -s, --status [pending|running|succeeded|canceling|canceled|failed|unknown], $CODER_PROVISIONER_JOB_LIST_STATUS
+          Filter by job status.
+
+———
+Run `coder --help` for a list of global options.
diff --git a/enterprise/cli/testdata/coder_provisioners_keys_--help.golden b/enterprise/cli/testdata/coder_provisioners_keys_--help.golden
@@ -0,0 +1,16 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners keys
+
+  Manage provisioner keys
+
+  Aliases: key
+
+SUBCOMMANDS:
+    create    Create a new provisioner key
+    delete    Delete a provisioner key
+    list      List provisioner keys in an organization
+
+———
+Run `coder --help` for a list of global options.
diff --git a/enterprise/cli/testdata/coder_provisioners_keys_create_--help.golden b/enterprise/cli/testdata/coder_provisioners_keys_create_--help.golden
@@ -0,0 +1,16 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners keys create [flags] <name>
+
+  Create a new provisioner key
+
+OPTIONS:
+  -O, --org string, $CODER_ORGANIZATION
+          Select which organization (uuid or name) to use.
+
+  -t, --tag string-array, $CODER_PROVISIONERD_TAGS
+          Tags to filter provisioner jobs by.
+
+———
+Run `coder --help` for a list of global options.
diff --git a/enterprise/cli/testdata/coder_provisioners_keys_delete_--help.golden b/enterprise/cli/testdata/coder_provisioners_keys_delete_--help.golden
@@ -0,0 +1,18 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners keys delete [flags] <name>
+
+  Delete a provisioner key
+
+  Aliases: rm
+
+OPTIONS:
+  -O, --org string, $CODER_ORGANIZATION
+          Select which organization (uuid or name) to use.
+
+  -y, --yes bool
+          Bypass prompts.
+
+———
+Run `coder --help` for a list of global options.
diff --git a/enterprise/cli/testdata/coder_provisioners_keys_list_--help.golden b/enterprise/cli/testdata/coder_provisioners_keys_list_--help.golden
@@ -0,0 +1,15 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder provisioners keys list [flags]
+
+  List provisioner keys in an organization
+
+  Aliases: ls
+
+OPTIONS:
+  -O, --org string, $CODER_ORGANIZATION
+          Select which organization (uuid or name) to use.
+
+———
+Run `coder --help` for a list of global options.