fix an issue in updating templates

sreya · sreya · commit 62357a70eb96 · 2023-06-29T04:01:31.000Z
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -534,7 +534,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 			req.MaxTTLMillis == time.Duration(template.MaxTTL).Milliseconds() &&
 			req.FailureTTLMillis == time.Duration(template.FailureTTL).Milliseconds() &&
 			req.InactivityTTLMillis == time.Duration(template.InactivityTTL).Milliseconds() &&
-			req.FailureTTLMillis == time.Duration(template.LockedTTL).Milliseconds() {
+			req.LockedTTLMillis == time.Duration(template.LockedTTL).Milliseconds() {
 			return nil
 		}
 
diff --git a/enterprise/coderd/coderdenttest/coderdenttest.go b/enterprise/coderd/coderdenttest/coderdenttest.go
@@ -112,6 +112,7 @@ type LicenseOptions struct {
 	Features    license.Features
 }
 
+// AddFullLicense generates a license with all features enabled.
 func AddFullLicense(t *testing.T, client *codersdk.Client) codersdk.License {
 	return AddLicense(t, client, LicenseOptions{AllFeatures: true})
 }
diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
@@ -206,6 +206,55 @@ func TestTemplates(t *testing.T) {
 		require.NoError(t, err)
 		require.EqualValues(t, exp, *ws.TTLMillis)
 	})
+
+	t.Run("CleanupTTLs", func(t *testing.T) {
+		t.Parallel()
+
+		ctx := testutil.Context(t, testutil.WaitMedium)
+		client := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				IncludeProvisionerDaemon: true,
+			},
+		})
+		user := coderdtest.CreateFirstUser(t, client)
+		_ = coderdenttest.AddFullLicense(t, client)
+
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
+		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
+		require.EqualValues(t, 0, template.InactivityTTLMillis)
+		require.EqualValues(t, 0, template.FailureTTLMillis)
+		require.EqualValues(t, 0, template.LockedTTLMillis)
+
+		var (
+			failureTTL    int64 = 1
+			inactivityTTL int64 = 2
+			lockedTTL     int64 = 3
+		)
+
+		updated, err := client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
+			Name:                         template.Name,
+			DisplayName:                  template.DisplayName,
+			Description:                  template.Description,
+			Icon:                         template.Icon,
+			AllowUserCancelWorkspaceJobs: template.AllowUserCancelWorkspaceJobs,
+			InactivityTTLMillis:          inactivityTTL,
+			FailureTTLMillis:             failureTTL,
+			LockedTTLMillis:              lockedTTL,
+		})
+		require.NoError(t, err)
+		require.Equal(t, failureTTL, updated.FailureTTLMillis)
+		require.Equal(t, inactivityTTL, updated.InactivityTTLMillis)
+		require.Equal(t, lockedTTL, updated.LockedTTLMillis)
+
+		// Validate fetching the template returns the same values as updating
+		// the template.
+		template, err = client.Template(ctx, template.ID)
+		require.NoError(t, err)
+		require.Equal(t, failureTTL, updated.FailureTTLMillis)
+		require.Equal(t, inactivityTTL, updated.InactivityTTLMillis)
+		require.Equal(t, lockedTTL, updated.LockedTTLMillis)
+	})
 }
 
 func TestTemplateACL(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ func (api API) patchTemplateMeta(rw http.ResponseWriter, r http.Request) {`
`534`	`534`	`req.MaxTTLMillis == time.Duration(template.MaxTTL).Milliseconds() &&`
`535`	`535`	`req.FailureTTLMillis == time.Duration(template.FailureTTL).Milliseconds() &&`
`536`	`536`	`req.InactivityTTLMillis == time.Duration(template.InactivityTTL).Milliseconds() &&`
`537`		`- req.FailureTTLMillis == time.Duration(template.LockedTTL).Milliseconds() {`
	`537`	`+ req.LockedTTLMillis == time.Duration(template.LockedTTL).Milliseconds() {`
`538`	`538`	`return nil`
`539`	`539`	`}`
`540`	`540`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ type LicenseOptions struct {`
`112`	`112`	`Features license.Features`
`113`	`113`	`}`
`114`	`114`
	`115`	`+// AddFullLicense generates a license with all features enabled.`
`115`	`116`	`func AddFullLicense(t testing.T, client codersdk.Client) codersdk.License {`
`116`	`117`	`return AddLicense(t, client, LicenseOptions{AllFeatures: true})`
`117`	`118`	`}`