Skip to content

Commit 57a9de7

Browse files
Kira-PilotKira-Pilot
committed
removed workspace actions experiment
1 parent 6c984fa commit 57a9de7

File tree

8 files changed

+39
-21
lines changed

8 files changed

+39
-21
lines changed

‎coderd/apidoc/docs.go

Lines changed: 9 additions & 4 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: 9 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codersdk/deployment.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ const (
4646
FeatureAppearance FeatureName = "appearance"
4747
FeatureAdvancedTemplateScheduling FeatureName = "advanced_template_scheduling"
4848
FeatureWorkspaceProxy FeatureName = "workspace_proxy"
49-
FeatureWorkspaceActions FeatureName = "workspace_actions"
5049
)
5150

5251
// FeatureNames must be kept in-sync with the Feature enum above.
@@ -62,7 +61,6 @@ var FeatureNames = []FeatureName{
6261
FeatureAppearance,
6362
FeatureAdvancedTemplateScheduling,
6463
FeatureWorkspaceProxy,
65-
FeatureWorkspaceActions,
6664
}
6765

6866
// Humanize returns the feature name in a human-readable format.
@@ -1670,9 +1668,6 @@ const (
16701668
// feature is not yet complete in functionality.
16711669
ExperimentMoons Experiment = "moons"
16721670

1673-
// https://github.com/coder/coder/milestone/19
1674-
ExperimentWorkspaceActions Experiment = "workspace_actions"
1675-
16761671
// Add new experiments here!
16771672
// ExperimentExample Experiment = "example"
16781673
)

‎docs/api/schemas.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,10 +2502,9 @@ CreateParameterRequest is a structure used to create a new parameter value for a
25022502

25032503
#### Enumerated Values
25042504

2505-
| Value |
2506-
| ------------------- |
2507-
| `moons` |
2508-
| `workspace_actions` |
2505+
| Value |
2506+
| ------- |
2507+
| `moons` |
25092508

25102509
## codersdk.Feature
25112510

@@ -3866,8 +3865,10 @@ Parameter represents a set value for the scope.
38663865
"default_ttl_ms": 0,
38673866
"description": "string",
38683867
"display_name": "string",
3868+
"failure_ttl_ms": 0,
38693869
"icon": "string",
38703870
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
3871+
"inactivity_ttl_ms": 0,
38713872
"max_ttl_ms": 0,
38723873
"name": "string",
38733874
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
@@ -3892,8 +3893,10 @@ Parameter represents a set value for the scope.
38923893
| `default_ttl_ms` | integer | false | | |
38933894
| `description` | string | false | | |
38943895
| `display_name` | string | false | | |
3896+
| `failure_ttl_ms` | integer | false | | Failure ttl ms and InactivityTTLMillis are enterprise-only. Their values are used if your license is entitled to use the workspace actions feature |
38953897
| `icon` | string | false | | |
38963898
| `id` | string | false | | |
3899+
| `inactivity_ttl_ms` | integer | false | | |
38973900
| `max_ttl_ms` | integer | false | | Max ttl ms is an enterprise feature. It's value is only used if your license is entitled to use the advanced template scheduling feature. |
38983901
| `name` | string | false | | |
38993902
| `organization_id` | string | false | | |

‎docs/api/templates.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ curl -X GET http://coder-server:8080/api/v2/organizations/{organization}/templat
4747
"default_ttl_ms": 0,
4848
"description": "string",
4949
"display_name": "string",
50+
"failure_ttl_ms": 0,
5051
"icon": "string",
5152
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
53+
"inactivity_ttl_ms": 0,
5254
"max_ttl_ms": 0,
5355
"name": "string",
5456
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
@@ -86,8 +88,10 @@ Status Code **200**
8688
| `» default_ttl_ms` | integer | false | | |
8789
| `» description` | string | false | | |
8890
| `» display_name` | string | false | | |
91+
| `» failure_ttl_ms` | integer | false | | Failure ttl ms and InactivityTTLMillis are enterprise-only. Their values are used if your license is entitled to use the workspace actions feature |
8992
| `» icon` | string | false | | |
9093
| `» id` | string(uuid) | false | | |
94+
| `» inactivity_ttl_ms` | integer | false | | |
9195
| `» max_ttl_ms` | integer | false | | Max ttl ms is an enterprise feature. It's value is only used if your license is entitled to use the advanced template scheduling feature. |
9296
| `» name` | string | false | | |
9397
| `» organization_id` | string(uuid) | false | | |
@@ -176,8 +180,10 @@ curl -X POST http://coder-server:8080/api/v2/organizations/{organization}/templa
176180
"default_ttl_ms": 0,
177181
"description": "string",
178182
"display_name": "string",
183+
"failure_ttl_ms": 0,
179184
"icon": "string",
180185
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
186+
"inactivity_ttl_ms": 0,
181187
"max_ttl_ms": 0,
182188
"name": "string",
183189
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
@@ -301,8 +307,10 @@ curl -X GET http://coder-server:8080/api/v2/organizations/{organization}/templat
301307
"default_ttl_ms": 0,
302308
"description": "string",
303309
"display_name": "string",
310+
"failure_ttl_ms": 0,
304311
"icon": "string",
305312
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
313+
"inactivity_ttl_ms": 0,
306314
"max_ttl_ms": 0,
307315
"name": "string",
308316
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
@@ -628,8 +636,10 @@ curl -X GET http://coder-server:8080/api/v2/templates/{template} \
628636
"default_ttl_ms": 0,
629637
"description": "string",
630638
"display_name": "string",
639+
"failure_ttl_ms": 0,
631640
"icon": "string",
632641
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
642+
"inactivity_ttl_ms": 0,
633643
"max_ttl_ms": 0,
634644
"name": "string",
635645
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",
@@ -736,8 +746,10 @@ curl -X PATCH http://coder-server:8080/api/v2/templates/{template} \
736746
"default_ttl_ms": 0,
737747
"description": "string",
738748
"display_name": "string",
749+
"failure_ttl_ms": 0,
739750
"icon": "string",
740751
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
752+
"inactivity_ttl_ms": 0,
741753
"max_ttl_ms": 0,
742754
"name": "string",
743755
"organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6",

‎enterprise/coderd/coderd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ func (api *API) updateEntitlements(ctx context.Context) error {
326326
codersdk.FeatureExternalProvisionerDaemons: true,
327327
codersdk.FeatureAdvancedTemplateScheduling: true,
328328
codersdk.FeatureWorkspaceProxy: true,
329-
codersdk.FeatureWorkspaceActions: true,
330329
})
331330
if err != nil {
332331
return err

‎enterprise/coderd/coderd_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ func TestEntitlements(t *testing.T) {
5454
codersdk.FeatureExternalProvisionerDaemons: 1,
5555
codersdk.FeatureAdvancedTemplateScheduling: 1,
5656
codersdk.FeatureWorkspaceProxy: 1,
57-
codersdk.FeatureWorkspaceActions: 1,
5857
},
5958
GraceAt: time.Now().Add(59 * 24 * time.Hour),
6059
})

‎site/src/api/typesGenerated.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,8 +1365,8 @@ export const Entitlements: Entitlement[] = [
13651365
]
13661366

13671367
// From codersdk/deployment.go
1368-
export type Experiment = "moons" | "workspace_actions"
1369-
export const Experiments: Experiment[] = ["moons", "workspace_actions"]
1368+
export type Experiment = "moons"
1369+
export const Experiments: Experiment[] = ["moons"]
13701370

13711371
// From codersdk/deployment.go
13721372
export type FeatureName =
@@ -1380,7 +1380,6 @@ export type FeatureName =
13801380
| "scim"
13811381
| "template_rbac"
13821382
| "user_limit"
1383-
| "workspace_actions"
13841383
| "workspace_proxy"
13851384
export const FeatureNames: FeatureName[] = [
13861385
"advanced_template_scheduling",
@@ -1393,7 +1392,6 @@ export const FeatureNames: FeatureName[] = [
13931392
"scim",
13941393
"template_rbac",
13951394
"user_limit",
1396-
"workspace_actions",
13971395
"workspace_proxy",
13981396
]
13991397

0 commit comments

Comments
 (0)