@@ -69,7 +69,7 @@ type fakeDevcontainerCLI struct {
6969execErrC chan func (cmd string ,args ... string )error // If set, send fn to return err, nil or close to return execErr.
7070readConfig agentcontainers.DevcontainerConfig
7171readConfigErr error
72- readConfigErrC chan func (envs []string )(agentcontainers. DevcontainerConfig , error )
72+ readConfigErrC chan func (envs []string )error
7373}
7474
7575func (f * fakeDevcontainerCLI )Up (ctx context.Context ,_ ,_ string ,_ ... agentcontainers.DevcontainerCLIUpOptions ) (string ,error ) {
@@ -107,7 +107,7 @@ func (f *fakeDevcontainerCLI) ReadConfig(ctx context.Context, _, _ string, envs
107107return agentcontainers.DevcontainerConfig {},ctx .Err ()
108108case fn ,ok := <- f .readConfigErrC :
109109if ok {
110- return fn (envs )
110+ return f . readConfig , fn (envs )
111111}
112112}
113113}
@@ -1255,7 +1255,7 @@ func TestAPI(t *testing.T) {
12551255}
12561256fakeDCCLI = & fakeDevcontainerCLI {
12571257execErrC :make (chan func (cmd string ,args ... string )error ,1 ),
1258- readConfigErrC :make (chan func (envs []string )(agentcontainers. DevcontainerConfig , error ) ,1 ),
1258+ readConfigErrC :make (chan func (envs []string )error ,1 ),
12591259}
12601260
12611261testContainer = codersdk.WorkspaceAgentContainer {
@@ -1304,7 +1304,7 @@ func TestAPI(t *testing.T) {
13041304close (fakeSAC .createErrC )
13051305close (fakeSAC .deleteErrC )
13061306close (fakeDCCLI .execErrC )
1307- defer close (fakeDCCLI .readConfigErrC )
1307+ close (fakeDCCLI .readConfigErrC )
13081308
13091309_ = api .Close ()
13101310})
@@ -1318,12 +1318,12 @@ func TestAPI(t *testing.T) {
13181318assert .Empty (t ,args )
13191319return nil
13201320})// Exec pwd.
1321- testutil .RequireSend (ctx ,t ,fakeDCCLI .readConfigErrC ,func (envs []string )(agentcontainers. DevcontainerConfig , error ) {
1321+ testutil .RequireSend (ctx ,t ,fakeDCCLI .readConfigErrC ,func (envs []string )error {
13221322assert .Contains (t ,envs ,"CODER_WORKSPACE_AGENT_NAME=test-container" )
13231323assert .Contains (t ,envs ,"CODER_WORKSPACE_NAME=test-workspace" )
13241324assert .Contains (t ,envs ,"CODER_WORKSPACE_OWNER_NAME=test-user" )
13251325assert .Contains (t ,envs ,"CODER_DEPLOYMENT_URL=test-subagent-url" )
1326- return agentcontainers. DevcontainerConfig {}, nil
1326+ return nil
13271327})
13281328
13291329// Make sure the ticker function has been registered
@@ -1465,12 +1465,12 @@ func TestAPI(t *testing.T) {
14651465assert .Empty (t ,args )
14661466return nil
14671467})// Exec pwd.
1468- testutil .RequireSend (ctx ,t ,fakeDCCLI .readConfigErrC ,func (envs []string )(agentcontainers. DevcontainerConfig , error ) {
1468+ testutil .RequireSend (ctx ,t ,fakeDCCLI .readConfigErrC ,func (envs []string )error {
14691469assert .Contains (t ,envs ,"CODER_WORKSPACE_AGENT_NAME=test-container" )
14701470assert .Contains (t ,envs ,"CODER_WORKSPACE_NAME=test-workspace" )
14711471assert .Contains (t ,envs ,"CODER_WORKSPACE_OWNER_NAME=test-user" )
14721472assert .Contains (t ,envs ,"CODER_DEPLOYMENT_URL=test-subagent-url" )
1473- return agentcontainers. DevcontainerConfig {}, nil
1473+ return nil
14741474})
14751475
14761476err = api .RefreshContainers (ctx )