make fmt and linter happy

cstyan · cstyan · commit afe37c93fc6e · 2025-11-18T19:32:29.000Z
Signed-off-by: Callum Styan &lt;callumstyan@gmail.com&gt;
diff --git a/coderd/agentapi/cached_workspace.go b/coderd/agentapi/cached_workspace.go
@@ -1,8 +1,8 @@
 package agentapi
 
 import (
-	"sync"
 	"database/sql"
+	"sync"
 
 	"github.com/google/uuid"
 
@@ -36,6 +36,17 @@ type CachedWorkspaceFields struct {
 	AutostartSchedule sql.NullString
 }
 
+func (cws *CachedWorkspaceFields) Equal(cws2 *CachedWorkspaceFields) bool {
+	cws.lock.RLock()
+	defer cws.lock.RUnlock()
+	cws2.lock.RLock()
+	defer cws2.lock.RUnlock()
+
+	return cws.ID == cws2.ID && cws.OwnerID == cws2.OwnerID && cws.OrganizationID == cws2.OrganizationID &&
+		cws.TemplateID == cws2.TemplateID && cws.Name == cws2.Name && cws.OwnerUsername == cws2.OwnerUsername &&
+		cws.TemplateName == cws2.TemplateName && cws.AutostartSchedule == cws2.AutostartSchedule
+}
+
 func (cws *CachedWorkspaceFields) Clear() {
 	cws.lock.Lock()
 	defer cws.lock.Unlock()
@@ -64,7 +75,7 @@ func (cws *CachedWorkspaceFields) UpdateValues(ws database.Workspace) {
 
 func (cws *CachedWorkspaceFields) AsDatabaseWorkspace() database.Workspace {
 	cws.lock.RLock()
-	defer 	cws.lock.RUnlock()
+	defer cws.lock.RUnlock()
 	return database.Workspace{
 		ID:                cws.ID,
 		OwnerID:           cws.OwnerID,
diff --git a/coderd/agentapi/cached_workspace_test.go b/coderd/agentapi/cached_workspace_test.go
@@ -1,16 +1,18 @@
 package agentapi_test
 
-import(
+import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/coderd/agentapi"
 	"github.com/coder/coder/v2/coderd/database"
 )
 
 func TestCacheClear(t *testing.T) {
+	t.Parallel()
+
 	var (
 		user = database.User{
 			ID:       uuid.New(),
@@ -41,10 +43,12 @@ func TestCacheClear(t *testing.T) {
 
 	emptyCws := agentapi.CachedWorkspaceFields{}
 	workspaceAsCacheFields.Clear()
-	require.Equal(t, emptyCws, workspaceAsCacheFields)
+	require.True(t, emptyCws.Equal(&workspaceAsCacheFields))
 }
 
 func TestCacheUpdate(t *testing.T) {
+	t.Parallel()
+
 	var (
 		user = database.User{
 			ID:       uuid.New(),
@@ -75,5 +79,5 @@ func TestCacheUpdate(t *testing.T) {
 
 	cws := agentapi.CachedWorkspaceFields{}
 	cws.UpdateValues(workspace)
-	require.Equal(t, workspaceAsCacheFields, cws)
+	require.True(t, workspaceAsCacheFields.Equal(&cws))
 }
diff --git a/coderd/agentapi/stats_test.go b/coderd/agentapi/stats_test.go
@@ -339,8 +339,9 @@ func TestUpdateStates(t *testing.T) {
 				},
 			}
 		)
-		// need to overwrite the cached fields for this test
-		ws := workspaceAsCacheFields
+		// need to overwrite the cached fields for this test, but the struct has a lock
+		ws := agentapi.CachedWorkspaceFields{}
+		ws.UpdateValues(workspace)
 		ws.AutostartSchedule = workspace.AutostartSchedule
 
 		api := agentapi.StatsAPI{

Original file line number	Diff line number	Diff line change
`@@ -339,8 +339,9 @@ func TestUpdateStates(t *testing.T) {`
`339`	`339`	`},`
`340`	`340`	`}`
`341`	`341`	`)`
`342`		`- // need to overwrite the cached fields for this test`
`343`		`- ws := workspaceAsCacheFields`
	`342`	`+ // need to overwrite the cached fields for this test, but the struct has a lock`
	`343`	`+ ws := agentapi.CachedWorkspaceFields{}`
	`344`	`+ ws.UpdateValues(workspace)`
`344`	`345`	`ws.AutostartSchedule = workspace.AutostartSchedule`
`345`	`346`
`346`	`347`	`api := agentapi.StatsAPI{`