Skip to content

Commit 2b029d8

Browse files
deansheatherdeansheather
committed
fixup! Merge branch 'main' into dean/schedule-max-ttl
1 parent f62ba67 commit 2b029d8

File tree

8 files changed

+23
-0
lines changed

8 files changed

+23
-0
lines changed

‎coderd/apidoc/docs.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000102_workspace_build_max_deadline.down.sql renamed to ‎coderd/database/migrations/000103_workspace_build_max_deadline.down.sql

File renamed without changes.

‎coderd/database/migrations/000102_workspace_build_max_deadline.up.sql renamed to ‎coderd/database/migrations/000103_workspace_build_max_deadline.up.sql

File renamed without changes.

‎docs/api/builds.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ curl -X GET http://coder-server:8080/api/v2/users/{user}/workspace/{workspacenam
4949
},
5050
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
5151
},
52+
"max_deadline": "2019-08-24T14:15:22Z",
5253
"reason": "initiator",
5354
"resources": [
5455
{
@@ -195,6 +196,7 @@ curl -X GET http://coder-server:8080/api/v2/workspacebuilds/{workspacebuild} \
195196
},
196197
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
197198
},
199+
"max_deadline": "2019-08-24T14:15:22Z",
198200
"reason": "initiator",
199201
"resources": [
200202
{
@@ -708,6 +710,7 @@ curl -X GET http://coder-server:8080/api/v2/workspacebuilds/{workspacebuild}/sta
708710
},
709711
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
710712
},
713+
"max_deadline": "2019-08-24T14:15:22Z",
711714
"reason": "initiator",
712715
"resources": [
713716
{
@@ -859,6 +862,7 @@ curl -X GET http://coder-server:8080/api/v2/workspaces/{workspace}/builds \
859862
},
860863
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
861864
},
865+
"max_deadline": "2019-08-24T14:15:22Z",
862866
"reason": "initiator",
863867
"resources": [
864868
{
@@ -983,6 +987,7 @@ Status Code **200**
983987
| `»» tags` | object | false | | |
984988
| `»»» [any property]` | string | false | | |
985989
| `»» worker_id` | string(uuid) | false | | |
990+
| `» max_deadline` | string(date-time) | false | | |
986991
| `» reason` | [codersdk.BuildReason](schemas.md#codersdkbuildreason) | false | | |
987992
| `» resources` | array | false | | |
988993
| `»» agents` | array | false | | |
@@ -1175,6 +1180,7 @@ curl -X POST http://coder-server:8080/api/v2/workspaces/{workspace}/builds \
11751180
},
11761181
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
11771182
},
1183+
"max_deadline": "2019-08-24T14:15:22Z",
11781184
"reason": "initiator",
11791185
"resources": [
11801186
{

‎docs/api/schemas.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5304,6 +5304,7 @@ Parameter represents a set value for the scope.
53045304
},
53055305
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
53065306
},
5307+
"max_deadline": "2019-08-24T14:15:22Z",
53075308
"reason": "initiator",
53085309
"resources": [
53095310
{
@@ -5762,6 +5763,7 @@ Parameter represents a set value for the scope.
57625763
},
57635764
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
57645765
},
5766+
"max_deadline": "2019-08-24T14:15:22Z",
57655767
"reason": "initiator",
57665768
"resources": [
57675769
{
@@ -5865,6 +5867,7 @@ Parameter represents a set value for the scope.
58655867
| `initiator_id` | string | false | | |
58665868
| `initiator_name` | string | false | | |
58675869
| `job` | [codersdk.ProvisionerJob](#codersdkprovisionerjob) | false | | |
5870+
| `max_deadline` | string | false | | |
58685871
| `reason` | [codersdk.BuildReason](#codersdkbuildreason) | false | | |
58695872
| `resources` | array of [codersdk.WorkspaceResource](#codersdkworkspaceresource) | false | | |
58705873
| `status` | [codersdk.WorkspaceStatus](#codersdkworkspacestatus) | false | | |
@@ -6126,6 +6129,7 @@ Parameter represents a set value for the scope.
61266129
},
61276130
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
61286131
},
6132+
"max_deadline": "2019-08-24T14:15:22Z",
61296133
"reason": "initiator",
61306134
"resources": [
61316135
{

‎docs/api/workspaces.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ curl -X POST http://coder-server:8080/api/v2/organizations/{organization}/member
8181
},
8282
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
8383
},
84+
"max_deadline": "2019-08-24T14:15:22Z",
8485
"reason": "initiator",
8586
"resources": [
8687
{
@@ -246,6 +247,7 @@ curl -X GET http://coder-server:8080/api/v2/users/{user}/workspace/{workspacenam
246247
},
247248
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
248249
},
250+
"max_deadline": "2019-08-24T14:15:22Z",
249251
"reason": "initiator",
250252
"resources": [
251253
{
@@ -434,6 +436,7 @@ curl -X GET http://coder-server:8080/api/v2/workspaces \
434436
},
435437
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
436438
},
439+
"max_deadline": "2019-08-24T14:15:22Z",
437440
"reason": "initiator",
438441
"resources": [
439442
{
@@ -596,6 +599,7 @@ curl -X GET http://coder-server:8080/api/v2/workspaces/{workspace} \
596599
},
597600
"worker_id": "ae5fa6f7-c55b-40c1-b40a-b36ac467652b"
598601
},
602+
"max_deadline": "2019-08-24T14:15:22Z",
599603
"reason": "initiator",
600604
"resources": [
601605
{

‎site/src/api/typesGenerated.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,7 @@ export interface WorkspaceBuild {
10431043
readonly reason: BuildReason
10441044
readonly resources: WorkspaceResource[]
10451045
readonly deadline?: string
1046+
readonly max_deadline?: string
10461047
readonly status: WorkspaceStatus
10471048
readonly daily_cost: number
10481049
}

0 commit comments

Comments
 (0)