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

Commit421dd0e

Browse files
committed
Fix resources not reading in TTY
1 parentf397afc commit421dd0e

File tree

2 files changed

+66
-62
lines changed

2 files changed

+66
-62
lines changed

‎cli/cliui/resources_test.go

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -16,71 +16,75 @@ func TestWorkspaceResources(t *testing.T) {
1616
t.Run("SingleAgentSSH",func(t*testing.T) {
1717
t.Parallel()
1818
ptty:=ptytest.New(t)
19-
err:=cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
20-
Type:"google_compute_instance",
21-
Name:"dev",
22-
Transition:database.WorkspaceTransitionStart,
23-
Agents: []codersdk.WorkspaceAgent{{
24-
Name:"dev",
25-
Status:codersdk.WorkspaceAgentConnected,
26-
Architecture:"amd64",
27-
OperatingSystem:"linux",
28-
}},
29-
}}, cliui.WorkspaceResourcesOptions{
30-
WorkspaceName:"example",
31-
})
32-
require.NoError(t,err)
19+
gofunc() {
20+
err:=cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
21+
Type:"google_compute_instance",
22+
Name:"dev",
23+
Transition:database.WorkspaceTransitionStart,
24+
Agents: []codersdk.WorkspaceAgent{{
25+
Name:"dev",
26+
Status:codersdk.WorkspaceAgentConnected,
27+
Architecture:"amd64",
28+
OperatingSystem:"linux",
29+
}},
30+
}}, cliui.WorkspaceResourcesOptions{
31+
WorkspaceName:"example",
32+
})
33+
require.NoError(t,err)
34+
}()
3335
ptty.ExpectMatch("coder ssh example")
3436
})
3537

3638
t.Run("MultipleStates",func(t*testing.T) {
3739
t.Parallel()
3840
ptty:=ptytest.New(t)
3941
disconnected:=database.Now().Add(-4*time.Second)
40-
err:=cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
41-
Address:"disk",
42-
Transition:database.WorkspaceTransitionStart,
43-
Type:"google_compute_disk",
44-
Name:"root",
45-
}, {
46-
Address:"disk",
47-
Transition:database.WorkspaceTransitionStop,
48-
Type:"google_compute_disk",
49-
Name:"root",
50-
}, {
51-
Address:"another",
52-
Transition:database.WorkspaceTransitionStart,
53-
Type:"google_compute_instance",
54-
Name:"dev",
55-
Agents: []codersdk.WorkspaceAgent{{
56-
CreatedAt:database.Now().Add(-10*time.Second),
57-
Status:codersdk.WorkspaceAgentConnecting,
58-
Name:"dev",
59-
OperatingSystem:"linux",
60-
Architecture:"amd64",
61-
}},
62-
}, {
63-
Transition:database.WorkspaceTransitionStart,
64-
Type:"kubernetes_pod",
65-
Name:"dev",
66-
Agents: []codersdk.WorkspaceAgent{{
67-
Status:codersdk.WorkspaceAgentConnected,
68-
Name:"go",
69-
Architecture:"amd64",
70-
OperatingSystem:"linux",
42+
gofunc() {
43+
err:=cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
44+
Address:"disk",
45+
Transition:database.WorkspaceTransitionStart,
46+
Type:"google_compute_disk",
47+
Name:"root",
7148
}, {
72-
DisconnectedAt:&disconnected,
73-
Status:codersdk.WorkspaceAgentDisconnected,
74-
Name:"postgres",
75-
Architecture:"amd64",
76-
OperatingSystem:"linux",
77-
}},
78-
}}, cliui.WorkspaceResourcesOptions{
79-
WorkspaceName:"dev",
80-
HideAgentState:false,
81-
HideAccess:false,
82-
})
83-
require.NoError(t,err)
49+
Address:"disk",
50+
Transition:database.WorkspaceTransitionStop,
51+
Type:"google_compute_disk",
52+
Name:"root",
53+
}, {
54+
Address:"another",
55+
Transition:database.WorkspaceTransitionStart,
56+
Type:"google_compute_instance",
57+
Name:"dev",
58+
Agents: []codersdk.WorkspaceAgent{{
59+
CreatedAt:database.Now().Add(-10*time.Second),
60+
Status:codersdk.WorkspaceAgentConnecting,
61+
Name:"dev",
62+
OperatingSystem:"linux",
63+
Architecture:"amd64",
64+
}},
65+
}, {
66+
Transition:database.WorkspaceTransitionStart,
67+
Type:"kubernetes_pod",
68+
Name:"dev",
69+
Agents: []codersdk.WorkspaceAgent{{
70+
Status:codersdk.WorkspaceAgentConnected,
71+
Name:"go",
72+
Architecture:"amd64",
73+
OperatingSystem:"linux",
74+
}, {
75+
DisconnectedAt:&disconnected,
76+
Status:codersdk.WorkspaceAgentDisconnected,
77+
Name:"postgres",
78+
Architecture:"amd64",
79+
OperatingSystem:"linux",
80+
}},
81+
}}, cliui.WorkspaceResourcesOptions{
82+
WorkspaceName:"dev",
83+
HideAgentState:false,
84+
HideAccess:false,
85+
})
86+
require.NoError(t,err)
87+
}()
8488
ptty.ExpectMatch("google_compute_disk.root")
8589
ptty.ExpectMatch("google_compute_instance.dev")
8690
ptty.ExpectMatch("coder ssh dev.postgres")

‎coderd/workspaceagents.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (api *api) workspaceAgentDial(rw http.ResponseWriter, r *http.Request) {
5252
}
5353
ifapiAgent.Status!=codersdk.WorkspaceAgentConnected {
5454
httpapi.Write(rw,http.StatusPreconditionFailed, httpapi.Response{
55-
Message:"Agent isn't connected!",
55+
Message:fmt.Sprintf("Agent isn't connected! Status: %s",apiAgent.Status),
5656
})
5757
return
5858
}
@@ -181,14 +181,14 @@ func (api *api) workspaceAgentListen(rw http.ResponseWriter, r *http.Request) {
181181
_=updateConnectionTimes()
182182
}()
183183

184-
err=updateConnectionTimes()
184+
err=ensureLatestBuild()
185185
iferr!=nil {
186-
_=conn.Close(websocket.StatusAbnormalClosure,err.Error())
186+
_=conn.Close(websocket.StatusGoingAway,"")
187187
return
188188
}
189-
err=ensureLatestBuild()
189+
err=updateConnectionTimes()
190190
iferr!=nil {
191-
_=conn.Close(websocket.StatusGoingAway,"")
191+
_=conn.Close(websocket.StatusAbnormalClosure,err.Error())
192192
return
193193
}
194194

0 commit comments

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