make gen/fmt

sreya · sreya · commit 6d119f86b574 · 2023-07-11T02:49:35.000Z
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -5251,7 +5251,7 @@ func (q *fakeQuerier) UpdateWorkspaceLastUsedAt(_ context.Context, arg database.
 	return sql.ErrNoRows
 }
 
-func (q *fakeQuerier) UpdateWorkspaceLockedDeletingAt(ctx context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) error {
+func (q *fakeQuerier) UpdateWorkspaceLockedDeletingAt(_ context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) error {
 	if err := validateDatabaseType(arg); err != nil {
 		return err
 	}
@@ -5370,18 +5370,18 @@ func (q *fakeQuerier) UpdateWorkspacesDeletingAtByTemplateID(_ context.Context,
 		return err
 	}
 
-	if arg.LockedTtlMs == 0 {
-		return nil
-	}
-
-	for _, ws := range q.workspaces {
+	for i, ws := range q.workspaces {
 		if ws.LockedAt.Time.IsZero() {
 			continue
 		}
-		ws.DeletingAt = sql.NullTime{
-			Valid: true,
-			Time:  ws.LockedAt.Time.Add(time.Duration(arg.LockedTtlMs) * time.Millisecond),
+		deletingAt := sql.NullTime{
+			Valid: arg.LockedTtlMs > 0,
+		}
+		if arg.LockedTtlMs > 0 {
+			deletingAt.Time = ws.LockedAt.Time.Add(time.Duration(arg.LockedTtlMs) * time.Millisecond)
 		}
+		ws.DeletingAt = deletingAt
+		q.workspaces[i] = ws
 	}
 
 	return nil
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -800,7 +800,6 @@ func (api *API) putWorkspaceLock(rw http.ResponseWriter, r *http.Request) {
 		}
 		return nil
 	}, nil)
-
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Internal error updating workspace locked status.",
@@ -1133,9 +1132,7 @@ func convertWorkspace(
 		}
 	}
 
-	var (
-		ttlMillis = convertWorkspaceTTLMillis(workspace.Ttl)
-	)
+	ttlMillis := convertWorkspaceTTLMillis(workspace.Ttl)
 
 	return codersdk.Workspace{
 		ID:                                   workspace.ID,
diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -307,4 +307,3 @@ func websocketNetConn(ctx context.Context, conn *websocket.Conn, msgType websock
 		Conn:   nc,
 	}
 }
-

Original file line number	Diff line number	Diff line change
`@@ -5251,7 +5251,7 @@ func (q *fakeQuerier) UpdateWorkspaceLastUsedAt(_ context.Context, arg database.`
`5251`	`5251`	`return sql.ErrNoRows`
`5252`	`5252`	`}`
`5253`	`5253`
`5254`		`-func (q *fakeQuerier) UpdateWorkspaceLockedDeletingAt(ctx context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) error {`
	`5254`	`+func (q *fakeQuerier) UpdateWorkspaceLockedDeletingAt(_ context.Context, arg database.UpdateWorkspaceLockedDeletingAtParams) error {`
`5255`	`5255`	`if err := validateDatabaseType(arg); err != nil {`
`5256`	`5256`	`return err`
`5257`	`5257`	`}`
`@@ -5370,18 +5370,18 @@ func (q *fakeQuerier) UpdateWorkspacesDeletingAtByTemplateID(_ context.Context,`
`5370`	`5370`	`return err`
`5371`	`5371`	`}`
`5372`	`5372`
`5373`		`- if arg.LockedTtlMs == 0 {`
`5374`		`- return nil`
`5375`		`- }`
`5376`		`-`
`5377`		`- for _, ws := range q.workspaces {`
	`5373`	`+ for i, ws := range q.workspaces {`
`5378`	`5374`	`if ws.LockedAt.Time.IsZero() {`
`5379`	`5375`	`continue`
`5380`	`5376`	`}`
`5381`		`- ws.DeletingAt = sql.NullTime{`
`5382`		`- Valid: true,`
`5383`		`- Time: ws.LockedAt.Time.Add(time.Duration(arg.LockedTtlMs) * time.Millisecond),`
	`5377`	`+ deletingAt := sql.NullTime{`
	`5378`	`+ Valid: arg.LockedTtlMs > 0,`
	`5379`	`+ }`
	`5380`	`+ if arg.LockedTtlMs > 0 {`
	`5381`	`+ deletingAt.Time = ws.LockedAt.Time.Add(time.Duration(arg.LockedTtlMs) * time.Millisecond)`
`5384`	`5382`	`}`
	`5383`	`+ ws.DeletingAt = deletingAt`
	`5384`	`+ q.workspaces[i] = ws`
`5385`	`5385`	`}`
`5386`	`5386`
`5387`	`5387`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -800,7 +800,6 @@ func (api API) putWorkspaceLock(rw http.ResponseWriter, r http.Request) {`
`800`	`800`	`}`
`801`	`801`	`return nil`
`802`	`802`	`}, nil)`
`803`		`-`
`804`	`803`	`if err != nil {`
`805`	`804`	`httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{`
`806`	`805`	`Message: "Internal error updating workspace locked status.",`
`@@ -1133,9 +1132,7 @@ func convertWorkspace(`
`1133`	`1132`	`}`
`1134`	`1133`	`}`
`1135`	`1134`
`1136`		`- var (`
`1137`		`- ttlMillis = convertWorkspaceTTLMillis(workspace.Ttl)`
`1138`		`- )`
	`1135`	`+ ttlMillis := convertWorkspaceTTLMillis(workspace.Ttl)`
`1139`	`1136`
`1140`	`1137`	`return codersdk.Workspace{`
`1141`	`1138`	`ID: workspace.ID,`
Original file line number	Diff line number	Diff line change
`@@ -307,4 +307,3 @@ func websocketNetConn(ctx context.Context, conn *websocket.Conn, msgType websock`
`307`	`307`	`Conn: nc,`
`308`	`308`	`}`
`309`	`309`	`}`
`310`		`-`