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

Commita869404

Browse files
committed
remove unused field
1 parent2b0b47c commita869404

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

‎cli/support.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ func writeBundle(src *support.Bundle, dest *zip.Writer) error {
142142
"deployment/config.json":src.Deployment.Config,
143143
"deployment/experiments.json":src.Deployment.Experiments,
144144
"deployment/health.json":src.Deployment.HealthReport,
145-
"network/netcheck_local.json":src.Network.NetcheckLocal,
146-
"network/netcheck_remote.json":src.Network.NetcheckRemote,
145+
"network/netcheck.json":src.Network.Netcheck,
147146
"workspace/workspace.json":src.Workspace.Workspace,
148147
"agent/agent.json":src.Agent.Agent,
149148
"agent/listening_ports.json":src.Agent.ListeningPorts,

‎cli/support_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ func assertBundleContents(t *testing.T, path string) {
144144
case"network/tailnet_debug.html":
145145
bs:=readBytesFromZip(t,f)
146146
require.NotEmpty(t,bs,"tailnet debug should not be empty")
147-
case"network/netcheck_local.json","network/netcheck_remote.json":
148-
// TODO: setup fake agent?
149-
bs:=readBytesFromZip(t,f)
150-
require.NotEmpty(t,bs,"netcheck should not be empty")
147+
case"network/netcheck.json":
148+
varv codersdk.WorkspaceAgentConnectionInfo
149+
decodeJSONFromZip(t,f,&v)
150+
require.NotEmpty(t,v,"connection info should not be empty")
151151
case"workspace/workspace.json":
152152
varv codersdk.Workspace
153153
decodeJSONFromZip(t,f,&v)

‎support/support.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ type Deployment struct {
4545
typeNetworkstruct {
4646
CoordinatorDebugstring`json:"coordinator_debug"`
4747
TailnetDebugstring`json:"tailnet_debug"`
48-
NetcheckLocal*codersdk.WorkspaceAgentConnectionInfo`json:"netcheck_local"`
49-
NetcheckRemote*codersdk.WorkspaceAgentConnectionInfo`json:"netcheck_remote"`
48+
Netcheck*codersdk.WorkspaceAgentConnectionInfo`json:"netcheck"`
5049
}
5150

5251
typeWorkspacestruct {
@@ -175,7 +174,7 @@ func NetworkInfo(ctx context.Context, client *codersdk.Client, log slog.Logger,
175174
iferr!=nil {
176175
returnxerrors.Errorf("fetch agent conn info: %w",err)
177176
}
178-
n.NetcheckLocal=&connInfo
177+
n.Netcheck=&connInfo
179178
returnnil
180179
})
181180

‎support/support_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestRun(t *testing.T) {
6161
require.NotEmpty(t,bun.Deployment.Experiments)
6262
require.NotEmpty(t,bun.Network.CoordinatorDebug)
6363
require.NotEmpty(t,bun.Network.TailnetDebug)
64-
require.NotNil(t,bun.Network.NetcheckLocal)
64+
require.NotNil(t,bun.Network.Netcheck)
6565
require.NotNil(t,bun.Workspace.Workspace)
6666
assertSanitizedWorkspace(t,bun.Workspace.Workspace)
6767
require.NotEmpty(t,bun.Workspace.BuildLogs)

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp