Skip to content

Commit 98cc205

Browse files
committed
fix assignment to nil map
1 parent 5fbe51c commit 98cc205

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

coderd/workspaces.go

+8-9
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
"strconv"
1212
"time"
1313

14-
"github.com/coder/coder/v2/coderd/prebuilds"
15-
1614
"github.com/dustin/go-humanize"
1715
"github.com/go-chi/chi/v5"
1816
"github.com/google/uuid"
@@ -636,17 +634,17 @@ func createWorkspace(
636634
}
637635

638636
var (
639-
provisionerJob *database.ProvisionerJob
640-
workspaceBuild *database.WorkspaceBuild
641-
provisionerDaemons []database.GetEligibleProvisionerDaemonsByProvisionerJobIDsRow
642-
agentTokensByAgentID map[uuid.UUID]string
637+
provisionerJob *database.ProvisionerJob
638+
workspaceBuild *database.WorkspaceBuild
639+
provisionerDaemons []database.GetEligibleProvisionerDaemonsByProvisionerJobIDsRow
643640
)
644641
prebuildsClaimer := *api.PrebuildsClaimer.Load()
645642

646643
err = api.Database.InTx(func(db database.Store) error {
647644
var (
648-
workspaceID uuid.UUID
649-
claimedWorkspace *database.Workspace
645+
workspaceID uuid.UUID
646+
claimedWorkspace *database.Workspace
647+
agentTokensByAgentID map[uuid.UUID]string
650648
)
651649

652650
// If a template preset was chosen, try claim a prebuilt workspace.
@@ -685,12 +683,13 @@ func createWorkspace(
685683
} else {
686684
// Prebuild found!
687685
workspaceID = claimedWorkspace.ID
688-
initiatorID = prebuildClaimer.Initiator()
686+
initiatorID = prebuildsClaimer.Initiator()
689687
agents, err := db.GetWorkspaceAgentsInLatestBuildByWorkspaceID(ctx, claimedWorkspace.ID)
690688
if err != nil {
691689
api.Logger.Error(ctx, "failed to retrieve running agents of claimed prebuilt workspace",
692690
slog.F("workspace_id", claimedWorkspace.ID), slog.Error(err))
693691
}
692+
agentTokensByAgentID = make(map[uuid.UUID]string, len(agents))
694693
for _, agent := range agents {
695694
agentTokensByAgentID[agent.ID] = agent.AuthToken.String()
696695
}

0 commit comments

Comments
 (0)