chore: fix tests and differences between sql and memory db

deansheather · deansheather · commit d54d7983e4c2 · 2023-03-01T17:11:51.000Z
diff --git a/cli/schedule_test.go b/cli/schedule_test.go
@@ -308,13 +308,16 @@ func TestScheduleOverride(t *testing.T) {
 			user      = coderdtest.CreateFirstUser(t, client)
 			version   = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 			_         = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
-			project   = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
-			workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, project.ID, func(cwr *codersdk.CreateWorkspaceRequest) {
+			template  = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
+			workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) {
 				cwr.TTLMillis = nil
 			})
 			cmdArgs   = []string{"schedule", "override-stop", workspace.Name, "1h"}
 			stdoutBuf = &bytes.Buffer{}
 		)
+		require.Zero(t, template.DefaultTTLMillis)
+		require.Zero(t, template.MaxTTLMillis)
+
 		// Unset the workspace TTL
 		err = client.UpdateWorkspaceTTL(ctx, workspace.ID, codersdk.UpdateWorkspaceTTLRequest{TTLMillis: nil})
 		require.NoError(t, err)
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -917,9 +917,6 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete
 				// The user is not permitted to set their own TTL.
 				deadline = time.Time{}
 			}
-			if deadline.IsZero() && templateSchedule.DefaultTTL > 0 {
-				deadline = now.Add(templateSchedule.DefaultTTL)
-			}
 			if templateSchedule.MaxTTL > 0 {
 				maxDeadline = now.Add(templateSchedule.MaxTTL)
 
diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go
@@ -836,12 +836,12 @@ func TestCompleteJob(t *testing.T) {
 				expectedMaxTTL:     0,
 			},
 			{
-				name:               "TemplateDefaultTTL",
+				name:               "TemplateDefaultTTLIgnored",
 				templateDefaultTTL: time.Hour,
 				templateMaxTTL:     0,
 				workspaceTTL:       0,
 				transition:         database.WorkspaceTransitionStart,
-				expectedTTL:        time.Hour,
+				expectedTTL:        0,
 				expectedMaxTTL:     0,
 			},
 			{
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -273,15 +273,13 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
 			return xerrors.Errorf("insert template: %s", err)
 		}
 
-		if defaultTTL != 0 || maxTTL != 0 {
-			dbTemplate, err = (*api.TemplateScheduleStore.Load()).SetTemplateScheduleOptions(ctx, tx, dbTemplate, provisionerdserver.TemplateScheduleOptions{
-				UserSchedulingEnabled: true,
-				DefaultTTL:            defaultTTL,
-				MaxTTL:                maxTTL,
-			})
-			if err != nil {
-				return xerrors.Errorf("set template schedule options: %s", err)
-			}
+		dbTemplate, err = (*api.TemplateScheduleStore.Load()).SetTemplateScheduleOptions(ctx, tx, dbTemplate, provisionerdserver.TemplateScheduleOptions{
+			UserSchedulingEnabled: true,
+			DefaultTTL:            defaultTTL,
+			MaxTTL:                maxTTL,
+		})
+		if err != nil {
+			return xerrors.Errorf("set template schedule options: %s", err)
 		}
 
 		templateAudit.New = dbTemplate
diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
@@ -54,11 +54,13 @@ func TestTemplates(t *testing.T) {
 		workspace2 := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) {
 			cwr.TTLMillis = &workspace2TTL
 		})
-		workspace3 := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) {
-			cwr.TTLMillis = nil
-		})
-
+		workspace3 := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
+		// To unset TTL you have to update, as setting a nil TTL on create
+		// copies the template default TTL.
 		ctx, _ := testutil.Context(t)
+		err := client.UpdateWorkspaceTTL(ctx, workspace3.ID, codersdk.UpdateWorkspaceTTLRequest{
+			TTLMillis: nil,
+		})
 
 		updated, err := client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
 			Name:                         template.Name,

Original file line number	Diff line number	Diff line change
`@@ -917,9 +917,6 @@ func (server Server) CompleteJob(ctx context.Context, completed proto.Complete`
`917`	`917`	`// The user is not permitted to set their own TTL.`
`918`	`918`	`deadline = time.Time{}`
`919`	`919`	`}`
`920`		`- if deadline.IsZero() && templateSchedule.DefaultTTL > 0 {`
`921`		`- deadline = now.Add(templateSchedule.DefaultTTL)`
`922`		`- }`
`923`	`920`	`if templateSchedule.MaxTTL > 0 {`
`924`	`921`	`maxDeadline = now.Add(templateSchedule.MaxTTL)`
`925`	`922`