fix assignment to nil map

SasSwart · SasSwart · commit 93ff87267c24 · 2025-04-24T12:29:50.000Z
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -634,17 +634,17 @@ func createWorkspace(
 	}
 
 	var (
-		provisionerJob       *database.ProvisionerJob
-		workspaceBuild       *database.WorkspaceBuild
-		provisionerDaemons   []database.GetEligibleProvisionerDaemonsByProvisionerJobIDsRow
-		agentTokensByAgentID map[uuid.UUID]string
+		provisionerJob     *database.ProvisionerJob
+		workspaceBuild     *database.WorkspaceBuild
+		provisionerDaemons []database.GetEligibleProvisionerDaemonsByProvisionerJobIDsRow
 	)
 
 	err = api.Database.InTx(func(db database.Store) error {
 		var (
-			workspaceID      uuid.UUID
-			claimedWorkspace *database.Workspace
-			prebuildsClaimer = *api.PrebuildsClaimer.Load()
+			prebuildsClaimer     = *api.PrebuildsClaimer.Load()
+			workspaceID          uuid.UUID
+			claimedWorkspace     *database.Workspace
+			agentTokensByAgentID map[uuid.UUID]string
 		)
 
 		// If a template preset was chosen, try claim a prebuilt workspace.
@@ -689,6 +689,7 @@ func createWorkspace(
 				api.Logger.Error(ctx, "failed to retrieve running agents of claimed prebuilt workspace",
 					slog.F("workspace_id", claimedWorkspace.ID), slog.Error(err))
 			}
+			agentTokensByAgentID = make(map[uuid.UUID]string, len(agents))
 			for _, agent := range agents {
 				agentTokensByAgentID[agent.ID] = agent.AuthToken.String()
 			}

Original file line number	Diff line number	Diff line change
`@@ -634,17 +634,17 @@ func createWorkspace(`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`var (`
`637`		`- provisionerJob *database.ProvisionerJob`
`638`		`- workspaceBuild *database.WorkspaceBuild`
`639`		`- provisionerDaemons []database.GetEligibleProvisionerDaemonsByProvisionerJobIDsRow`
`640`		`- agentTokensByAgentID map[uuid.UUID]string`
	`637`	`+ provisionerJob *database.ProvisionerJob`
	`638`	`+ workspaceBuild *database.WorkspaceBuild`
	`639`	`+ provisionerDaemons []database.GetEligibleProvisionerDaemonsByProvisionerJobIDsRow`
`641`	`640`	`)`
`642`	`641`
`643`	`642`	`err = api.Database.InTx(func(db database.Store) error {`
`644`	`643`	`var (`
`645`		`- workspaceID uuid.UUID`
`646`		`- claimedWorkspace *database.Workspace`
`647`		`- prebuildsClaimer = *api.PrebuildsClaimer.Load()`
	`644`	`+ prebuildsClaimer = *api.PrebuildsClaimer.Load()`
	`645`	`+ workspaceID uuid.UUID`
	`646`	`+ claimedWorkspace *database.Workspace`
	`647`	`+ agentTokensByAgentID map[uuid.UUID]string`
`648`	`648`	`)`
`649`	`649`
`650`	`650`	`// If a template preset was chosen, try claim a prebuilt workspace.`
`@@ -689,6 +689,7 @@ func createWorkspace(`
`689`	`689`	`api.Logger.Error(ctx, "failed to retrieve running agents of claimed prebuilt workspace",`
`690`	`690`	`slog.F("workspace_id", claimedWorkspace.ID), slog.Error(err))`
`691`	`691`	`}`
	`692`	`+ agentTokensByAgentID = make(map[uuid.UUID]string, len(agents))`
`692`	`693`	`for _, agent := range agents {`
`693`	`694`	`agentTokensByAgentID[agent.ID] = agent.AuthToken.String()`
`694`	`695`	`}`