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

Commit19d3fa5

Browse files
committed
chore(cli): order map kvs in writeBundle for a e s t h e t i c s
1 parente3f6186 commit19d3fa5

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

‎cli/support.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -222,20 +222,20 @@ func findAgent(agentName string, haystack []codersdk.WorkspaceResource) (*coders
222222
funcwriteBundle(src*support.Bundle,dest*zip.Writer)error {
223223
// We JSON-encode the following:
224224
fork,v:=rangemap[string]any{
225-
"deployment/buildinfo.json":src.Deployment.BuildInfo,
226-
"deployment/config.json":src.Deployment.Config,
227-
"deployment/experiments.json":src.Deployment.Experiments,
228-
"deployment/health.json":src.Deployment.HealthReport,
229-
"network/netcheck.json":src.Network.Netcheck,
230-
"workspace/workspace.json":src.Workspace.Workspace,
231225
"agent/agent.json":src.Agent.Agent,
232226
"agent/listening_ports.json":src.Agent.ListeningPorts,
233227
"agent/manifest.json":src.Agent.Manifest,
234228
"agent/peer_diagnostics.json":src.Agent.PeerDiagnostics,
235229
"agent/ping_result.json":src.Agent.PingResult,
230+
"deployment/buildinfo.json":src.Deployment.BuildInfo,
231+
"deployment/config.json":src.Deployment.Config,
232+
"deployment/experiments.json":src.Deployment.Experiments,
233+
"deployment/health.json":src.Deployment.HealthReport,
234+
"network/netcheck.json":src.Network.Netcheck,
235+
"workspace/parameters.json":src.Workspace.Parameters,
236236
"workspace/template.json":src.Workspace.Template,
237237
"workspace/template_version.json":src.Workspace.TemplateVersion,
238-
"workspace/parameters.json":src.Workspace.Parameters,
238+
"workspace/workspace.json":src.Workspace.Workspace,
239239
} {
240240
f,err:=dest.Create(k)
241241
iferr!=nil {
@@ -255,17 +255,17 @@ func writeBundle(src *support.Bundle, dest *zip.Writer) error {
255255

256256
// The below we just write as we have them:
257257
fork,v:=rangemap[string]string{
258-
"network/coordinator_debug.html":src.Network.CoordinatorDebug,
259-
"network/tailnet_debug.html":src.Network.TailnetDebug,
260-
"workspace/build_logs.txt":humanizeBuildLogs(src.Workspace.BuildLogs),
258+
"cli_logs.txt":string(src.CLILogs),
259+
"logs.txt":strings.Join(src.Logs,"\n"),
261260
"agent/logs.txt":string(src.Agent.Logs),
262261
"agent/agent_magicsock.html":string(src.Agent.AgentMagicsockHTML),
263262
"agent/client_magicsock.html":string(src.Agent.ClientMagicsockHTML),
264263
"agent/startup_logs.txt":humanizeAgentLogs(src.Agent.StartupLogs),
265264
"agent/prometheus.txt":string(src.Agent.Prometheus),
265+
"network/coordinator_debug.html":src.Network.CoordinatorDebug,
266+
"network/tailnet_debug.html":src.Network.TailnetDebug,
267+
"workspace/build_logs.txt":humanizeBuildLogs(src.Workspace.BuildLogs),
266268
"workspace/template_file.zip":string(templateVersionBytes),
267-
"logs.txt":strings.Join(src.Logs,"\n"),
268-
"cli_logs.txt":string(src.CLILogs),
269269
} {
270270
f,err:=dest.Create(k)
271271
iferr!=nil {

0 commit comments

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