fixup some stuff

sreya · sreya · commit 0d8424602dd6 · 2023-06-28T01:45:58.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -2498,7 +2498,6 @@ func (q *querier) UpdateWorkspaceLockedAt(ctx context.Context, arg database.Upda
 		return q.db.GetWorkspaceByID(ctx, arg.ID)
 	}
 	return update(q.log, q.auth, fetch, q.db.UpdateWorkspaceLockedAt)(ctx, arg)
-
 }
 
 func (q *querier) UpdateWorkspaceProxy(ctx context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaces.sql b/coderd/database/queries/workspaces.sql
@@ -414,8 +414,6 @@ LEFT JOIN
 	workspace_builds ON workspace_builds.workspace_id = workspaces.id
 INNER JOIN
 	provisioner_jobs ON workspace_builds.job_id = provisioner_jobs.id
-INNER JOIN
-    templates ON workspaces.template_id = templates.id
 WHERE
 	workspace_builds.build_number = (
 		SELECT
diff --git a/coderd/rbac/roles.go b/coderd/rbac/roles.go
@@ -121,7 +121,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
 		opts = &RoleOptions{}
 	}
 
-	var ownerAndAdminExceptions = []Object{ResourceWorkspaceLocked}
+	ownerAndAdminExceptions := []Object{ResourceWorkspaceLocked}
 	if opts.NoOwnerWorkspaceExec {
 		ownerAndAdminExceptions = append(ownerAndAdminExceptions,
 			ResourceWorkspaceExecution,
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -1105,14 +1105,15 @@ func convertWorkspace(
 		autostartSchedule = &workspace.AutostartSchedule.String
 	}
 
+	var lockedAt *time.Time
+	if workspace.LockedAt.Valid {
+		lockedAt = &workspace.LockedAt.Time
+	}
+
 	var (
 		ttlMillis  = convertWorkspaceTTLMillis(workspace.Ttl)
 		deletingAt = calculateDeletingAt(workspace, template, workspaceBuild)
-		lockedAt   *time.Time
 	)
-	if workspace.LockedAt.Valid {
-		lockedAt = &workspace.LockedAt.Time
-	}
 
 	return codersdk.Workspace{
 		ID:                                   workspace.ID,

Original file line number	Diff line number	Diff line change
`@@ -2498,7 +2498,6 @@ func (q *querier) UpdateWorkspaceLockedAt(ctx context.Context, arg database.Upda`
`2498`	`2498`	`return q.db.GetWorkspaceByID(ctx, arg.ID)`
`2499`	`2499`	`}`
`2500`	`2500`	`return update(q.log, q.auth, fetch, q.db.UpdateWorkspaceLockedAt)(ctx, arg)`
`2501`		`-`
`2502`	`2501`	`}`
`2503`	`2502`
`2504`	`2503`	`func (q *querier) UpdateWorkspaceProxy(ctx context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {`
`121`	`121`	`opts = &RoleOptions{}`
`122`	`122`	`}`
`123`	`123`
`124`		`- var ownerAndAdminExceptions = []Object{ResourceWorkspaceLocked}`
	`124`	`+ ownerAndAdminExceptions := []Object{ResourceWorkspaceLocked}`
`125`	`125`	`if opts.NoOwnerWorkspaceExec {`
`126`	`126`	`ownerAndAdminExceptions = append(ownerAndAdminExceptions,`
`127`	`127`	`ResourceWorkspaceExecution,`