Skip to content

Commit a1c5068

Browse files
johnstcnjohnstcn
committed
fix(cli): allow generating partial support bundles with no workspace or agent
1 parent 7fd9a75 commit a1c5068

File tree

2 files changed

+141
-46
lines changed

2 files changed

+141
-46
lines changed

‎cli/support.go

+33-23
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"text/tabwriter"
1414
"time"
1515

16+
"github.com/google/uuid"
1617
"golang.org/x/xerrors"
1718

1819
"cdr.dev/slog"
@@ -114,31 +115,40 @@ func (r *RootCmd) supportBundle() *serpent.Command {
114115
client.URL = u
115116
}
116117

117-
if len(inv.Args) == 0 {
118-
return xerrors.Errorf("must specify workspace name")
119-
}
120-
ws, err := namedWorkspace(inv.Context(), client, inv.Args[0])
121-
if err != nil {
122-
return xerrors.Errorf("invalid workspace: %w", err)
123-
}
124-
cliLog.Debug(inv.Context(), "found workspace",
125-
slog.F("workspace_name", ws.Name),
126-
slog.F("workspace_id", ws.ID),
118+
var (
119+
wsID uuid.UUID
120+
agtID uuid.UUID
127121
)
128122

129-
agentName := ""
130-
if len(inv.Args) > 1 {
131-
agentName = inv.Args[1]
132-
}
123+
if len(inv.Args) == 0 {
124+
cliLog.Warn(inv.Context(), "no workspace specified")
125+
_, _ = fmt.Fprintln(inv.Stderr, "Warning: no workspace specified. This will result in incomplete information.")
126+
} else {
127+
ws, err := namedWorkspace(inv.Context(), client, inv.Args[0])
128+
if err != nil {
129+
return xerrors.Errorf("invalid workspace: %w", err)
130+
}
131+
cliLog.Debug(inv.Context(), "found workspace",
132+
slog.F("workspace_name", ws.Name),
133+
slog.F("workspace_id", ws.ID),
134+
)
135+
wsID = ws.ID
136+
agentName := ""
137+
if len(inv.Args) > 1 {
138+
agentName = inv.Args[1]
139+
}
133140

134-
agt, found := findAgent(agentName, ws.LatestBuild.Resources)
135-
if !found {
136-
return xerrors.Errorf("could not find agent named %q for workspace", agentName)
141+
agt, found := findAgent(agentName, ws.LatestBuild.Resources)
142+
if !found {
143+
cliLog.Warn(inv.Context(), "could not find agent in workspace", slog.F("agent_name", agentName))
144+
} else {
145+
cliLog.Debug(inv.Context(), "found workspace agent",
146+
slog.F("agent_name", agt.Name),
147+
slog.F("agent_id", agt.ID),
148+
)
149+
agtID = agt.ID
150+
}
137151
}
138-
cliLog.Debug(inv.Context(), "found workspace agent",
139-
slog.F("agent_name", agt.Name),
140-
slog.F("agent_id", agt.ID),
141-
)
142152

143153
if outputPath == "" {
144154
cwd, err := filepath.Abs(".")
@@ -165,8 +175,8 @@ func (r *RootCmd) supportBundle() *serpent.Command {
165175
Client: client,
166176
// Support adds a sink so we don't need to supply one ourselves.
167177
Log: clientLog,
168-
WorkspaceID: ws.ID,
169-
AgentID: agt.ID,
178+
WorkspaceID: wsID,
179+
AgentID: agtID,
170180
}
171181

172182
bun, err := support.Run(inv.Context(), &deps)

‎cli/support_test.go

+108-23
Original file line numberDiff line numberDiff line change
@@ -95,33 +95,50 @@ func TestSupportBundle(t *testing.T) {
9595
clitest.SetupConfig(t, client, root)
9696
err = inv.Run()
9797
require.NoError(t, err)
98-
assertBundleContents(t, path, secretValue)
98+
assertBundleContents(t, path, true, true, []string{secretValue})
9999
})
100100

101101
t.Run("NoWorkspace", func(t *testing.T) {
102102
t.Parallel()
103-
client := coderdtest.New(t, nil)
103+
var dc codersdk.DeploymentConfig
104+
secretValue := uuid.NewString()
105+
seedSecretDeploymentOptions(t, &dc, secretValue)
106+
client := coderdtest.New(t, &coderdtest.Options{
107+
DeploymentValues: dc.Values,
108+
})
104109
_ = coderdtest.CreateFirstUser(t, client)
105-
inv, root := clitest.New(t, "support", "bundle", "--yes")
110+
111+
d := t.TempDir()
112+
path := filepath.Join(d, "bundle.zip")
113+
inv, root := clitest.New(t, "support", "bundle", "--output-file", path, "--yes")
106114
//nolint: gocritic // requires owner privilege
107115
clitest.SetupConfig(t, client, root)
108116
err := inv.Run()
109-
require.ErrorContains(t, err, "must specify workspace name")
117+
require.NoError(t, err)
118+
assertBundleContents(t, path, false, false, []string{secretValue})
110119
})
111120

112121
t.Run("NoAgent", func(t *testing.T) {
113122
t.Parallel()
114-
client, db := coderdtest.NewWithDatabase(t, nil)
123+
var dc codersdk.DeploymentConfig
124+
secretValue := uuid.NewString()
125+
seedSecretDeploymentOptions(t, &dc, secretValue)
126+
client, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{
127+
DeploymentValues: dc.Values,
128+
})
115129
admin := coderdtest.CreateFirstUser(t, client)
116130
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
117131
OrganizationID: admin.OrganizationID,
118132
OwnerID: admin.UserID,
119133
}).Do() // without agent!
120-
inv, root := clitest.New(t, "support", "bundle", r.Workspace.Name, "--yes")
134+
d := t.TempDir()
135+
path := filepath.Join(d, "bundle.zip")
136+
inv, root := clitest.New(t, "support", "bundle", r.Workspace.Name, "--output-file", path, "--yes")
121137
//nolint: gocritic // requires owner privilege
122138
clitest.SetupConfig(t, client, root)
123139
err := inv.Run()
124-
require.ErrorContains(t, err, "could not find agent")
140+
require.NoError(t, err)
141+
assertBundleContents(t, path, true, false, []string{secretValue})
125142
})
126143

127144
t.Run("NoPrivilege", func(t *testing.T) {
@@ -140,7 +157,7 @@ func TestSupportBundle(t *testing.T) {
140157
})
141158
}
142159

143-
func assertBundleContents(t *testing.T, path string, badValues ...string) {
160+
func assertBundleContents(t *testing.T, path string, wantWorkspace bool, wantAgent bool, badValues []string) {
144161
t.Helper()
145162
r, err := zip.OpenReader(path)
146163
require.NoError(t, err, "open zip file")
@@ -173,64 +190,132 @@ func assertBundleContents(t *testing.T, path string, badValues ...string) {
173190
case "network/netcheck.json":
174191
var v workspacesdk.AgentConnectionInfo
175192
decodeJSONFromZip(t, f, &v)
193+
if !wantAgent || !wantWorkspace {
194+
require.Empty(t, v, "expected connection info to be empty")
195+
continue
196+
}
176197
require.NotEmpty(t, v, "connection info should not be empty")
177198
case "workspace/workspace.json":
178199
var v codersdk.Workspace
179200
decodeJSONFromZip(t, f, &v)
201+
if !wantWorkspace {
202+
require.Empty(t, v, "expected workspace to be empty")
203+
continue
204+
}
180205
require.NotEmpty(t, v, "workspace should not be empty")
181206
case "workspace/build_logs.txt":
182207
bs := readBytesFromZip(t, f)
208+
if !wantWorkspace || !wantAgent {
209+
require.Empty(t, bs, "expected workspace build logs to be empty")
210+
continue
211+
}
183212
require.Contains(t, string(bs), "provision done")
213+
case "workspace/template.json":
214+
var v codersdk.Template
215+
decodeJSONFromZip(t, f, &v)
216+
if !wantWorkspace {
217+
require.Empty(t, v, "expected workspace template to be empty")
218+
continue
219+
}
220+
require.NotEmpty(t, v, "workspace template should not be empty")
221+
case "workspace/template_version.json":
222+
var v codersdk.TemplateVersion
223+
decodeJSONFromZip(t, f, &v)
224+
if !wantWorkspace {
225+
require.Empty(t, v, "expected workspace template version to be empty")
226+
continue
227+
}
228+
require.NotEmpty(t, v, "workspace template version should not be empty")
229+
case "workspace/parameters.json":
230+
var v []codersdk.WorkspaceBuildParameter
231+
decodeJSONFromZip(t, f, &v)
232+
if !wantWorkspace {
233+
require.Empty(t, v, "expected workspace parameters to be empty")
234+
continue
235+
}
236+
require.NotNil(t, v, "workspace parameters should not be nil")
237+
case "workspace/template_file.zip":
238+
bs := readBytesFromZip(t, f)
239+
if !wantWorkspace {
240+
require.Empty(t, bs, "expected template file to be empty")
241+
continue
242+
}
243+
require.NotNil(t, bs, "template file should not be nil")
184244
case "agent/agent.json":
185245
var v codersdk.WorkspaceAgent
186246
decodeJSONFromZip(t, f, &v)
247+
if !wantAgent {
248+
require.Empty(t, v, "expected agent to be empty")
249+
continue
250+
}
187251
require.NotEmpty(t, v, "agent should not be empty")
188252
case "agent/listening_ports.json":
189253
var v codersdk.WorkspaceAgentListeningPortsResponse
190254
decodeJSONFromZip(t, f, &v)
255+
if !wantAgent {
256+
require.Empty(t, v, "expected agent listening ports to be empty")
257+
continue
258+
}
191259
require.NotEmpty(t, v, "agent listening ports should not be empty")
192260
case "agent/logs.txt":
193261
bs := readBytesFromZip(t, f)
262+
if !wantAgent {
263+
require.Empty(t, bs, "expected agent logs to be empty")
264+
continue
265+
}
194266
require.NotEmpty(t, bs, "logs should not be empty")
195267
case "agent/agent_magicsock.html":
196268
bs := readBytesFromZip(t, f)
269+
if !wantAgent {
270+
require.Empty(t, bs, "expected agent magicsock to be empty")
271+
continue
272+
}
197273
require.NotEmpty(t, bs, "agent magicsock should not be empty")
198274
case "agent/client_magicsock.html":
199275
bs := readBytesFromZip(t, f)
276+
if !wantAgent {
277+
require.Empty(t, bs, "expected client magicsock to be empty")
278+
continue
279+
}
200280
require.NotEmpty(t, bs, "client magicsock should not be empty")
201281
case "agent/manifest.json":
202282
var v agentsdk.Manifest
203283
decodeJSONFromZip(t, f, &v)
284+
if !wantAgent {
285+
require.Empty(t, v, "expected agent manifest to be empty")
286+
continue
287+
}
204288
require.NotEmpty(t, v, "agent manifest should not be empty")
205289
case "agent/peer_diagnostics.json":
206290
var v *tailnet.PeerDiagnostics
207291
decodeJSONFromZip(t, f, &v)
292+
if !wantAgent {
293+
require.Empty(t, v, "expected peer diagnostics to be empty")
294+
continue
295+
}
208296
require.NotEmpty(t, v, "peer diagnostics should not be empty")
209297
case "agent/ping_result.json":
210298
var v *ipnstate.PingResult
211299
decodeJSONFromZip(t, f, &v)
300+
if !wantAgent {
301+
require.Empty(t, v, "expected ping result to be empty")
302+
continue
303+
}
212304
require.NotEmpty(t, v, "ping result should not be empty")
213305
case "agent/prometheus.txt":
214306
bs := readBytesFromZip(t, f)
307+
if !wantAgent {
308+
require.Empty(t, bs, "expected agent prometheus metrics to be empty")
309+
continue
310+
}
215311
require.NotEmpty(t, bs, "agent prometheus metrics should not be empty")
216312
case "agent/startup_logs.txt":
217313
bs := readBytesFromZip(t, f)
314+
if !wantAgent {
315+
require.Empty(t, bs, "expected agent startup logs to be empty")
316+
continue
317+
}
218318
require.Contains(t, string(bs), "started up")
219-
case "workspace/template.json":
220-
var v codersdk.Template
221-
decodeJSONFromZip(t, f, &v)
222-
require.NotEmpty(t, v, "workspace template should not be empty")
223-
case "workspace/template_version.json":
224-
var v codersdk.TemplateVersion
225-
decodeJSONFromZip(t, f, &v)
226-
require.NotEmpty(t, v, "workspace template version should not be empty")
227-
case "workspace/parameters.json":
228-
var v []codersdk.WorkspaceBuildParameter
229-
decodeJSONFromZip(t, f, &v)
230-
require.NotNil(t, v, "workspace parameters should not be nil")
231-
case "workspace/template_file.zip":
232-
bs := readBytesFromZip(t, f)
233-
require.NotNil(t, bs, "template file should not be nil")
234319
case "logs.txt":
235320
bs := readBytesFromZip(t, f)
236321
require.NotEmpty(t, bs, "logs should not be empty")

0 commit comments

Comments
 (0)