diff --git a/cli/testdata/coder_provisioner_list_--help.golden b/cli/testdata/coder_provisioner_list_--help.golden
index a9943cb9da392..111eb8315b162 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|previous job id|previous job status|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: name,organization,status,key name,created at,last seen at,version,tags)
Columns to display in table output.
-o, --output table|json (default: table)
diff --git a/cli/testdata/coder_provisioner_list_--output_json.golden b/cli/testdata/coder_provisioner_list_--output_json.golden
index cd0c085a8cc4a..d6983d11e5fa3 100644
--- a/cli/testdata/coder_provisioner_list_--output_json.golden
+++ b/cli/testdata/coder_provisioner_list_--output_json.golden
@@ -20,7 +20,10 @@
"current_job": null,
"previous_job": {
"id": "======[workspace build job ID]======",
- "status": "succeeded"
+ "status": "succeeded",
+ "template_name": "",
+ "template_icon": "",
+ "template_display_name": ""
},
"organization_name": "Coder"
}
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
index 5e4fcb001cc36..b83dc98c2a2ce 100644
--- a/coderd/apidoc/docs.go
+++ b/coderd/apidoc/docs.go
@@ -13106,6 +13106,15 @@ const docTemplate = `{
"$ref": "#/definitions/codersdk.ProvisionerJobStatus"
}
]
+ },
+ "template_display_name": {
+ "type": "string"
+ },
+ "template_icon": {
+ "type": "string"
+ },
+ "template_name": {
+ "type": "string"
}
}
},
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
index 29658d0a5e7b9..8c9bf31ce9e8e 100644
--- a/coderd/apidoc/swagger.json
+++ b/coderd/apidoc/swagger.json
@@ -11835,6 +11835,15 @@
"$ref": "#/definitions/codersdk.ProvisionerJobStatus"
}
]
+ },
+ "template_display_name": {
+ "type": "string"
+ },
+ "template_icon": {
+ "type": "string"
+ },
+ "template_name": {
+ "type": "string"
}
}
},
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
index 60f05064b76ee..fec7157c5c715 100644
--- a/coderd/database/queries.sql.go
+++ b/coderd/database/queries.sql.go
@@ -5755,7 +5755,10 @@ SELECT
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
+ previous_job.job_status AS previous_job_status,
+ COALESCE(tmpl.name, ''::text) AS current_job_template_name,
+ COALESCE(tmpl.display_name, ''::text) AS current_job_template_display_name,
+ COALESCE(tmpl.icon, ''::text) AS current_job_template_icon
FROM
provisioner_daemons pd
JOIN
@@ -5780,6 +5783,10 @@ LEFT JOIN
LIMIT 1
)
)
+LEFT JOIN
+ template_versions version ON version.id = (current_job.input->>'template_version_id')::uuid
+LEFT JOIN
+ templates tmpl ON tmpl.id = version.template_id
WHERE
pd.organization_id = $2::uuid
AND (COALESCE(array_length($3::uuid[], 1), 0) = 0 OR pd.id = ANY($3::uuid[]))
@@ -5796,13 +5803,16 @@ type GetProvisionerDaemonsWithStatusByOrganizationParams struct {
}
type GetProvisionerDaemonsWithStatusByOrganizationRow struct {
- ProvisionerDaemon ProvisionerDaemon `db:"provisioner_daemon" json:"provisioner_daemon"`
- Status ProvisionerDaemonStatus `db:"status" json:"status"`
- KeyName string `db:"key_name" json:"key_name"`
- CurrentJobID uuid.NullUUID `db:"current_job_id" json:"current_job_id"`
- CurrentJobStatus NullProvisionerJobStatus `db:"current_job_status" json:"current_job_status"`
- PreviousJobID uuid.NullUUID `db:"previous_job_id" json:"previous_job_id"`
- PreviousJobStatus NullProvisionerJobStatus `db:"previous_job_status" json:"previous_job_status"`
+ ProvisionerDaemon ProvisionerDaemon `db:"provisioner_daemon" json:"provisioner_daemon"`
+ Status ProvisionerDaemonStatus `db:"status" json:"status"`
+ KeyName string `db:"key_name" json:"key_name"`
+ CurrentJobID uuid.NullUUID `db:"current_job_id" json:"current_job_id"`
+ CurrentJobStatus NullProvisionerJobStatus `db:"current_job_status" json:"current_job_status"`
+ PreviousJobID uuid.NullUUID `db:"previous_job_id" json:"previous_job_id"`
+ PreviousJobStatus NullProvisionerJobStatus `db:"previous_job_status" json:"previous_job_status"`
+ CurrentJobTemplateName string `db:"current_job_template_name" json:"current_job_template_name"`
+ CurrentJobTemplateDisplayName string `db:"current_job_template_display_name" json:"current_job_template_display_name"`
+ CurrentJobTemplateIcon string `db:"current_job_template_icon" json:"current_job_template_icon"`
}
func (q *sqlQuerier) GetProvisionerDaemonsWithStatusByOrganization(ctx context.Context, arg GetProvisionerDaemonsWithStatusByOrganizationParams) ([]GetProvisionerDaemonsWithStatusByOrganizationRow, error) {
@@ -5837,6 +5847,9 @@ func (q *sqlQuerier) GetProvisionerDaemonsWithStatusByOrganization(ctx context.C
&i.CurrentJobStatus,
&i.PreviousJobID,
&i.PreviousJobStatus,
+ &i.CurrentJobTemplateName,
+ &i.CurrentJobTemplateDisplayName,
+ &i.CurrentJobTemplateIcon,
); err != nil {
return nil, err
}
diff --git a/coderd/database/queries/provisionerdaemons.sql b/coderd/database/queries/provisionerdaemons.sql
index abf490c9ab47f..b003153ee939d 100644
--- a/coderd/database/queries/provisionerdaemons.sql
+++ b/coderd/database/queries/provisionerdaemons.sql
@@ -44,7 +44,10 @@ SELECT
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
+ previous_job.job_status AS previous_job_status,
+ COALESCE(tmpl.name, ''::text) AS current_job_template_name,
+ COALESCE(tmpl.display_name, ''::text) AS current_job_template_display_name,
+ COALESCE(tmpl.icon, ''::text) AS current_job_template_icon
FROM
provisioner_daemons pd
JOIN
@@ -69,6 +72,10 @@ LEFT JOIN
LIMIT 1
)
)
+LEFT JOIN
+ template_versions version ON version.id = (current_job.input->>'template_version_id')::uuid
+LEFT JOIN
+ templates tmpl ON tmpl.id = version.template_id
WHERE
pd.organization_id = @organization_id::uuid
AND (COALESCE(array_length(@ids::uuid[], 1), 0) = 0 OR pd.id = ANY(@ids::uuid[]))
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
index 30add82e3e287..bf4dfb6c4d7dd 100644
--- a/coderd/provisionerdaemons.go
+++ b/coderd/provisionerdaemons.go
@@ -59,8 +59,11 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
var currentJob, previousJob *codersdk.ProvisionerDaemonJob
if dbDaemon.CurrentJobID.Valid {
currentJob = &codersdk.ProvisionerDaemonJob{
- ID: dbDaemon.CurrentJobID.UUID,
- Status: codersdk.ProvisionerJobStatus(dbDaemon.CurrentJobStatus.ProvisionerJobStatus),
+ ID: dbDaemon.CurrentJobID.UUID,
+ Status: codersdk.ProvisionerJobStatus(dbDaemon.CurrentJobStatus.ProvisionerJobStatus),
+ TemplateName: dbDaemon.CurrentJobTemplateName,
+ TemplateIcon: dbDaemon.CurrentJobTemplateIcon,
+ TemplateDisplayName: dbDaemon.CurrentJobTemplateDisplayName,
}
}
if dbDaemon.PreviousJobID.Valid {
diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
index 9c8f131cca8a6..f6130f3b8235d 100644
--- a/codersdk/provisionerdaemons.go
+++ b/codersdk/provisionerdaemons.go
@@ -69,8 +69,11 @@ type ProvisionerDaemon struct {
}
type ProvisionerDaemonJob struct {
- ID uuid.UUID `json:"id" format:"uuid" table:"id"`
- Status ProvisionerJobStatus `json:"status" enums:"pending,running,succeeded,canceling,canceled,failed" table:"status"`
+ ID uuid.UUID `json:"id" format:"uuid" table:"id"`
+ Status ProvisionerJobStatus `json:"status" enums:"pending,running,succeeded,canceling,canceled,failed" table:"status"`
+ TemplateName string `json:"template_name" table:"template name"`
+ TemplateIcon string `json:"template_icon" table:"template icon"`
+ TemplateDisplayName string `json:"template_display_name" table:"template display name"`
}
// MatchedProvisioners represents the number of provisioner daemons
diff --git a/docs/reference/api/debug.md b/docs/reference/api/debug.md
index 63fd1aeda8f98..93fd3e7b638c2 100644
--- a/docs/reference/api/debug.md
+++ b/docs/reference/api/debug.md
@@ -309,7 +309,10 @@ curl -X GET http://coder-server:8080/api/v2/debug/health \
"created_at": "2019-08-24T14:15:22Z",
"current_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
"key_id": "1e779c8a-6786-4c89-b7c3-a6666f5fd6b5",
@@ -319,7 +322,10 @@ curl -X GET http://coder-server:8080/api/v2/debug/health \
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
"previous_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"provisioners": [
"string"
diff --git a/docs/reference/api/enterprise.md b/docs/reference/api/enterprise.md
index a1a61f4a5b54a..282cf20ab252d 100644
--- a/docs/reference/api/enterprise.md
+++ b/docs/reference/api/enterprise.md
@@ -1629,7 +1629,10 @@ curl -X GET http://coder-server:8080/api/v2/organizations/{organization}/provisi
"created_at": "2019-08-24T14:15:22Z",
"current_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
"key_id": "1e779c8a-6786-4c89-b7c3-a6666f5fd6b5",
@@ -1639,7 +1642,10 @@ curl -X GET http://coder-server:8080/api/v2/organizations/{organization}/provisi
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
"previous_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"provisioners": [
"string"
@@ -1676,34 +1682,37 @@ curl -X GET http://coder-server:8080/api/v2/organizations/{organization}/provisi
Status Code **200**
-| Name | Type | Required | Restrictions | Description |
-|----------------------|--------------------------------------------------------------------------------|----------|--------------|------------------|
-| `[array item]` | array | false | | |
-| `» daemons` | array | false | | |
-| `»» api_version` | string | false | | |
-| `»» created_at` | string(date-time) | false | | |
-| `»» current_job` | [codersdk.ProvisionerDaemonJob](schemas.md#codersdkprovisionerdaemonjob) | false | | |
-| `»»» id` | string(uuid) | false | | |
-| `»»» status` | [codersdk.ProvisionerJobStatus](schemas.md#codersdkprovisionerjobstatus) | false | | |
-| `»» id` | string(uuid) | false | | |
-| `»» key_id` | string(uuid) | false | | |
-| `»» key_name` | string | false | | Optional fields. |
-| `»» last_seen_at` | string(date-time) | false | | |
-| `»» name` | string | false | | |
-| `»» organization_id` | string(uuid) | false | | |
-| `»» previous_job` | [codersdk.ProvisionerDaemonJob](schemas.md#codersdkprovisionerdaemonjob) | false | | |
-| `»» provisioners` | array | false | | |
-| `»» status` | [codersdk.ProvisionerDaemonStatus](schemas.md#codersdkprovisionerdaemonstatus) | false | | |
-| `»» tags` | object | false | | |
-| `»»» [any property]` | string | false | | |
-| `»» version` | string | false | | |
-| `» key` | [codersdk.ProvisionerKey](schemas.md#codersdkprovisionerkey) | false | | |
-| `»» created_at` | string(date-time) | false | | |
-| `»» id` | string(uuid) | false | | |
-| `»» name` | string | false | | |
-| `»» organization` | string(uuid) | false | | |
-| `»» tags` | [codersdk.ProvisionerKeyTags](schemas.md#codersdkprovisionerkeytags) | false | | |
-| `»»» [any property]` | string | false | | |
+| Name | Type | Required | Restrictions | Description |
+|-----------------------------|--------------------------------------------------------------------------------|----------|--------------|------------------|
+| `[array item]` | array | false | | |
+| `» daemons` | array | false | | |
+| `»» api_version` | string | false | | |
+| `»» created_at` | string(date-time) | false | | |
+| `»» current_job` | [codersdk.ProvisionerDaemonJob](schemas.md#codersdkprovisionerdaemonjob) | false | | |
+| `»»» id` | string(uuid) | false | | |
+| `»»» status` | [codersdk.ProvisionerJobStatus](schemas.md#codersdkprovisionerjobstatus) | false | | |
+| `»»» template_display_name` | string | false | | |
+| `»»» template_icon` | string | false | | |
+| `»»» template_name` | string | false | | |
+| `»» id` | string(uuid) | false | | |
+| `»» key_id` | string(uuid) | false | | |
+| `»» key_name` | string | false | | Optional fields. |
+| `»» last_seen_at` | string(date-time) | false | | |
+| `»» name` | string | false | | |
+| `»» organization_id` | string(uuid) | false | | |
+| `»» previous_job` | [codersdk.ProvisionerDaemonJob](schemas.md#codersdkprovisionerdaemonjob) | false | | |
+| `»» provisioners` | array | false | | |
+| `»» status` | [codersdk.ProvisionerDaemonStatus](schemas.md#codersdkprovisionerdaemonstatus) | false | | |
+| `»» tags` | object | false | | |
+| `»»» [any property]` | string | false | | |
+| `»» version` | string | false | | |
+| `» key` | [codersdk.ProvisionerKey](schemas.md#codersdkprovisionerkey) | false | | |
+| `»» created_at` | string(date-time) | false | | |
+| `»» id` | string(uuid) | false | | |
+| `»» name` | string | false | | |
+| `»» organization` | string(uuid) | false | | |
+| `»» tags` | [codersdk.ProvisionerKeyTags](schemas.md#codersdkprovisionerkeytags) | false | | |
+| `»»» [any property]` | string | false | | |
#### Enumerated Values
diff --git a/docs/reference/api/provisioning.md b/docs/reference/api/provisioning.md
index bf3c36269fafa..a8f7fd7e83214 100644
--- a/docs/reference/api/provisioning.md
+++ b/docs/reference/api/provisioning.md
@@ -31,7 +31,10 @@ curl -X GET http://coder-server:8080/api/v2/organizations/{organization}/provisi
"created_at": "2019-08-24T14:15:22Z",
"current_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
"key_id": "1e779c8a-6786-4c89-b7c3-a6666f5fd6b5",
@@ -41,7 +44,10 @@ curl -X GET http://coder-server:8080/api/v2/organizations/{organization}/provisi
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
"previous_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"provisioners": [
"string"
@@ -66,26 +72,29 @@ curl -X GET http://coder-server:8080/api/v2/organizations/{organization}/provisi
Status Code **200**
-| Name | Type | Required | Restrictions | Description |
-|---------------------|--------------------------------------------------------------------------------|----------|--------------|------------------|
-| `[array item]` | array | false | | |
-| `» api_version` | string | false | | |
-| `» created_at` | string(date-time) | false | | |
-| `» current_job` | [codersdk.ProvisionerDaemonJob](schemas.md#codersdkprovisionerdaemonjob) | false | | |
-| `»» id` | string(uuid) | false | | |
-| `»» status` | [codersdk.ProvisionerJobStatus](schemas.md#codersdkprovisionerjobstatus) | false | | |
-| `» id` | string(uuid) | false | | |
-| `» key_id` | string(uuid) | false | | |
-| `» key_name` | string | false | | Optional fields. |
-| `» last_seen_at` | string(date-time) | false | | |
-| `» name` | string | false | | |
-| `» organization_id` | string(uuid) | false | | |
-| `» previous_job` | [codersdk.ProvisionerDaemonJob](schemas.md#codersdkprovisionerdaemonjob) | false | | |
-| `» provisioners` | array | false | | |
-| `» status` | [codersdk.ProvisionerDaemonStatus](schemas.md#codersdkprovisionerdaemonstatus) | false | | |
-| `» tags` | object | false | | |
-| `»» [any property]` | string | false | | |
-| `» version` | string | false | | |
+| Name | Type | Required | Restrictions | Description |
+|----------------------------|--------------------------------------------------------------------------------|----------|--------------|------------------|
+| `[array item]` | array | false | | |
+| `» api_version` | string | false | | |
+| `» created_at` | string(date-time) | false | | |
+| `» current_job` | [codersdk.ProvisionerDaemonJob](schemas.md#codersdkprovisionerdaemonjob) | false | | |
+| `»» id` | string(uuid) | false | | |
+| `»» status` | [codersdk.ProvisionerJobStatus](schemas.md#codersdkprovisionerjobstatus) | false | | |
+| `»» template_display_name` | string | false | | |
+| `»» template_icon` | string | false | | |
+| `»» template_name` | string | false | | |
+| `» id` | string(uuid) | false | | |
+| `» key_id` | string(uuid) | false | | |
+| `» key_name` | string | false | | Optional fields. |
+| `» last_seen_at` | string(date-time) | false | | |
+| `» name` | string | false | | |
+| `» organization_id` | string(uuid) | false | | |
+| `» previous_job` | [codersdk.ProvisionerDaemonJob](schemas.md#codersdkprovisionerdaemonjob) | false | | |
+| `» provisioners` | array | false | | |
+| `» status` | [codersdk.ProvisionerDaemonStatus](schemas.md#codersdkprovisionerdaemonstatus) | false | | |
+| `» tags` | object | false | | |
+| `»» [any property]` | string | false | | |
+| `» version` | string | false | | |
#### Enumerated Values
diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md
index ebccd362c9c96..93870a2b584e2 100644
--- a/docs/reference/api/schemas.md
+++ b/docs/reference/api/schemas.md
@@ -4488,7 +4488,10 @@ Git clone makes use of this by parsing the URL from: 'Username for "https://gith
"created_at": "2019-08-24T14:15:22Z",
"current_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
"key_id": "1e779c8a-6786-4c89-b7c3-a6666f5fd6b5",
@@ -4498,7 +4501,10 @@ Git clone makes use of this by parsing the URL from: 'Username for "https://gith
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
"previous_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"provisioners": [
"string"
@@ -4545,16 +4551,22 @@ Git clone makes use of this by parsing the URL from: 'Username for "https://gith
```json
{
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
}
```
### Properties
-| Name | Type | Required | Restrictions | Description |
-|----------|----------------------------------------------------------------|----------|--------------|-------------|
-| `id` | string | false | | |
-| `status` | [codersdk.ProvisionerJobStatus](#codersdkprovisionerjobstatus) | false | | |
+| Name | Type | Required | Restrictions | Description |
+|-------------------------|----------------------------------------------------------------|----------|--------------|-------------|
+| `id` | string | false | | |
+| `status` | [codersdk.ProvisionerJobStatus](#codersdkprovisionerjobstatus) | false | | |
+| `template_display_name` | string | false | | |
+| `template_icon` | string | false | | |
+| `template_name` | string | false | | |
#### Enumerated Values
@@ -4810,7 +4822,10 @@ Git clone makes use of this by parsing the URL from: 'Username for "https://gith
"created_at": "2019-08-24T14:15:22Z",
"current_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
"key_id": "1e779c8a-6786-4c89-b7c3-a6666f5fd6b5",
@@ -4820,7 +4835,10 @@ Git clone makes use of this by parsing the URL from: 'Username for "https://gith
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
"previous_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"provisioners": [
"string"
@@ -9828,7 +9846,10 @@ Zero means unspecified. There might be a limit, but the client need not try to r
"created_at": "2019-08-24T14:15:22Z",
"current_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
"key_id": "1e779c8a-6786-4c89-b7c3-a6666f5fd6b5",
@@ -9838,7 +9859,10 @@ Zero means unspecified. There might be a limit, but the client need not try to r
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
"previous_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"provisioners": [
"string"
@@ -9964,7 +9988,10 @@ Zero means unspecified. There might be a limit, but the client need not try to r
"created_at": "2019-08-24T14:15:22Z",
"current_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
"key_id": "1e779c8a-6786-4c89-b7c3-a6666f5fd6b5",
@@ -9974,7 +10001,10 @@ Zero means unspecified. There might be a limit, but the client need not try to r
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
"previous_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"provisioners": [
"string"
@@ -10031,7 +10061,10 @@ Zero means unspecified. There might be a limit, but the client need not try to r
"created_at": "2019-08-24T14:15:22Z",
"current_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
"key_id": "1e779c8a-6786-4c89-b7c3-a6666f5fd6b5",
@@ -10041,7 +10074,10 @@ Zero means unspecified. There might be a limit, but the client need not try to r
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
"previous_job": {
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
- "status": "pending"
+ "status": "pending",
+ "template_display_name": "string",
+ "template_icon": "string",
+ "template_name": "string"
},
"provisioners": [
"string"
diff --git a/docs/reference/cli/provisioner_list.md b/docs/reference/cli/provisioner_list.md
index 11abd7dcc3d75..93718ddd01ea8 100644
--- a/docs/reference/cli/provisioner_list.md
+++ b/docs/reference/cli/provisioner_list.md
@@ -26,10 +26,10 @@ Select which organization (uuid or name) to use.
### -c, --column
-| | |
-|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Type | [id\|organization id\|created at\|last seen at\|name\|version\|api version\|tags\|key name\|status\|current job id\|current job status\|previous job id\|previous job status\|organization] |
-| Default | name,organization,status,key name,created at,last seen at,version,tags |
+| | |
+|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 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 |
Columns to display in table output.
diff --git a/enterprise/cli/testdata/coder_provisioner_list_--help.golden b/enterprise/cli/testdata/coder_provisioner_list_--help.golden
index a9943cb9da392..111eb8315b162 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|previous job id|previous job status|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: name,organization,status,key name,created at,last seen at,version,tags)
Columns to display in table output.
-o, --output table|json (default: table)
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
index 5ad807af38b6e..8a779cca7de3f 100644
--- a/site/src/api/typesGenerated.ts
+++ b/site/src/api/typesGenerated.ts
@@ -1591,6 +1591,9 @@ export interface ProvisionerDaemon {
export interface ProvisionerDaemonJob {
readonly id: string;
readonly status: ProvisionerJobStatus;
+ readonly template_name: string;
+ readonly template_icon: string;
+ readonly template_display_name: string;
}
// From codersdk/client.go