opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't override 0 ttl with template default (#5151)

Browse Source
This commit is contained in:
Presley Pizzo
2022-11-23 10:30:38 -05:00
committed by GitHub
parent 59355431d0
commit 913e461f79
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/workspaces.go
+2 -9
View File
@@ -670,15 +670,8 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
var dbTTL sql.NullInt64
err := api.Database.InTx(func(s database.Store) error {
template, err := s.GetTemplateByID(ctx, workspace.TemplateID)
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Error fetching workspace template!",
})
return xerrors.Errorf("fetch workspace template: %w", err)
}
dbTTL, err = validWorkspaceTTLMillis(req.TTLMillis, template.DefaultTTL)
// 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()}
}