coder · Kira-Pilot · May 5, 2023 · May 1, 2023 · May 1, 2023 · May 3, 2023
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -34,6 +34,7 @@
     "Dsts",
     "embeddedpostgres",
     "enablements",
+    "enterprisemeta",
     "errgroup",
     "eventsourcemock",
     "Failf",

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/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -1945,6 +1945,8 @@ func (q *fakeQuerier) UpdateTemplateScheduleByID(_ context.Context, arg database
 		tpl.UpdatedAt = database.Now()
 		tpl.DefaultTTL = arg.DefaultTTL
 		tpl.MaxTTL = arg.MaxTTL
+		tpl.FailureTTL = arg.FailureTTL
+		tpl.InactivityTTL = arg.InactivityTTL
 		q.templates[idx] = tpl
 		return tpl.DeepCopy(), nil
 	}

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000122_add_template_cleanup_ttls.down.sql b/coderd/database/migrations/000122_add_template_cleanup_ttls.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ONLY templates DROP COLUMN IF EXISTS failure_ttl;
+ALTER TABLE ONLY templates DROP COLUMN IF EXISTS inactivity_ttl;
diff --git a/coderd/database/migrations/000122_add_template_cleanup_ttls.up.sql b/coderd/database/migrations/000122_add_template_cleanup_ttls.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ONLY templates ADD COLUMN IF NOT EXISTS failure_ttl BIGINT NOT NULL DEFAULT 0;
+ALTER TABLE ONLY templates ADD COLUMN IF NOT EXISTS inactivity_ttl BIGINT NOT NULL DEFAULT 0;
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -80,6 +80,8 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
 			&i.MaxTTL,
 			&i.AllowUserAutostart,
 			&i.AllowUserAutostop,
+			&i.FailureTTL,
+			&i.InactivityTTL,
 		); err != nil {
 			return nil, err
 		}

diff --git a/coderd/database/models.go b/coderd/database/models.go
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
@@ -118,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/database/sqlc.yaml b/coderd/database/sqlc.yaml
@@ -51,6 +51,8 @@ overrides:
       template_max_ttl: TemplateMaxTTL
       motd_file: MOTDFile
       uuid: UUID
+      failure_ttl: FailureTTL
+      inactivity_ttl: InactivityTTL
 
 sql:
   - schema: "./dump.sql"

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,
 	})
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE ONLY templates DROP COLUMN IF EXISTS failure_ttl;
		ALTER TABLE ONLY templates DROP COLUMN IF EXISTS inactivity_ttl;
Kira-Pilot marked this conversation as resolved. Show resolved Hide resolved
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE ONLY templates ADD COLUMN IF NOT EXISTS failure_ttl BIGINT NOT NULL DEFAULT 0;
		ALTER TABLE ONLY templates ADD COLUMN IF NOT EXISTS inactivity_ttl BIGINT NOT NULL DEFAULT 0;
Kira-Pilot marked this conversation as resolved. Show resolved Hide resolved