Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit58c748e

Browse files
chore: fix some tests
1 parentbacab01 commit58c748e

File tree

4 files changed

+71
-101
lines changed

4 files changed

+71
-101
lines changed

‎agent/agentcontainers/api_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,9 +1328,9 @@ func TestAPI(t *testing.T) {
13281328
returnnil
13291329
})// Exec pwd.
13301330
testutil.RequireSend(ctx,t,fakeDCCLI.readConfigErrC,func(envs []string) (agentcontainers.DevcontainerConfig,error) {
1331-
assert.Contains(t,envs,"CODER_AGENT_NAME=test-container")
1331+
assert.Contains(t,envs,"CODER_WORKSPACE_AGENT_NAME=test-container")
13321332
assert.Contains(t,envs,"CODER_WORKSPACE_NAME=test-workspace")
1333-
assert.Contains(t,envs,"CODER_USER_NAME=test-user")
1333+
assert.Contains(t,envs,"CODER_WORKSPACE_OWNER_NAME=test-user")
13341334
assert.Contains(t,envs,"CODER_DEPLOYMENT_URL=test-subagent-url")
13351335
return agentcontainers.DevcontainerConfig{},nil
13361336
})
@@ -1387,9 +1387,9 @@ func TestAPI(t *testing.T) {
13871387
returnnil
13881388
})// Exec pwd.
13891389
testutil.RequireSend(ctx,t,fakeDCCLI.readConfigErrC,func(envs []string) (agentcontainers.DevcontainerConfig,error) {
1390-
assert.Contains(t,envs,"CODER_AGENT_NAME=test-container")
1390+
assert.Contains(t,envs,"CODER_WORKSPACE_AGENT_NAME=test-container")
13911391
assert.Contains(t,envs,"CODER_WORKSPACE_NAME=test-workspace")
1392-
assert.Contains(t,envs,"CODER_USER_NAME=test-user")
1392+
assert.Contains(t,envs,"CODER_WORKSPACE_OWNER_NAME=test-user")
13931393
assert.Contains(t,envs,"CODER_DEPLOYMENT_URL=test-subagent-url")
13941394
return agentcontainers.DevcontainerConfig{},nil
13951395
})
@@ -1550,17 +1550,17 @@ func TestAPI(t *testing.T) {
15501550
Slug:"web-app",
15511551
DisplayName:ptr.Ref("Web Application"),
15521552
URL:ptr.Ref("http://localhost:8080"),
1553-
OpenIn:codersdk.WorkspaceAppOpenInTab,
1554-
Share:codersdk.WorkspaceAppSharingLevelOwner,
1553+
OpenIn:ptr.Ref(codersdk.WorkspaceAppOpenInTab),
1554+
Share:ptr.Ref(codersdk.WorkspaceAppSharingLevelOwner),
15551555
Icon:ptr.Ref("/icons/web.svg"),
15561556
Order:ptr.Ref(int32(1)),
15571557
},
15581558
{
15591559
Slug:"api-server",
15601560
DisplayName:ptr.Ref("API Server"),
15611561
URL:ptr.Ref("http://localhost:3000"),
1562-
OpenIn:codersdk.WorkspaceAppOpenInSlimWindow,
1563-
Share:codersdk.WorkspaceAppSharingLevelAuthenticated,
1562+
OpenIn:ptr.Ref(codersdk.WorkspaceAppOpenInSlimWindow),
1563+
Share:ptr.Ref(codersdk.WorkspaceAppSharingLevelAuthenticated),
15641564
Icon:ptr.Ref("/icons/api.svg"),
15651565
Order:ptr.Ref(int32(2)),
15661566
Hidden:ptr.Ref(true),
@@ -1569,8 +1569,8 @@ func TestAPI(t *testing.T) {
15691569
Slug:"docs",
15701570
DisplayName:ptr.Ref("Documentation"),
15711571
URL:ptr.Ref("http://localhost:4000"),
1572-
OpenIn:codersdk.WorkspaceAppOpenInTab,
1573-
Share:codersdk.WorkspaceAppSharingLevelPublic,
1572+
OpenIn:ptr.Ref(codersdk.WorkspaceAppOpenInTab),
1573+
Share:ptr.Ref(codersdk.WorkspaceAppSharingLevelPublic),
15741574
Icon:ptr.Ref("/icons/book.svg"),
15751575
Order:ptr.Ref(int32(3)),
15761576
},
@@ -1584,17 +1584,17 @@ func TestAPI(t *testing.T) {
15841584
assert.Equal(t,"web-app",subAgent.Apps[0].Slug)
15851585
assert.Equal(t,"Web Application",*subAgent.Apps[0].DisplayName)
15861586
assert.Equal(t,"http://localhost:8080",*subAgent.Apps[0].URL)
1587-
assert.Equal(t,codersdk.WorkspaceAppOpenInTab,subAgent.Apps[0].OpenIn)
1588-
assert.Equal(t,codersdk.WorkspaceAppSharingLevelOwner,subAgent.Apps[0].Share)
1587+
assert.Equal(t,codersdk.WorkspaceAppOpenInTab,*subAgent.Apps[0].OpenIn)
1588+
assert.Equal(t,codersdk.WorkspaceAppSharingLevelOwner,*subAgent.Apps[0].Share)
15891589
assert.Equal(t,"/icons/web.svg",*subAgent.Apps[0].Icon)
15901590
assert.Equal(t,int32(1),*subAgent.Apps[0].Order)
15911591

15921592
// Verify second app
15931593
assert.Equal(t,"api-server",subAgent.Apps[1].Slug)
15941594
assert.Equal(t,"API Server",*subAgent.Apps[1].DisplayName)
15951595
assert.Equal(t,"http://localhost:3000",*subAgent.Apps[1].URL)
1596-
assert.Equal(t,codersdk.WorkspaceAppOpenInSlimWindow,subAgent.Apps[1].OpenIn)
1597-
assert.Equal(t,codersdk.WorkspaceAppSharingLevelAuthenticated,subAgent.Apps[1].Share)
1596+
assert.Equal(t,codersdk.WorkspaceAppOpenInSlimWindow,*subAgent.Apps[1].OpenIn)
1597+
assert.Equal(t,codersdk.WorkspaceAppSharingLevelAuthenticated,*subAgent.Apps[1].Share)
15981598
assert.Equal(t,"/icons/api.svg",*subAgent.Apps[1].Icon)
15991599
assert.Equal(t,int32(2),*subAgent.Apps[1].Order)
16001600
assert.Equal(t,true,*subAgent.Apps[1].Hidden)
@@ -1603,8 +1603,8 @@ func TestAPI(t *testing.T) {
16031603
assert.Equal(t,"docs",subAgent.Apps[2].Slug)
16041604
assert.Equal(t,"Documentation",*subAgent.Apps[2].DisplayName)
16051605
assert.Equal(t,"http://localhost:4000",*subAgent.Apps[2].URL)
1606-
assert.Equal(t,codersdk.WorkspaceAppOpenInTab,subAgent.Apps[2].OpenIn)
1607-
assert.Equal(t,codersdk.WorkspaceAppSharingLevelPublic,subAgent.Apps[2].Share)
1606+
assert.Equal(t,codersdk.WorkspaceAppOpenInTab,*subAgent.Apps[2].OpenIn)
1607+
assert.Equal(t,codersdk.WorkspaceAppSharingLevelPublic,*subAgent.Apps[2].Share)
16081608
assert.Equal(t,"/icons/book.svg",*subAgent.Apps[2].Icon)
16091609
assert.Equal(t,int32(3),*subAgent.Apps[2].Order)
16101610
},

‎agent/agentcontainers/devcontainercli.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ func (d *devcontainerCLI) ReadConfig(ctx context.Context, workspaceFolder, confi
265265
}
266266

267267
c:=d.execer.CommandContext(ctx,"devcontainer",args...)
268-
c.Env=append(os.Environ(),env...)
268+
c.Env=append(c.Env,os.Environ()...)
269+
c.Env=append(c.Env,env...)
269270

270271
varstdoutBuf bytes.Buffer
271272
stdoutWriters:= []io.Writer{&stdoutBuf,&devcontainerCLILogWriter{ctx:ctx,logger:logger.With(slog.F("stdout",true))}}

‎agent/agentcontainers/subagent.go

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ type SubAgent struct {
2525
}
2626

2727
typeSubAgentAppstruct {
28-
Slugstring`json:"slug"`
29-
Command*string`json:"command"`
30-
DisplayName*string`json:"displayName"`
31-
External*bool`json:"external"`
32-
Group*string`json:"group"`
33-
HealthCheck*SubAgentHealthCheck`json:"healthCheck"`
34-
Hidden*bool`json:"hidden"`
35-
Icon*string`json:"icon"`
36-
OpenIn codersdk.WorkspaceAppOpenIn`json:"openIn"`
37-
Order*int32`json:"order"`
38-
Share codersdk.WorkspaceAppSharingLevel`json:"share"`
39-
Subdomain*bool`json:"subdomain"`
40-
URL*string`json:"url"`
28+
Slugstring`json:"slug"`
29+
Command*string`json:"command"`
30+
DisplayName*string`json:"displayName"`
31+
External*bool`json:"external"`
32+
Group*string`json:"group"`
33+
HealthCheck*SubAgentHealthCheck`json:"healthCheck"`
34+
Hidden*bool`json:"hidden"`
35+
Icon*string`json:"icon"`
36+
OpenIn*codersdk.WorkspaceAppOpenIn`json:"openIn"`
37+
Order*int32`json:"order"`
38+
Share*codersdk.WorkspaceAppSharingLevel`json:"share"`
39+
Subdomain*bool`json:"subdomain"`
40+
URL*string`json:"url"`
4141
}
4242

4343
typeSubAgentHealthCheckstruct {
@@ -139,25 +139,29 @@ func (a *subAgentAPIClient) Create(ctx context.Context, agent SubAgent) (SubAgen
139139
}
140140

141141
varopenIn*agentproto.CreateSubAgentRequest_App_OpenIn
142-
switchapp.OpenIn {
143-
casecodersdk.WorkspaceAppOpenInSlimWindow:
144-
openIn=agentproto.CreateSubAgentRequest_App_SLIM_WINDOW.Enum()
145-
casecodersdk.WorkspaceAppOpenInTab:
146-
openIn=agentproto.CreateSubAgentRequest_App_TAB.Enum()
147-
default:
148-
returnSubAgent{},xerrors.Errorf("unexpected codersdk.WorkspaceAppOpenIn: %#v",app.OpenIn)
142+
ifapp.OpenIn!=nil {
143+
switch*app.OpenIn {
144+
casecodersdk.WorkspaceAppOpenInSlimWindow:
145+
openIn=agentproto.CreateSubAgentRequest_App_SLIM_WINDOW.Enum()
146+
casecodersdk.WorkspaceAppOpenInTab:
147+
openIn=agentproto.CreateSubAgentRequest_App_TAB.Enum()
148+
default:
149+
returnSubAgent{},xerrors.Errorf("unexpected codersdk.WorkspaceAppOpenIn: %#v",app.OpenIn)
150+
}
149151
}
150152

151153
varshare*agentproto.CreateSubAgentRequest_App_Share
152-
switchapp.Share {
153-
casecodersdk.WorkspaceAppSharingLevelAuthenticated:
154-
share=agentproto.CreateSubAgentRequest_App_AUTHENTICATED.Enum()
155-
casecodersdk.WorkspaceAppSharingLevelOwner:
156-
share=agentproto.CreateSubAgentRequest_App_OWNER.Enum()
157-
casecodersdk.WorkspaceAppSharingLevelPublic:
158-
share=agentproto.CreateSubAgentRequest_App_PUBLIC.Enum()
159-
default:
160-
returnSubAgent{},xerrors.Errorf("unexpected codersdk.WorkspaceAppSharingLevel: %#v",app.Share)
154+
ifapp.Share!=nil {
155+
switch*app.Share {
156+
casecodersdk.WorkspaceAppSharingLevelAuthenticated:
157+
share=agentproto.CreateSubAgentRequest_App_AUTHENTICATED.Enum()
158+
casecodersdk.WorkspaceAppSharingLevelOwner:
159+
share=agentproto.CreateSubAgentRequest_App_OWNER.Enum()
160+
casecodersdk.WorkspaceAppSharingLevelPublic:
161+
share=agentproto.CreateSubAgentRequest_App_PUBLIC.Enum()
162+
default:
163+
returnSubAgent{},xerrors.Errorf("unexpected codersdk.WorkspaceAppSharingLevel: %#v",app.Share)
164+
}
161165
}
162166

163167
apps=append(apps,&agentproto.CreateSubAgentRequest_App{

‎agent/agentcontainers/subagent_test.go

Lines changed: 20 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -114,24 +114,20 @@ func TestSubAgentClient_CreateWithDisplayApps(t *testing.T) {
114114
expectedApps []*agentproto.CreateSubAgentRequest_App
115115
}{
116116
{
117-
name:"single app with minimal fields",
117+
name:"SlugOnly",
118118
apps: []agentcontainers.SubAgentApp{
119119
{
120-
Slug:"code-server",
121-
OpenIn:codersdk.WorkspaceAppOpenInSlimWindow,
122-
Share:codersdk.WorkspaceAppSharingLevelOwner,
120+
Slug:"code-server",
123121
},
124122
},
125123
expectedApps: []*agentproto.CreateSubAgentRequest_App{
126124
{
127-
Slug:"code-server",
128-
OpenIn:agentproto.CreateSubAgentRequest_App_SLIM_WINDOW.Enum(),
129-
Share:agentproto.CreateSubAgentRequest_App_OWNER.Enum(),
125+
Slug:"code-server",
130126
},
131127
},
132128
},
133129
{
134-
name:"single app with all fields",
130+
name:"AllFields",
135131
apps: []agentcontainers.SubAgentApp{
136132
{
137133
Slug:"jupyter",
@@ -146,9 +142,9 @@ func TestSubAgentClient_CreateWithDisplayApps(t *testing.T) {
146142
},
147143
Hidden:ptr.Ref(false),
148144
Icon:ptr.Ref("/icon/jupyter.svg"),
149-
OpenIn:codersdk.WorkspaceAppOpenInTab,
145+
OpenIn:ptr.Ref(codersdk.WorkspaceAppOpenInTab),
150146
Order:ptr.Ref(int32(1)),
151-
Share:codersdk.WorkspaceAppSharingLevelAuthenticated,
147+
Share:ptr.Ref(codersdk.WorkspaceAppSharingLevelAuthenticated),
152148
Subdomain:ptr.Ref(true),
153149
URL:ptr.Ref("http://localhost:8888"),
154150
},
@@ -176,44 +172,38 @@ func TestSubAgentClient_CreateWithDisplayApps(t *testing.T) {
176172
},
177173
},
178174
{
179-
name:"multiple apps with different sharing levels",
175+
name:"AllSharingLevels",
180176
apps: []agentcontainers.SubAgentApp{
181177
{
182-
Slug:"owner-app",
183-
OpenIn:codersdk.WorkspaceAppOpenInSlimWindow,
184-
Share:codersdk.WorkspaceAppSharingLevelOwner,
178+
Slug:"owner-app",
179+
Share:ptr.Ref(codersdk.WorkspaceAppSharingLevelOwner),
185180
},
186181
{
187-
Slug:"authenticated-app",
188-
OpenIn:codersdk.WorkspaceAppOpenInTab,
189-
Share:codersdk.WorkspaceAppSharingLevelAuthenticated,
182+
Slug:"authenticated-app",
183+
Share:ptr.Ref(codersdk.WorkspaceAppSharingLevelAuthenticated),
190184
},
191185
{
192-
Slug:"public-app",
193-
OpenIn:codersdk.WorkspaceAppOpenInSlimWindow,
194-
Share:codersdk.WorkspaceAppSharingLevelPublic,
186+
Slug:"public-app",
187+
Share:ptr.Ref(codersdk.WorkspaceAppSharingLevelPublic),
195188
},
196189
},
197190
expectedApps: []*agentproto.CreateSubAgentRequest_App{
198191
{
199-
Slug:"owner-app",
200-
OpenIn:agentproto.CreateSubAgentRequest_App_SLIM_WINDOW.Enum(),
201-
Share:agentproto.CreateSubAgentRequest_App_OWNER.Enum(),
192+
Slug:"owner-app",
193+
Share:agentproto.CreateSubAgentRequest_App_OWNER.Enum(),
202194
},
203195
{
204-
Slug:"authenticated-app",
205-
OpenIn:agentproto.CreateSubAgentRequest_App_TAB.Enum(),
206-
Share:agentproto.CreateSubAgentRequest_App_AUTHENTICATED.Enum(),
196+
Slug:"authenticated-app",
197+
Share:agentproto.CreateSubAgentRequest_App_AUTHENTICATED.Enum(),
207198
},
208199
{
209-
Slug:"public-app",
210-
OpenIn:agentproto.CreateSubAgentRequest_App_SLIM_WINDOW.Enum(),
211-
Share:agentproto.CreateSubAgentRequest_App_PUBLIC.Enum(),
200+
Slug:"public-app",
201+
Share:agentproto.CreateSubAgentRequest_App_PUBLIC.Enum(),
212202
},
213203
},
214204
},
215205
{
216-
name:"app with health check",
206+
name:"WithHealthCheck",
217207
apps: []agentcontainers.SubAgentApp{
218208
{
219209
Slug:"health-app",
@@ -222,8 +212,6 @@ func TestSubAgentClient_CreateWithDisplayApps(t *testing.T) {
222212
Threshold:5,
223213
URL:"http://localhost:3000/health",
224214
},
225-
OpenIn:codersdk.WorkspaceAppOpenInSlimWindow,
226-
Share:codersdk.WorkspaceAppSharingLevelOwner,
227215
},
228216
},
229217
expectedApps: []*agentproto.CreateSubAgentRequest_App{
@@ -234,32 +222,9 @@ func TestSubAgentClient_CreateWithDisplayApps(t *testing.T) {
234222
Threshold:5,
235223
Url:"http://localhost:3000/health",
236224
},
237-
OpenIn:agentproto.CreateSubAgentRequest_App_SLIM_WINDOW.Enum(),
238-
Share:agentproto.CreateSubAgentRequest_App_OWNER.Enum(),
239225
},
240226
},
241227
},
242-
{
243-
name:"app without health check",
244-
apps: []agentcontainers.SubAgentApp{
245-
{
246-
Slug:"no-health-app",
247-
OpenIn:codersdk.WorkspaceAppOpenInTab,
248-
Share:codersdk.WorkspaceAppSharingLevelOwner,
249-
},
250-
},
251-
expectedApps: []*agentproto.CreateSubAgentRequest_App{
252-
{
253-
Slug:"no-health-app",
254-
OpenIn:agentproto.CreateSubAgentRequest_App_TAB.Enum(),
255-
Share:agentproto.CreateSubAgentRequest_App_OWNER.Enum(),
256-
},
257-
},
258-
},
259-
{
260-
name:"no apps",
261-
apps: []agentcontainers.SubAgentApp{},
262-
},
263228
}
264229

265230
for_,tt:=rangetests {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp