From f97cb5861a79cfbd856982ed7276946c3b465c0f Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Tue, 29 Nov 2022 21:23:22 +0000 Subject: [PATCH] Fix scope of dbTTL --- coderd/workspaces.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coderd/workspaces.go b/coderd/workspaces.go index d46b0d7d2cfab..f69a98b8f0741 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -672,10 +672,11 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) { var dbTTL sql.NullInt64 err := api.Database.InTx(func(s database.Store) error { + var validityErr error // don't override 0 ttl with template default here because it indicates disabled auto-stop - dbTTL, err := validWorkspaceTTLMillis(req.TTLMillis, 0) - if err != nil { - return codersdk.ValidationError{Field: "ttl_ms", Detail: err.Error()} + dbTTL, validityErr = validWorkspaceTTLMillis(req.TTLMillis, 0) + if validityErr != nil { + return codersdk.ValidationError{Field: "ttl_ms", Detail: validityErr.Error()} } if err := s.UpdateWorkspaceTTL(ctx, database.UpdateWorkspaceTTLParams{ ID: workspace.ID,