removing new route; repurposing old

coder · Kira-Pilot · May 5, 2023 · May 1, 2023 · May 1, 2023 · May 3, 2023
commit 537ced7def1deaf41ef6a279b220322294e2f52a
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -104,9 +104,7 @@ SET
 	name = $4,
 	icon = $5,
 	display_name = $6,
-	allow_user_cancel_workspace_jobs = $7,
-	failure_ttl = $8,
-	inactivity_ttl = $9
+	allow_user_cancel_workspace_jobs = $7
 WHERE
 	id = $1
 RETURNING
@@ -120,7 +118,9 @@ SET
 	allow_user_autostart = $3,
 	allow_user_autostop = $4,
 	default_ttl = $5,
-	max_ttl = $6
+	max_ttl = $6,
+	failure_ttl = $7,
+	inactivity_ttl = $8
 WHERE
 	id = $1
 RETURNING

diff --git a/coderd/schedule/template.go b/coderd/schedule/template.go
@@ -18,6 +18,10 @@ type TemplateScheduleOptions struct {
 	//
 	// If set, users cannot disable automatic workspace shutdown.
 	MaxTTL time.Duration `json:"max_ttl"`
+	// If FailureTTL is set, all failed workspaces will be stopped automatically after this time has elapsed.
+	FailureTTL time.Duration `json:"failure_ttl"`
+	// If InactivityTTL is set, all inactive workspaces will be deleted automatically after this time has elapsed.
+	InactivityTTL time.Duration `json:"inactivity_ttl"`
 }
 
 // TemplateScheduleStore provides an interface for retrieving template
@@ -47,9 +51,11 @@ func (*agplTemplateScheduleStore) GetTemplateScheduleOptions(ctx context.Context
 		UserAutostartEnabled: true,
 		UserAutostopEnabled:  true,
 		DefaultTTL:           time.Duration(tpl.DefaultTTL),
-		// Disregard the value in the database, since MaxTTL is an enterprise
-		// feature.
-		MaxTTL: 0,
+		// Disregard the values in the database, since MaxTTL, FailureTTL, and InactivityTTL are enterprise
+		// features.
+		MaxTTL:        0,
+		FailureTTL:    0,
+		InactivityTTL: 0,
 	}, nil
 }
 
@@ -68,5 +74,7 @@ func (*agplTemplateScheduleStore) SetTemplateScheduleOptions(ctx context.Context
 		AllowUserAutostart: tpl.AllowUserAutostart,
 		AllowUserAutostop:  tpl.AllowUserAutostop,
 		MaxTTL:             tpl.MaxTTL,
+		FailureTTL:         tpl.FailureTTL,
+		InactivityTTL:      tpl.InactivityTTL,
 	})
 }
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -476,6 +476,12 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 	if req.MaxTTLMillis != 0 && req.DefaultTTLMillis > req.MaxTTLMillis {
 		validErrs = append(validErrs, codersdk.ValidationError{Field: "default_ttl_ms", Detail: "Must be less than or equal to max_ttl_ms if max_ttl_ms is set."})
 	}
+	if req.FailureTTLMillis < 0 {
+		validErrs = append(validErrs, codersdk.ValidationError{Field: "failure_ttl_ms", Detail: "Must be a positive integer."})
+	}
+	if req.InactivityTTLMillis < 0 {
+		validErrs = append(validErrs, codersdk.ValidationError{Field: "inactivity_ttl_ms", Detail: "Must be a positive integer."})
+	}
 
 	if len(validErrs) > 0 {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
@@ -495,18 +501,14 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 			req.AllowUserAutostop == template.AllowUserAutostop &&
 			req.AllowUserCancelWorkspaceJobs == template.AllowUserCancelWorkspaceJobs &&
 			req.DefaultTTLMillis == time.Duration(template.DefaultTTL).Milliseconds() &&
-			req.MaxTTLMillis == time.Duration(template.MaxTTL).Milliseconds() {
+			req.MaxTTLMillis == time.Duration(template.MaxTTL).Milliseconds() &&
+			req.FailureTTLMillis == time.Duration(template.FailureTTL).Milliseconds() &&
+			req.InactivityTTLMillis == time.Duration(template.InactivityTTL).Milliseconds() {
 			return nil
 		}
 
-		// Update template metadata -- empty fields are not overwritten,
-		// except for display_name, description, icon, and default_ttl.
-		// These exceptions are required to clear content of these fields with UI.
+		// Users should not be able to clear the template name in the UI
 		name := req.Name
-		displayName := req.DisplayName
-		desc := req.Description
-		icon := req.Icon
-
 		if name == "" {
 			name = template.Name
 		}
@@ -516,9 +518,9 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 			ID:                           template.ID,
 			UpdatedAt:                    database.Now(),
 			Name:                         name,
-			DisplayName:                  displayName,
-			Description:                  desc,
-			Icon:                         icon,
+			DisplayName:                  req.DisplayName,
+			Description:                  req.Description,
+			Icon:                         req.Icon,
 			AllowUserCancelWorkspaceJobs: req.AllowUserCancelWorkspaceJobs,
 		})
 		if err != nil {
@@ -527,8 +529,13 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 
 		defaultTTL := time.Duration(req.DefaultTTLMillis) * time.Millisecond
 		maxTTL := time.Duration(req.MaxTTLMillis) * time.Millisecond
+		failureTTL := time.Duration(req.FailureTTLMillis) * time.Millisecond
+		inactivityTTL := time.Duration(req.InactivityTTLMillis) * time.Millisecond
+
 		if defaultTTL != time.Duration(template.DefaultTTL) ||
 			maxTTL != time.Duration(template.MaxTTL) ||
+			failureTTL != time.Duration(template.FailureTTL) ||
+			inactivityTTL != time.Duration(template.InactivityTTL) ||
 			req.AllowUserAutostart != template.AllowUserAutostart ||
 			req.AllowUserAutostop != template.AllowUserAutostop {
 			updated, err = (*api.TemplateScheduleStore.Load()).SetTemplateScheduleOptions(ctx, tx, updated, schedule.TemplateScheduleOptions{
@@ -539,6 +546,8 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 				UserAutostopEnabled:  req.AllowUserAutostop,
 				DefaultTTL:           defaultTTL,
 				MaxTTL:               maxTTL,
+				FailureTTL:           failureTTL,
+				InactivityTTL:        inactivityTTL,
 			})
 			if err != nil {
 				return xerrors.Errorf("set template schedule options: %w", err)

diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -95,11 +95,8 @@ type UpdateTemplateMeta struct {
 	AllowUserAutostart           bool  `json:"allow_user_autostart,omitempty"`
 	AllowUserAutostop            bool  `json:"allow_user_autostop,omitempty"`
 	AllowUserCancelWorkspaceJobs bool  `json:"allow_user_cancel_workspace_jobs,omitempty"`
-}
-
-type UpdateTemplateEnterpriseMeta struct {
-	FailureTTL    int64 `json:"failure_ttl,omitempty"`
-	InactivityTTL int64 `json:"inactivity_ttl,omitempty"`
+	FailureTTLMillis             int64 `json:"failure_ttl_ms,omitempty"`
+	InactivityTTLMillis          int64 `json:"inactivity_ttl_ms,omitempty"`
 }
 
 type TemplateExample struct {

diff --git a/docs/api/enterprise.md b/docs/api/enterprise.md
@@ -1122,61 +1122,6 @@ curl -X PATCH http://coder-server:8080/api/v2/templates/{template}/acl \
 
 To perform this operation, you must be authenticated. [Learn more](authentication.md).
 
-## Update template enterprise meta
-
-### Code samples
-
-```shell
-# Example request using curl
-curl -X PATCH http://coder-server:8080/api/v2/templates/{template}/enterprisemeta \
-  -H 'Content-Type: application/json' \
-  -H 'Accept: application/json' \
-  -H 'Coder-Session-Token: API_KEY'
-```
-
-`PATCH /templates/{template}/enterprisemeta`
-
-> Body parameter
-
-```json
-{
-  "failure_ttl": 0,
-  "inactivity_ttl": 0
-}
-```
-
-### Parameters
-
-| Name       | In   | Type                                                                                     | Required | Description                     |
-| ---------- | ---- | ---------------------------------------------------------------------------------------- | -------- | ------------------------------- |
-| `template` | path | string(uuid)                                                                             | true     | Template ID                     |
-| `body`     | body | [codersdk.UpdateTemplateEnterpriseMeta](schemas.md#codersdkupdatetemplateenterprisemeta) | true     | Update template enterprise meta |
-
-### Example responses
-
-> 200 Response
-
-```json
-{
-  "detail": "string",
-  "message": "string",
-  "validations": [
-    {
-      "detail": "string",
-      "field": "string"
-    }
-  ]
-}
-```
-
-### Responses
-
-| Status | Meaning                                                 | Description | Schema                                           |
-| ------ | ------------------------------------------------------- | ----------- | ------------------------------------------------ |
-| 200    | [OK](https://tools.ietf.org/html/rfc7231#section-6.3.1) | OK          | [codersdk.Response](schemas.md#codersdkresponse) |
-
-To perform this operation, you must be authenticated. [Learn more](authentication.md).
-
 ## Get workspace quota by user
 
 ### Code samples