remove more max ttl tests

Emyrk · Emyrk · commit 2dc865d3edeb · 2024-03-18T15:32:07.000-05:00
diff --git a/coderd/activitybump_test.go b/coderd/activitybump_test.go
@@ -31,10 +31,6 @@ func TestWorkspaceActivityBump(t *testing.T) {
 	setupActivityTest := func(t *testing.T, deadline ...time.Duration) (client *codersdk.Client, workspace codersdk.Workspace, assertBumped func(want bool)) {
 		t.Helper()
 		const ttl = time.Hour
-		maxTTL := time.Duration(0)
-		if len(deadline) > 0 {
-			maxTTL = deadline[0]
-		}
 
 		db, pubsub := dbtestutil.NewDB(t)
 		client = coderdtest.New(t, &coderdtest.Options{
@@ -73,8 +69,8 @@ func TestWorkspaceActivityBump(t *testing.T) {
 
 		var maxDeadline time.Time
 		// Update the max deadline.
-		if maxTTL != 0 {
-			maxDeadline = dbtime.Now().Add(maxTTL)
+		if len(deadline) > 0 {
+			maxDeadline = dbtime.Now().Add(deadline[0])
 		}
 
 		err := db.UpdateWorkspaceBuildDeadlineByID(ctx, database.UpdateWorkspaceBuildDeadlineByIDParams{
@@ -99,9 +95,9 @@ func TestWorkspaceActivityBump(t *testing.T) {
 		)
 		firstDeadline := workspace.LatestBuild.Deadline.Time
 
-		if maxTTL != 0 {
+		if !maxDeadline.IsZero() {
 			require.WithinDuration(t,
-				time.Now().Add(maxTTL),
+				maxDeadline,
 				workspace.LatestBuild.MaxDeadline.Time,
 				testutil.WaitMedium,
 			)
diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go
@@ -1024,220 +1024,6 @@ func TestCompleteJob(t *testing.T) {
 		require.False(t, job.Error.Valid)
 	})
 
-	// TODO(@dean): remove this legacy test for MaxTTL
-	t.Run("WorkspaceBuildLegacy", func(t *testing.T) {
-		t.Parallel()
-
-		cases := []struct {
-			name                  string
-			templateAllowAutostop bool
-			templateDefaultTTL    time.Duration
-			workspaceTTL          time.Duration
-			transition            database.WorkspaceTransition
-			// The TTL is actually a deadline time on the workspace_build row,
-			// so during the test this will be compared to be within 15 seconds
-			// of the expected value.
-			expectedTTL time.Duration
-		}{
-			{
-				name:                  "OK",
-				templateAllowAutostop: true,
-				templateDefaultTTL:    0,
-				workspaceTTL:          0,
-				transition:            database.WorkspaceTransitionStart,
-				expectedTTL:           0,
-			},
-			{
-				name:                  "Delete",
-				templateAllowAutostop: true,
-				templateDefaultTTL:    0,
-				workspaceTTL:          0,
-				transition:            database.WorkspaceTransitionDelete,
-				expectedTTL:           0,
-			},
-			{
-				name:                  "WorkspaceTTL",
-				templateAllowAutostop: true,
-				templateDefaultTTL:    0,
-				workspaceTTL:          time.Hour,
-				transition:            database.WorkspaceTransitionStart,
-				expectedTTL:           time.Hour,
-			},
-			{
-				name:                  "TemplateDefaultTTLIgnored",
-				templateAllowAutostop: true,
-				templateDefaultTTL:    time.Hour,
-				workspaceTTL:          0,
-				transition:            database.WorkspaceTransitionStart,
-				expectedTTL:           0,
-			},
-			{
-				name:                  "WorkspaceTTLOverridesTemplateDefaultTTL",
-				templateAllowAutostop: true,
-				templateDefaultTTL:    2 * time.Hour,
-				workspaceTTL:          time.Hour,
-				transition:            database.WorkspaceTransitionStart,
-				expectedTTL:           time.Hour,
-			},
-			{
-				name:                  "TemplateMaxTTL",
-				templateAllowAutostop: true,
-				templateDefaultTTL:    0,
-				workspaceTTL:          0,
-				transition:            database.WorkspaceTransitionStart,
-				expectedTTL:           0,
-			},
-			{
-				name:                  "TemplateMaxTTLOverridesWorkspaceTTL",
-				templateAllowAutostop: true,
-				templateDefaultTTL:    0,
-				workspaceTTL:          3 * time.Hour,
-				transition:            database.WorkspaceTransitionStart,
-				expectedTTL:           3 * time.Hour,
-			},
-			{
-				name:                  "TemplateMaxTTLOverridesTemplateDefaultTTL",
-				templateAllowAutostop: true,
-				templateDefaultTTL:    3 * time.Hour,
-				workspaceTTL:          0,
-				transition:            database.WorkspaceTransitionStart,
-				expectedTTL:           0,
-			},
-			{
-				name:                  "TemplateBlockWorkspaceTTL",
-				templateAllowAutostop: false,
-				templateDefaultTTL:    3 * time.Hour,
-				workspaceTTL:          4 * time.Hour,
-				transition:            database.WorkspaceTransitionStart,
-				expectedTTL:           3 * time.Hour,
-			},
-		}
-
-		for _, c := range cases {
-			c := c
-
-			t.Run(c.name, func(t *testing.T) {
-				t.Parallel()
-
-				tss := &atomic.Pointer[schedule.TemplateScheduleStore]{}
-				srv, db, ps, pd := setup(t, false, &overrides{templateScheduleStore: tss})
-
-				var store schedule.TemplateScheduleStore = schedule.MockTemplateScheduleStore{
-					GetFn: func(_ context.Context, _ database.Store, _ uuid.UUID) (schedule.TemplateScheduleOptions, error) {
-						return schedule.TemplateScheduleOptions{
-							UserAutostartEnabled: false,
-							UserAutostopEnabled:  c.templateAllowAutostop,
-							DefaultTTL:           c.templateDefaultTTL,
-						}, nil
-					},
-				}
-				tss.Store(&store)
-
-				org := dbgen.Organization(t, db, database.Organization{})
-				user := dbgen.User(t, db, database.User{})
-				template := dbgen.Template(t, db, database.Template{
-					Name:           "template",
-					Provisioner:    database.ProvisionerTypeEcho,
-					OrganizationID: org.ID,
-				})
-				version := dbgen.TemplateVersion(t, db, database.TemplateVersion{
-					TemplateID: uuid.NullUUID{
-						UUID:  template.ID,
-						Valid: true,
-					},
-					JobID: uuid.New(),
-				})
-				err := db.UpdateTemplateScheduleByID(ctx, database.UpdateTemplateScheduleByIDParams{
-					ID:                 template.ID,
-					UpdatedAt:          dbtime.Now(),
-					AllowUserAutostart: c.templateAllowAutostop,
-					DefaultTTL:         int64(c.templateDefaultTTL),
-				})
-				require.NoError(t, err)
-				file := dbgen.File(t, db, database.File{CreatedBy: user.ID})
-				workspaceTTL := sql.NullInt64{}
-				if c.workspaceTTL != 0 {
-					workspaceTTL = sql.NullInt64{
-						Int64: int64(c.workspaceTTL),
-						Valid: true,
-					}
-				}
-				workspace := dbgen.Workspace(t, db, database.Workspace{
-					TemplateID: template.ID,
-					Ttl:        workspaceTTL,
-				})
-				build := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
-					WorkspaceID:       workspace.ID,
-					TemplateVersionID: version.ID,
-					Transition:        c.transition,
-					Reason:            database.BuildReasonInitiator,
-				})
-				job := dbgen.ProvisionerJob(t, db, ps, database.ProvisionerJob{
-					FileID: file.ID,
-					Type:   database.ProvisionerJobTypeWorkspaceBuild,
-					Input: must(json.Marshal(provisionerdserver.WorkspaceProvisionJob{
-						WorkspaceBuildID: build.ID,
-					})),
-				})
-				_, err = db.AcquireProvisionerJob(ctx, database.AcquireProvisionerJobParams{
-					WorkerID: uuid.NullUUID{
-						UUID:  pd.ID,
-						Valid: true,
-					},
-					Types: []database.ProvisionerType{database.ProvisionerTypeEcho},
-				})
-				require.NoError(t, err)
-
-				publishedWorkspace := make(chan struct{})
-				closeWorkspaceSubscribe, err := ps.Subscribe(codersdk.WorkspaceNotifyChannel(build.WorkspaceID), func(_ context.Context, _ []byte) {
-					close(publishedWorkspace)
-				})
-				require.NoError(t, err)
-				defer closeWorkspaceSubscribe()
-				publishedLogs := make(chan struct{})
-				closeLogsSubscribe, err := ps.Subscribe(provisionersdk.ProvisionerJobLogsNotifyChannel(job.ID), func(_ context.Context, _ []byte) {
-					close(publishedLogs)
-				})
-				require.NoError(t, err)
-				defer closeLogsSubscribe()
-
-				_, err = srv.CompleteJob(ctx, &proto.CompletedJob{
-					JobId: job.ID.String(),
-					Type: &proto.CompletedJob_WorkspaceBuild_{
-						WorkspaceBuild: &proto.CompletedJob_WorkspaceBuild{
-							State: []byte{},
-							Resources: []*sdkproto.Resource{{
-								Name: "example",
-								Type: "aws_instance",
-							}},
-						},
-					},
-				})
-				require.NoError(t, err)
-
-				<-publishedWorkspace
-				<-publishedLogs
-
-				workspace, err = db.GetWorkspaceByID(ctx, workspace.ID)
-				require.NoError(t, err)
-				require.Equal(t, c.transition == database.WorkspaceTransitionDelete, workspace.Deleted)
-
-				workspaceBuild, err := db.GetWorkspaceBuildByID(ctx, build.ID)
-				require.NoError(t, err)
-
-				if c.expectedTTL == 0 {
-					require.True(t, workspaceBuild.Deadline.IsZero())
-				} else {
-					require.WithinDuration(t, time.Now().Add(c.expectedTTL), workspaceBuild.Deadline, 15*time.Second, "deadline does not match expected")
-				}
-
-				// Legacy TTL does not use scheduling requirements that will set
-				// a max deadline.
-				require.True(t, workspaceBuild.MaxDeadline.IsZero())
-			})
-		}
-	})
-
 	t.Run("WorkspaceBuild", func(t *testing.T) {
 		t.Parallel()
 
diff --git a/enterprise/coderd/schedule/template_test.go b/enterprise/coderd/schedule/template_test.go
@@ -293,8 +293,6 @@ func TestTemplateUpdateBuildDeadlines(t *testing.T) {
 				UserAutostartEnabled:     false,
 				UserAutostopEnabled:      false,
 				DefaultTTL:               0,
-				MaxTTL:                   0,
-				UseMaxTTL:                false,
 				AutostopRequirement:      autostopReq,
 				FailureTTL:               0,
 				TimeTilDormant:           0,
@@ -572,8 +570,6 @@ func TestTemplateUpdateBuildDeadlinesSkip(t *testing.T) {
 		UserAutostartEnabled: false,
 		UserAutostopEnabled:  false,
 		DefaultTTL:           0,
-		MaxTTL:               0,
-		UseMaxTTL:            false,
 		AutostopRequirement: agplschedule.TemplateAutostopRequirement{
 			// Every day
 			DaysOfWeek: 0b01111111,
