From 89dcb39f735cf22ccc5322f5e49a4bc8e7ceeb55 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 7 Mar 2025 11:26:36 +0100 Subject: [PATCH 1/7] feat(cli): preserve order of table columns --- cli/cliui/table.go | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/cli/cliui/table.go b/cli/cliui/table.go index dde36da67d39b..478bbe2260f91 100644 --- a/cli/cliui/table.go +++ b/cli/cliui/table.go @@ -31,10 +31,33 @@ func Table() table.Writer { // e.g. `[]any{someRow, TableSeparator, someRow}` type TableSeparator struct{} -// filterTableColumns returns configurations to hide columns +// filterHeaders filters the headers to only include the columns +// that are provided in the array. If the array is empty, all +// headers are included. +func filterHeaders(header table.Row, columns []string) table.Row { + if len(columns) == 0 { + return header + } + + filteredHeaders := make(table.Row, len(columns)) + for i, column := range columns { + column = strings.ReplaceAll(column, "_", " ") + + for _, headerTextRaw := range header { + headerText, _ := headerTextRaw.(string) + if strings.EqualFold(column, headerText) { + filteredHeaders[i] = headerText + break + } + } + } + return filteredHeaders +} + +// createColumnConfigs returns configuration to hide columns // that are not provided in the array. If the array is empty, // no filtering will occur! -func filterTableColumns(header table.Row, columns []string) []table.ColumnConfig { +func createColumnConfigs(header table.Row, columns []string) []table.ColumnConfig { if len(columns) == 0 { return nil } @@ -157,10 +180,13 @@ func DisplayTable(out any, sort string, filterColumns []string) (string, error) func renderTable(out any, sort string, headers table.Row, filterColumns []string) (string, error) { v := reflect.Indirect(reflect.ValueOf(out)) + headers = filterHeaders(headers, filterColumns) + columnConfigs := createColumnConfigs(headers, filterColumns) + // Setup the table formatter. tw := Table() tw.AppendHeader(headers) - tw.SetColumnConfigs(filterTableColumns(headers, filterColumns)) + tw.SetColumnConfigs(columnConfigs) if sort != "" { tw.SortBy([]table.SortBy{{ Name: sort, From a7f72fc7851f99bd19953d9725eef16cae973171 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 7 Mar 2025 14:01:47 +0100 Subject: [PATCH 2/7] WIP --- cli/provisionerjobs.go | 2 +- cli/provisioners.go | 2 +- cli/testdata/TestProvisioners_Golden/list.golden | 2 +- cli/testdata/coder_provisioner_jobs_list_--help.golden | 2 +- cli/testdata/coder_provisioner_list.golden | 2 +- cli/testdata/coder_provisioner_list_--help.golden | 2 +- .../cli/testdata/coder_provisioner_jobs_list_--help.golden | 2 +- enterprise/cli/testdata/coder_provisioner_list_--help.golden | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/provisionerjobs.go b/cli/provisionerjobs.go index 17c5ad26fbaa7..d7d0f7f8922db 100644 --- a/cli/provisionerjobs.go +++ b/cli/provisionerjobs.go @@ -41,7 +41,7 @@ func (r *RootCmd) provisionerJobsList() *serpent.Command { client = new(codersdk.Client) orgContext = NewOrganizationContext() formatter = cliui.NewOutputFormatter( - cliui.TableFormat([]provisionerJobRow{}, []string{"created at", "id", "organization", "status", "type", "queue", "tags"}), + cliui.TableFormat([]provisionerJobRow{}, []string{"id", "created at", "status", "tags", "type", "organization", "queue"}), cliui.JSONFormat(), ) status []string diff --git a/cli/provisioners.go b/cli/provisioners.go index 5dd3a703619e5..3692ee5628eef 100644 --- a/cli/provisioners.go +++ b/cli/provisioners.go @@ -36,7 +36,7 @@ func (r *RootCmd) provisionerList() *serpent.Command { 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.TableFormat([]provisionerDaemonRow{}, []string{"created at", "last seen at", "name", "version", "tags", "key name", "status", "organization"}), cliui.JSONFormat(), ) limit int64 diff --git a/cli/testdata/TestProvisioners_Golden/list.golden b/cli/testdata/TestProvisioners_Golden/list.golden index 3f50f90746744..35844d8b9c50e 100644 --- a/cli/testdata/TestProvisioners_Golden/list.golden +++ b/cli/testdata/TestProvisioners_Golden/list.golden @@ -1,4 +1,4 @@ -ID CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION +ID CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION 00000000-0000-0000-aaaa-000000000000 ====[timestamp]===== ====[timestamp]===== default-provisioner v0.0.0-devel map[owner: scope:organization] built-in idle 00000000-0000-0000-bbbb-000000000001 succeeded Coder 00000000-0000-0000-aaaa-000000000001 ====[timestamp]===== ====[timestamp]===== provisioner-1 v0.0.0 map[foo:bar owner: scope:organization] built-in busy 00000000-0000-0000-bbbb-000000000002 running Coder 00000000-0000-0000-aaaa-000000000002 ====[timestamp]===== ====[timestamp]===== provisioner-2 v0.0.0 map[owner: scope:organization] built-in offline 00000000-0000-0000-bbbb-000000000003 succeeded Coder diff --git a/cli/testdata/coder_provisioner_jobs_list_--help.golden b/cli/testdata/coder_provisioner_jobs_list_--help.golden index d6eb9a7681a07..8df1df3bab395 100644 --- a/cli/testdata/coder_provisioner_jobs_list_--help.golden +++ b/cli/testdata/coder_provisioner_jobs_list_--help.golden @@ -11,7 +11,7 @@ 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|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: created at,id,organization,status,type,queue,tags) + -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|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: id,created at,status,tags,type,organization,queue) Columns to display in table output. -l, --limit int, $CODER_PROVISIONER_JOB_LIST_LIMIT (default: 50) diff --git a/cli/testdata/coder_provisioner_list.golden b/cli/testdata/coder_provisioner_list.golden index 056571547939e..84dfd7d53b8f8 100644 --- a/cli/testdata/coder_provisioner_list.golden +++ b/cli/testdata/coder_provisioner_list.golden @@ -1,2 +1,2 @@ -CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS ORGANIZATION +CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS ORGANIZATION ====[timestamp]===== ====[timestamp]===== test v0.0.0-devel map[owner: scope:organization] built-in idle Coder diff --git a/cli/testdata/coder_provisioner_list_--help.golden b/cli/testdata/coder_provisioner_list_--help.golden index ac889fb6dcf58..160137cb4430a 100644 --- a/cli/testdata/coder_provisioner_list_--help.golden +++ b/cli/testdata/coder_provisioner_list_--help.golden @@ -11,7 +11,7 @@ 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|key name|status|current job id|current job status|current job template name|current job template icon|current job template display name|previous job id|previous job status|previous job template name|previous job template icon|previous job template display name|organization] (default: name,organization,status,key name,created at,last seen at,version,tags) + -c, --column [id|organization id|created at|last seen at|name|version|api version|tags|key name|status|current job id|current job status|current job template name|current job template icon|current job template display name|previous job id|previous job status|previous job template name|previous job template icon|previous job template display name|organization] (default: created at,last seen at,name,version,tags,key name,status,organization) Columns to display in table output. -l, --limit int, $CODER_PROVISIONER_LIST_LIMIT (default: 50) diff --git a/enterprise/cli/testdata/coder_provisioner_jobs_list_--help.golden b/enterprise/cli/testdata/coder_provisioner_jobs_list_--help.golden index d6eb9a7681a07..8df1df3bab395 100644 --- a/enterprise/cli/testdata/coder_provisioner_jobs_list_--help.golden +++ b/enterprise/cli/testdata/coder_provisioner_jobs_list_--help.golden @@ -11,7 +11,7 @@ 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|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: created at,id,organization,status,type,queue,tags) + -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|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: id,created at,status,tags,type,organization,queue) Columns to display in table output. -l, --limit int, $CODER_PROVISIONER_JOB_LIST_LIMIT (default: 50) diff --git a/enterprise/cli/testdata/coder_provisioner_list_--help.golden b/enterprise/cli/testdata/coder_provisioner_list_--help.golden index ac889fb6dcf58..160137cb4430a 100644 --- a/enterprise/cli/testdata/coder_provisioner_list_--help.golden +++ b/enterprise/cli/testdata/coder_provisioner_list_--help.golden @@ -11,7 +11,7 @@ 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|key name|status|current job id|current job status|current job template name|current job template icon|current job template display name|previous job id|previous job status|previous job template name|previous job template icon|previous job template display name|organization] (default: name,organization,status,key name,created at,last seen at,version,tags) + -c, --column [id|organization id|created at|last seen at|name|version|api version|tags|key name|status|current job id|current job status|current job template name|current job template icon|current job template display name|previous job id|previous job status|previous job template name|previous job template icon|previous job template display name|organization] (default: created at,last seen at,name,version,tags,key name,status,organization) Columns to display in table output. -l, --limit int, $CODER_PROVISIONER_LIST_LIMIT (default: 50) From b9135f7f362a6aea04c7741c1387b1ccc1a39e90 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 7 Mar 2025 13:11:39 +0000 Subject: [PATCH 3/7] fix: padding --- cli/testdata/TestProvisioners_Golden/list.golden | 2 +- cli/testdata/coder_provisioner_list.golden | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/testdata/TestProvisioners_Golden/list.golden b/cli/testdata/TestProvisioners_Golden/list.golden index 35844d8b9c50e..3f50f90746744 100644 --- a/cli/testdata/TestProvisioners_Golden/list.golden +++ b/cli/testdata/TestProvisioners_Golden/list.golden @@ -1,4 +1,4 @@ -ID CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION +ID CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION 00000000-0000-0000-aaaa-000000000000 ====[timestamp]===== ====[timestamp]===== default-provisioner v0.0.0-devel map[owner: scope:organization] built-in idle 00000000-0000-0000-bbbb-000000000001 succeeded Coder 00000000-0000-0000-aaaa-000000000001 ====[timestamp]===== ====[timestamp]===== provisioner-1 v0.0.0 map[foo:bar owner: scope:organization] built-in busy 00000000-0000-0000-bbbb-000000000002 running Coder 00000000-0000-0000-aaaa-000000000002 ====[timestamp]===== ====[timestamp]===== provisioner-2 v0.0.0 map[owner: scope:organization] built-in offline 00000000-0000-0000-bbbb-000000000003 succeeded Coder diff --git a/cli/testdata/coder_provisioner_list.golden b/cli/testdata/coder_provisioner_list.golden index 84dfd7d53b8f8..056571547939e 100644 --- a/cli/testdata/coder_provisioner_list.golden +++ b/cli/testdata/coder_provisioner_list.golden @@ -1,2 +1,2 @@ -CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS ORGANIZATION +CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS ORGANIZATION ====[timestamp]===== ====[timestamp]===== test v0.0.0-devel map[owner: scope:organization] built-in idle Coder From dce4f57f9cd1b78289d33d3d4860a9e4be994117 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 7 Mar 2025 13:18:14 +0000 Subject: [PATCH 4/7] fix --- docs/reference/cli/provisioner_jobs_list.md | 2 +- docs/reference/cli/provisioner_list.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/cli/provisioner_jobs_list.md b/docs/reference/cli/provisioner_jobs_list.md index 2cd40049e2400..4a3a02bf39903 100644 --- a/docs/reference/cli/provisioner_jobs_list.md +++ b/docs/reference/cli/provisioner_jobs_list.md @@ -48,7 +48,7 @@ Select which organization (uuid or name) to use. | | | |---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Type | [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\|template version name\|template id\|template name\|template display name\|template icon\|workspace id\|workspace name\|organization\|queue] | -| Default | created at,id,organization,status,type,queue,tags | +| Default | id,created at,status,tags,type,organization,queue | Columns to display in table output. diff --git a/docs/reference/cli/provisioner_list.md b/docs/reference/cli/provisioner_list.md index 4aadb22064755..71dbce82acf8a 100644 --- a/docs/reference/cli/provisioner_list.md +++ b/docs/reference/cli/provisioner_list.md @@ -39,7 +39,7 @@ Select which organization (uuid or name) to use. | | | |---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Type | [id\|organization id\|created at\|last seen at\|name\|version\|api version\|tags\|key name\|status\|current job id\|current job status\|current job template name\|current job template icon\|current job template display name\|previous job id\|previous job status\|previous job template name\|previous job template icon\|previous job template display name\|organization] | -| Default | name,organization,status,key name,created at,last seen at,version,tags | +| Default | created at,last seen at,name,version,tags,key name,status,organization | Columns to display in table output. From a12a1a4c7dfff84b1819bfb51a669fd6928f5c85 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 10 Mar 2025 12:25:32 +0100 Subject: [PATCH 5/7] Update cli/provisionerjobs.go Co-authored-by: Mathias Fredriksson --- cli/provisionerjobs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/provisionerjobs.go b/cli/provisionerjobs.go index d7d0f7f8922db..c2b6b78658447 100644 --- a/cli/provisionerjobs.go +++ b/cli/provisionerjobs.go @@ -41,7 +41,7 @@ func (r *RootCmd) provisionerJobsList() *serpent.Command { client = new(codersdk.Client) orgContext = NewOrganizationContext() formatter = cliui.NewOutputFormatter( - cliui.TableFormat([]provisionerJobRow{}, []string{"id", "created at", "status", "tags", "type", "organization", "queue"}), + cliui.TableFormat([]provisionerJobRow{}, []string{"created at", "id", "type", "template display name", "status", "queue", "tags"}), cliui.JSONFormat(), ) status []string From ac8f567df45b618b47fa13c514df3a0d2f6bccc5 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 10 Mar 2025 12:25:39 +0100 Subject: [PATCH 6/7] Update cli/provisioners.go Co-authored-by: Mathias Fredriksson --- cli/provisioners.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/provisioners.go b/cli/provisioners.go index 3692ee5628eef..8f90a52589939 100644 --- a/cli/provisioners.go +++ b/cli/provisioners.go @@ -36,7 +36,7 @@ func (r *RootCmd) provisionerList() *serpent.Command { client = new(codersdk.Client) orgContext = NewOrganizationContext() formatter = cliui.NewOutputFormatter( - cliui.TableFormat([]provisionerDaemonRow{}, []string{"created at", "last seen at", "name", "version", "tags", "key name", "status", "organization"}), + cliui.TableFormat([]provisionerDaemonRow{}, []string{"created at", "last seen at", "key name", "name", "version", "status", "tags"}), cliui.JSONFormat(), ) limit int64 From b01c35ff0d82d499a38da61a7b9862eca3b0d193 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 10 Mar 2025 11:30:19 +0000 Subject: [PATCH 7/7] adjust order --- cli/testdata/coder_provisioner_jobs_list.golden | 6 +++--- cli/testdata/coder_provisioner_jobs_list_--help.golden | 2 +- cli/testdata/coder_provisioner_list.golden | 4 ++-- cli/testdata/coder_provisioner_list_--help.golden | 2 +- docs/reference/cli/provisioner_jobs_list.md | 2 +- docs/reference/cli/provisioner_list.md | 2 +- .../cli/testdata/coder_provisioner_jobs_list_--help.golden | 2 +- .../cli/testdata/coder_provisioner_list_--help.golden | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cli/testdata/coder_provisioner_jobs_list.golden b/cli/testdata/coder_provisioner_jobs_list.golden index b41f4fc531316..d5cc728a9f73a 100644 --- a/cli/testdata/coder_provisioner_jobs_list.golden +++ b/cli/testdata/coder_provisioner_jobs_list.golden @@ -1,3 +1,3 @@ -ID CREATED AT STATUS TAGS TYPE ORGANIZATION QUEUE -==========[version job ID]========== ====[timestamp]===== succeeded map[owner: scope:organization] template_version_import Coder -======[workspace build job ID]====== ====[timestamp]===== succeeded map[owner: scope:organization] workspace_build Coder +CREATED AT ID TYPE TEMPLATE DISPLAY NAME STATUS QUEUE TAGS +====[timestamp]===== ==========[version job ID]========== template_version_import succeeded map[owner: scope:organization] +====[timestamp]===== ======[workspace build job ID]====== workspace_build succeeded map[owner: scope:organization] diff --git a/cli/testdata/coder_provisioner_jobs_list_--help.golden b/cli/testdata/coder_provisioner_jobs_list_--help.golden index 8df1df3bab395..7a72605f0c288 100644 --- a/cli/testdata/coder_provisioner_jobs_list_--help.golden +++ b/cli/testdata/coder_provisioner_jobs_list_--help.golden @@ -11,7 +11,7 @@ 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|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: id,created at,status,tags,type,organization,queue) + -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|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: created at,id,type,template display name,status,queue,tags) Columns to display in table output. -l, --limit int, $CODER_PROVISIONER_JOB_LIST_LIMIT (default: 50) diff --git a/cli/testdata/coder_provisioner_list.golden b/cli/testdata/coder_provisioner_list.golden index 056571547939e..64941eebf5b89 100644 --- a/cli/testdata/coder_provisioner_list.golden +++ b/cli/testdata/coder_provisioner_list.golden @@ -1,2 +1,2 @@ -CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS ORGANIZATION -====[timestamp]===== ====[timestamp]===== test v0.0.0-devel map[owner: scope:organization] built-in idle Coder +CREATED AT LAST SEEN AT KEY NAME NAME VERSION STATUS TAGS +====[timestamp]===== ====[timestamp]===== built-in test v0.0.0-devel idle map[owner: scope:organization] diff --git a/cli/testdata/coder_provisioner_list_--help.golden b/cli/testdata/coder_provisioner_list_--help.golden index 160137cb4430a..7a1807bb012f5 100644 --- a/cli/testdata/coder_provisioner_list_--help.golden +++ b/cli/testdata/coder_provisioner_list_--help.golden @@ -11,7 +11,7 @@ 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|key name|status|current job id|current job status|current job template name|current job template icon|current job template display name|previous job id|previous job status|previous job template name|previous job template icon|previous job template display name|organization] (default: created at,last seen at,name,version,tags,key name,status,organization) + -c, --column [id|organization id|created at|last seen at|name|version|api version|tags|key name|status|current job id|current job status|current job template name|current job template icon|current job template display name|previous job id|previous job status|previous job template name|previous job template icon|previous job template display name|organization] (default: created at,last seen at,key name,name,version,status,tags) Columns to display in table output. -l, --limit int, $CODER_PROVISIONER_LIST_LIMIT (default: 50) diff --git a/docs/reference/cli/provisioner_jobs_list.md b/docs/reference/cli/provisioner_jobs_list.md index 4a3a02bf39903..a7f2fa74384d2 100644 --- a/docs/reference/cli/provisioner_jobs_list.md +++ b/docs/reference/cli/provisioner_jobs_list.md @@ -48,7 +48,7 @@ Select which organization (uuid or name) to use. | | | |---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Type | [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\|template version name\|template id\|template name\|template display name\|template icon\|workspace id\|workspace name\|organization\|queue] | -| Default | id,created at,status,tags,type,organization,queue | +| Default | created at,id,type,template display name,status,queue,tags | Columns to display in table output. diff --git a/docs/reference/cli/provisioner_list.md b/docs/reference/cli/provisioner_list.md index 71dbce82acf8a..128d76caf4c7e 100644 --- a/docs/reference/cli/provisioner_list.md +++ b/docs/reference/cli/provisioner_list.md @@ -39,7 +39,7 @@ Select which organization (uuid or name) to use. | | | |---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Type | [id\|organization id\|created at\|last seen at\|name\|version\|api version\|tags\|key name\|status\|current job id\|current job status\|current job template name\|current job template icon\|current job template display name\|previous job id\|previous job status\|previous job template name\|previous job template icon\|previous job template display name\|organization] | -| Default | created at,last seen at,name,version,tags,key name,status,organization | +| Default | created at,last seen at,key name,name,version,status,tags | Columns to display in table output. diff --git a/enterprise/cli/testdata/coder_provisioner_jobs_list_--help.golden b/enterprise/cli/testdata/coder_provisioner_jobs_list_--help.golden index 8df1df3bab395..7a72605f0c288 100644 --- a/enterprise/cli/testdata/coder_provisioner_jobs_list_--help.golden +++ b/enterprise/cli/testdata/coder_provisioner_jobs_list_--help.golden @@ -11,7 +11,7 @@ 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|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: id,created at,status,tags,type,organization,queue) + -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|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: created at,id,type,template display name,status,queue,tags) Columns to display in table output. -l, --limit int, $CODER_PROVISIONER_JOB_LIST_LIMIT (default: 50) diff --git a/enterprise/cli/testdata/coder_provisioner_list_--help.golden b/enterprise/cli/testdata/coder_provisioner_list_--help.golden index 160137cb4430a..7a1807bb012f5 100644 --- a/enterprise/cli/testdata/coder_provisioner_list_--help.golden +++ b/enterprise/cli/testdata/coder_provisioner_list_--help.golden @@ -11,7 +11,7 @@ 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|key name|status|current job id|current job status|current job template name|current job template icon|current job template display name|previous job id|previous job status|previous job template name|previous job template icon|previous job template display name|organization] (default: created at,last seen at,name,version,tags,key name,status,organization) + -c, --column [id|organization id|created at|last seen at|name|version|api version|tags|key name|status|current job id|current job status|current job template name|current job template icon|current job template display name|previous job id|previous job status|previous job template name|previous job template icon|previous job template display name|organization] (default: created at,last seen at,key name,name,version,status,tags) Columns to display in table output. -l, --limit int, $CODER_PROVISIONER_LIST_LIMIT (default: 50) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy