add tests for default values

f0ssel · f0ssel · commit a1673649759a · 2022-11-09T19:11:37.000Z
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -341,7 +341,7 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
 		return
 	}
 
-	dbTTL, err := validWorkspaceTTLMillis(createWorkspace.TTLMillis, time.Duration(template.DefaultTtl))
+	dbTTL, err := validWorkspaceTTLMillis(createWorkspace.TTLMillis, template.DefaultTtl)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message:     "Invalid Workspace Time to Shutdown.",
@@ -729,7 +729,7 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
 			return xerrors.Errorf("fetch workspace template: %w", err)
 		}
 
-		dbTTL, err = validWorkspaceTTLMillis(req.TTLMillis, time.Duration(template.DefaultTtl))
+		dbTTL, err = validWorkspaceTTLMillis(req.TTLMillis, template.DefaultTtl)
 		if err != nil {
 			return codersdk.ValidationError{Field: "ttl_ms", Detail: err.Error()}
 		}
@@ -1087,9 +1087,16 @@ func convertWorkspaceTTLMillis(i sql.NullInt64) *int64 {
 	return &millis
 }
 
-func validWorkspaceTTLMillis(millis *int64, max time.Duration) (sql.NullInt64, error) {
+func validWorkspaceTTLMillis(millis *int64, def int64) (sql.NullInt64, error) {
 	if ptr.NilOrZero(millis) {
-		return sql.NullInt64{}, nil
+		if def == 0 {
+			return sql.NullInt64{}, nil
+		}
+
+		return sql.NullInt64{
+			Int64: def,
+			Valid: true,
+		}, nil
 	}
 
 	dur := time.Duration(*millis) * time.Millisecond
@@ -1102,11 +1109,6 @@ func validWorkspaceTTLMillis(millis *int64, max time.Duration) (sql.NullInt64, e
 		return sql.NullInt64{}, errTTLMax
 	}
 
-	// template level
-	if max > 0 && truncated > max {
-		return sql.NullInt64{}, xerrors.Errorf("time until shutdown must be below template maximum %s", max.String())
-	}
-
 	return sql.NullInt64{
 		Valid: true,
 		Int64: int64(truncated),
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -299,6 +299,38 @@ func TestPostWorkspacesByOrganization(t *testing.T) {
 			require.Equal(t, "time until shutdown must be at least one minute", apiErr.Validations[0].Detail)
 		})
 	})
+
+	t.Run("TemplateDefaultTTL", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
+		user := coderdtest.CreateFirstUser(t, client)
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+		exp := 24 * time.Hour.Milliseconds()
+		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) {
+			ctr.DefaultTTLMillis = &exp
+		})
+		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		// no TTL provided should use template default
+		req := codersdk.CreateWorkspaceRequest{
+			TemplateID: template.ID,
+			Name:       "testing",
+		}
+		ws, err := client.CreateWorkspace(ctx, template.OrganizationID, codersdk.Me, req)
+		require.NoError(t, err)
+		require.EqualValues(t, exp, *ws.TTLMillis)
+
+		// TTL provided should override template default
+		req.Name = "testing2"
+		exp = 1 * time.Hour.Milliseconds()
+		req.TTLMillis = &exp
+		ws, err = client.CreateWorkspace(ctx, template.OrganizationID, codersdk.Me, req)
+		require.NoError(t, err)
+		require.EqualValues(t, exp, *ws.TTLMillis)
+	})
 }
 
 func TestWorkspaceByOwnerAndName(t *testing.T) {
@@ -1135,25 +1167,6 @@ func TestWorkspaceUpdateTTL(t *testing.T) {
 			ttlMillis:     ptr.Ref((24*7*time.Hour + time.Minute).Milliseconds()),
 			expectedError: "time until shutdown must be less than 7 days",
 		},
-		{
-			name:          "above template maximum ttl",
-			ttlMillis:     ptr.Ref((12 * time.Hour).Milliseconds()),
-			expectedError: "ttl_ms: time until shutdown must be below template maximum 8h0m0s",
-			modifyTemplate: func(ctr *codersdk.CreateTemplateRequest) {
-				ctr.DefaultTTLMillis = ptr.Ref((8 * time.Hour).Milliseconds())
-			},
-		},
-		{
-			name:           "no template maximum ttl",
-			ttlMillis:      ptr.Ref((7 * 24 * time.Hour).Milliseconds()),
-			modifyTemplate: func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = ptr.Ref(int64(0)) },
-		},
-		{
-			name:           "above maximum ttl even with no template max",
-			ttlMillis:      ptr.Ref((365 * 24 * time.Hour).Milliseconds()),
-			expectedError:  "ttl_ms: time until shutdown must be less than 7 days",
-			modifyTemplate: func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = ptr.Ref(int64(0)) },
-		},
 	}
 
 	for _, testCase := range testCases {
