fix coderd and cli tests

mafredri · mafredri · commit eb29bba31d14 · 2025-06-06T15:58:52.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -869,6 +869,9 @@ func (api *API) cleanupSubAgents(ctx context.Context) error {
 	if err != nil {
 		return xerrors.Errorf("list agents: %w", err)
 	}
+	if len(agents) == 0 {
+		return nil
+	}
 
 	api.mu.Lock()
 	defer api.mu.Unlock()
diff --git a/cli/open_test.go b/cli/open_test.go
@@ -306,8 +306,8 @@ func TestOpenVSCodeDevContainer(t *testing.T) {
 	containerFolder := "/workspace/coder"
 
 	ctrl := gomock.NewController(t)
-	mcl := acmock.NewMockContainerCLI(ctrl)
-	mcl.EXPECT().List(gomock.Any()).Return(
+	mccli := acmock.NewMockContainerCLI(ctrl)
+	mccli.EXPECT().List(gomock.Any()).Return(
 		codersdk.WorkspaceAgentListContainersResponse{
 			Containers: []codersdk.WorkspaceAgentContainer{
 				{
@@ -327,6 +327,8 @@ func TestOpenVSCodeDevContainer(t *testing.T) {
 			},
 		}, nil,
 	).AnyTimes()
+	// DetectArchitecture always returns "<none>" for this test to disable agent injection.
+	mccli.EXPECT().DetectArchitecture(gomock.Any(), gomock.Any()).Return("<none>", nil).AnyTimes()
 
 	client, workspace, agentToken := setupWorkspaceForAgent(t, func(agents []*proto.Agent) []*proto.Agent {
 		agents[0].Directory = agentDir
@@ -337,7 +339,7 @@ func TestOpenVSCodeDevContainer(t *testing.T) {
 
 	_ = agenttest.New(t, client.URL, agentToken, func(o *agent.Options) {
 		o.ExperimentalDevcontainersEnabled = true
-		o.ContainerAPIOptions = append(o.ContainerAPIOptions, agentcontainers.WithContainerCLI(mcl))
+		o.ContainerAPIOptions = append(o.ContainerAPIOptions, agentcontainers.WithContainerCLI(mccli))
 	})
 	_ = coderdtest.NewWorkspaceAgentWaiter(t, client, workspace.ID).Wait()
 
@@ -481,8 +483,8 @@ func TestOpenVSCodeDevContainer_NoAgentDirectory(t *testing.T) {
 	containerFolder := "/workspace/coder"
 
 	ctrl := gomock.NewController(t)
-	mcl := acmock.NewMockContainerCLI(ctrl)
-	mcl.EXPECT().List(gomock.Any()).Return(
+	mccli := acmock.NewMockContainerCLI(ctrl)
+	mccli.EXPECT().List(gomock.Any()).Return(
 		codersdk.WorkspaceAgentListContainersResponse{
 			Containers: []codersdk.WorkspaceAgentContainer{
 				{
@@ -502,6 +504,8 @@ func TestOpenVSCodeDevContainer_NoAgentDirectory(t *testing.T) {
 			},
 		}, nil,
 	).AnyTimes()
+	// DetectArchitecture always returns "<none>" for this test to disable agent injection.
+	mccli.EXPECT().DetectArchitecture(gomock.Any(), gomock.Any()).Return("<none>", nil).AnyTimes()
 
 	client, workspace, agentToken := setupWorkspaceForAgent(t, func(agents []*proto.Agent) []*proto.Agent {
 		agents[0].Name = agentName
@@ -511,7 +515,7 @@ func TestOpenVSCodeDevContainer_NoAgentDirectory(t *testing.T) {
 
 	_ = agenttest.New(t, client.URL, agentToken, func(o *agent.Options) {
 		o.ExperimentalDevcontainersEnabled = true
-		o.ContainerAPIOptions = append(o.ContainerAPIOptions, agentcontainers.WithContainerCLI(mcl))
+		o.ContainerAPIOptions = append(o.ContainerAPIOptions, agentcontainers.WithContainerCLI(mccli))
 	})
 	_ = coderdtest.NewWorkspaceAgentWaiter(t, client, workspace.ID).Wait()
 
diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -1397,14 +1397,15 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
 				agentcontainers.DevcontainerConfigFileLabel:  configFile,
 			}
 			devContainer = codersdk.WorkspaceAgentContainer{
-				ID:                uuid.NewString(),
-				CreatedAt:         dbtime.Now(),
-				FriendlyName:      testutil.GetRandomName(t),
-				Image:             "busybox:latest",
-				Labels:            dcLabels,
-				Running:           true,
-				Status:            "running",
-				DevcontainerDirty: true,
+				ID:                 uuid.NewString(),
+				CreatedAt:          dbtime.Now(),
+				FriendlyName:       testutil.GetRandomName(t),
+				Image:              "busybox:latest",
+				Labels:             dcLabels,
+				Running:            true,
+				Status:             "running",
+				DevcontainerDirty:  true,
+				DevcontainerStatus: codersdk.WorkspaceAgentDevcontainerStatusRunning,
 			}
 			plainContainer = codersdk.WorkspaceAgentContainer{
 				ID:           uuid.NewString(),
@@ -1419,29 +1420,31 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
 
 		for _, tc := range []struct {
 			name      string
-			setupMock func(*acmock.MockContainerCLI, *acmock.MockDevcontainerCLI) (status int)
+			setupMock func(mccli *acmock.MockContainerCLI, mdccli *acmock.MockDevcontainerCLI) (status int)
 		}{
 			{
 				name: "Recreate",
-				setupMock: func(mcl *acmock.MockContainerCLI, mdccli *acmock.MockDevcontainerCLI) int {
-					mcl.EXPECT().List(gomock.Any()).Return(codersdk.WorkspaceAgentListContainersResponse{
+				setupMock: func(mccli *acmock.MockContainerCLI, mdccli *acmock.MockDevcontainerCLI) int {
+					mccli.EXPECT().List(gomock.Any()).Return(codersdk.WorkspaceAgentListContainersResponse{
 						Containers: []codersdk.WorkspaceAgentContainer{devContainer},
 					}, nil).AnyTimes()
+					// DetectArchitecture always returns "<none>" for this test to disable agent injection.
+					mccli.EXPECT().DetectArchitecture(gomock.Any(), devContainer.ID).Return("<none>", nil).AnyTimes()
 					mdccli.EXPECT().Up(gomock.Any(), workspaceFolder, configFile, gomock.Any()).Return("someid", nil).Times(1)
 					return 0
 				},
 			},
 			{
 				name: "Container does not exist",
-				setupMock: func(mcl *acmock.MockContainerCLI, mdccli *acmock.MockDevcontainerCLI) int {
-					mcl.EXPECT().List(gomock.Any()).Return(codersdk.WorkspaceAgentListContainersResponse{}, nil).AnyTimes()
+				setupMock: func(mccli *acmock.MockContainerCLI, mdccli *acmock.MockDevcontainerCLI) int {
+					mccli.EXPECT().List(gomock.Any()).Return(codersdk.WorkspaceAgentListContainersResponse{}, nil).AnyTimes()
 					return http.StatusNotFound
 				},
 			},
 			{
 				name: "Not a devcontainer",
-				setupMock: func(mcl *acmock.MockContainerCLI, mdccli *acmock.MockDevcontainerCLI) int {
-					mcl.EXPECT().List(gomock.Any()).Return(codersdk.WorkspaceAgentListContainersResponse{
+				setupMock: func(mccli *acmock.MockContainerCLI, mdccli *acmock.MockDevcontainerCLI) int {
+					mccli.EXPECT().List(gomock.Any()).Return(codersdk.WorkspaceAgentListContainersResponse{
 						Containers: []codersdk.WorkspaceAgentContainer{plainContainer},
 					}, nil).AnyTimes()
 					return http.StatusNotFound
@@ -1452,9 +1455,9 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
 				t.Parallel()
 
 				ctrl := gomock.NewController(t)
-				mcl := acmock.NewMockContainerCLI(ctrl)
+				mccli := acmock.NewMockContainerCLI(ctrl)
 				mdccli := acmock.NewMockDevcontainerCLI(ctrl)
-				wantStatus := tc.setupMock(mcl, mdccli)
+				wantStatus := tc.setupMock(mccli, mdccli)
 				logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
 				client, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{
 					Logger: &logger,
@@ -1471,7 +1474,7 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
 					o.ExperimentalDevcontainersEnabled = true
 					o.ContainerAPIOptions = append(
 						o.ContainerAPIOptions,
-						agentcontainers.WithContainerCLI(mcl),
+						agentcontainers.WithContainerCLI(mccli),
 						agentcontainers.WithDevcontainerCLI(mdccli),
 						agentcontainers.WithWatcher(watcher.NewNoop()),
 					)

Original file line number	Diff line number	Diff line change
`@@ -869,6 +869,9 @@ func (api *API) cleanupSubAgents(ctx context.Context) error {`
`869`	`869`	`if err != nil {`
`870`	`870`	`return xerrors.Errorf("list agents: %w", err)`
`871`	`871`	`}`
	`872`	`+ if len(agents) == 0 {`
	`873`	`+ return nil`
	`874`	`+ }`
`872`	`875`
`873`	`876`	`api.mu.Lock()`
`874`	`877`	`defer api.mu.Unlock()`