fixup! allow setting template max_ttl to 0

johnstcn · johnstcn · commit 9f3713498f4d · 2022-08-24T13:02:37.000Z
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -461,9 +461,6 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 		if icon == "" {
 			icon = template.Icon
 		}
-		if maxTTL == 0 {
-			maxTTL = time.Duration(template.MaxTtl)
-		}
 		if minAutostartInterval == 0 {
 			minAutostartInterval = time.Duration(template.MinAutostartInterval)
 		}
diff --git a/coderd/templates_test.go b/coderd/templates_test.go
@@ -329,6 +329,32 @@ func TestPatchTemplateMeta(t *testing.T) {
 		assert.Equal(t, req.MinAutostartIntervalMillis, updated.MinAutostartIntervalMillis)
 	})
 
+	t.Run("NoMaxTTL", func(t *testing.T) {
+		t.Parallel()
+
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) {
+			ctr.MaxTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds())
+		})
+		req := codersdk.UpdateTemplateMeta{
+			MaxTTLMillis: 0,
+		}
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		_, err := client.UpdateTemplateMeta(ctx, template.ID, req)
+		require.NoError(t, err)
+
+		// Extra paranoid: did it _really_ happen?
+		updated, err := client.Template(ctx, template.ID)
+		require.NoError(t, err)
+		assert.Greater(t, updated.UpdatedAt, template.UpdatedAt)
+		assert.Equal(t, req.MaxTTLMillis, updated.MaxTTLMillis)
+	})
+
 	t.Run("MaxTTLTooLow", func(t *testing.T) {
 		t.Parallel()
 

Original file line number	Diff line number	Diff line change
`@@ -461,9 +461,6 @@ func (api API) patchTemplateMeta(rw http.ResponseWriter, r http.Request) {`
`461`	`461`	`if icon == "" {`
`462`	`462`	`icon = template.Icon`
`463`	`463`	`}`
`464`		`- if maxTTL == 0 {`
`465`		`- maxTTL = time.Duration(template.MaxTtl)`
`466`		`- }`
`467`	`464`	`if minAutostartInterval == 0 {`
`468`	`465`	`minAutostartInterval = time.Duration(template.MinAutostartInterval)`
`469`	`466`	`}`