Jun 18, 2025 · Jun 12, 2025 · Jun 12, 2025 · Jun 13, 2025 · Jun 13, 2025 · Jun 13, 2025
diff --git a/agent/agentcontainers/api_test.go b/agent/agentcontainers/api_test.go
 execErrC       chan func(cmd string, args ...string) error // If set, send fn to return err, nil or close to return execErr.
 readConfig     agentcontainers.DevcontainerConfig
 readConfigErr  error
 readConfigErrC chan func(envs []string)(agentcontainers.DevcontainerConfig,error)
 readConfigErrC chan func(envs []string) error
 }

 func (f *fakeDevcontainerCLI) Up(ctx context.Context, _, _ string, _ ...agentcontainers.DevcontainerCLIUpOptions) (string, error) {
 return agentcontainers.DevcontainerConfig{}, ctx.Err()
 case fn, ok := <-f.readConfigErrC:
 if ok {
 return fn(envs)
 returnf.readConfig,fn(envs)
 }
 }
 }
 }
 fakeDCCLI = &fakeDevcontainerCLI{
 execErrC:       make(chan func(cmd string, args ...string) error, 1),
 readConfigErrC: make(chan func(envs []string)(agentcontainers.DevcontainerConfig,error), 1),
 readConfigErrC: make(chan func(envs []string) error, 1),
 }

 testContainer = codersdk.WorkspaceAgentContainer{
 close(fakeSAC.createErrC)
 close(fakeSAC.deleteErrC)
 close(fakeDCCLI.execErrC)
 deferclose(fakeDCCLI.readConfigErrC)
 close(fakeDCCLI.readConfigErrC)

 _ = api.Close()
 })
 assert.Empty(t, args)
 return nil
 }) // Exec pwd.
 testutil.RequireSend(ctx, t, fakeDCCLI.readConfigErrC, func(envs []string)(agentcontainers.DevcontainerConfig,error) {
 testutil.RequireSend(ctx, t, fakeDCCLI.readConfigErrC, func(envs []string) error {
 assert.Contains(t, envs, "CODER_WORKSPACE_AGENT_NAME=test-container")
 assert.Contains(t, envs, "CODER_WORKSPACE_NAME=test-workspace")
 assert.Contains(t, envs, "CODER_WORKSPACE_OWNER_NAME=test-user")
 assert.Contains(t, envs, "CODER_DEPLOYMENT_URL=test-subagent-url")
 returnagentcontainers.DevcontainerConfig{},nil
 return nil
 })

 // Make sure the ticker function has been registered
 assert.Empty(t, args)
 return nil
 }) // Exec pwd.
 testutil.RequireSend(ctx, t, fakeDCCLI.readConfigErrC, func(envs []string)(agentcontainers.DevcontainerConfig,error) {
 testutil.RequireSend(ctx, t, fakeDCCLI.readConfigErrC, func(envs []string) error {
 assert.Contains(t, envs, "CODER_WORKSPACE_AGENT_NAME=test-container")
 assert.Contains(t, envs, "CODER_WORKSPACE_NAME=test-workspace")
 assert.Contains(t, envs, "CODER_WORKSPACE_OWNER_NAME=test-user")
 assert.Contains(t, envs, "CODER_DEPLOYMENT_URL=test-subagent-url")
 returnagentcontainers.DevcontainerConfig{},nil
 return nil
 })

 err = api.RefreshContainers(ctx)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,7 +69,7 @@ type fakeDevcontainerCLI struct {
		execErrC chan func(cmd string, args ...string) error // If set, send fn to return err, nil or close to return execErr.
		readConfig agentcontainers.DevcontainerConfig
		readConfigErr error
		readConfigErrC chan func(envs []string)(agentcontainers.DevcontainerConfig,error)
		readConfigErrC chan func(envs []string) error
		}

		func (f *fakeDevcontainerCLI) Up(ctx context.Context, _, _ string, _ ...agentcontainers.DevcontainerCLIUpOptions) (string, error) {
Expand DownExpand Up		@@ -107,7 +107,7 @@ func (f *fakeDevcontainerCLI) ReadConfig(ctx context.Context, _, _ string, envs
		return agentcontainers.DevcontainerConfig{}, ctx.Err()
		case fn, ok := <-f.readConfigErrC:
		if ok {
		return fn(envs)
		returnf.readConfig,fn(envs)
		}
		}
		}
Expand DownExpand Up		@@ -1255,7 +1255,7 @@ func TestAPI(t *testing.T) {
		}
		fakeDCCLI = &fakeDevcontainerCLI{
		execErrC: make(chan func(cmd string, args ...string) error, 1),
		readConfigErrC: make(chan func(envs []string)(agentcontainers.DevcontainerConfig,error), 1),
		readConfigErrC: make(chan func(envs []string) error, 1),
		}

		testContainer = codersdk.WorkspaceAgentContainer{
Expand DownExpand Up		@@ -1304,7 +1304,7 @@ func TestAPI(t *testing.T) {
		close(fakeSAC.createErrC)
		close(fakeSAC.deleteErrC)
		close(fakeDCCLI.execErrC)
		deferclose(fakeDCCLI.readConfigErrC)
		close(fakeDCCLI.readConfigErrC)

		_ = api.Close()
		})
Expand All		@@ -1318,12 +1318,12 @@ func TestAPI(t *testing.T) {
		assert.Empty(t, args)
		return nil
		}) // Exec pwd.
		testutil.RequireSend(ctx, t, fakeDCCLI.readConfigErrC, func(envs []string)(agentcontainers.DevcontainerConfig,error) {
		testutil.RequireSend(ctx, t, fakeDCCLI.readConfigErrC, func(envs []string) error {
		assert.Contains(t, envs, "CODER_WORKSPACE_AGENT_NAME=test-container")
		assert.Contains(t, envs, "CODER_WORKSPACE_NAME=test-workspace")
		assert.Contains(t, envs, "CODER_WORKSPACE_OWNER_NAME=test-user")
		assert.Contains(t, envs, "CODER_DEPLOYMENT_URL=test-subagent-url")
		returnagentcontainers.DevcontainerConfig{},nil
		return nil
		})

		// Make sure the ticker function has been registered
Expand DownExpand Up		@@ -1465,12 +1465,12 @@ func TestAPI(t *testing.T) {
		assert.Empty(t, args)
		return nil
		}) // Exec pwd.
		testutil.RequireSend(ctx, t, fakeDCCLI.readConfigErrC, func(envs []string)(agentcontainers.DevcontainerConfig,error) {
		testutil.RequireSend(ctx, t, fakeDCCLI.readConfigErrC, func(envs []string) error {
		assert.Contains(t, envs, "CODER_WORKSPACE_AGENT_NAME=test-container")
		assert.Contains(t, envs, "CODER_WORKSPACE_NAME=test-workspace")
		assert.Contains(t, envs, "CODER_WORKSPACE_OWNER_NAME=test-user")
		assert.Contains(t, envs, "CODER_DEPLOYMENT_URL=test-subagent-url")
		returnagentcontainers.DevcontainerConfig{},nil
		return nil
		})

		err = api.RefreshContainers(ctx)
Expand Down