Skip to content

feat(cli): add support cmd #12328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Mar 1, 2024
Merged

feat(cli): add support cmd #12328

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ab0c40f
feat(cli): add support command and accompanying unit tests
johnstcn Feb 27, 2024
397357e
indent
johnstcn Mar 1, 2024
f513cf6
remove unused log
johnstcn Mar 1, 2024
f42a1dd
use unix ts for filename
johnstcn Mar 1, 2024
475eaa8
gen bundle once file created
johnstcn Mar 1, 2024
1d6f29d
rm temp file on failure
johnstcn Mar 1, 2024
764bb67
add comment on hidden
johnstcn Mar 1, 2024
0a252b1
check for non-empty file
johnstcn Mar 1, 2024
252e2b6
wrap err
johnstcn Mar 1, 2024
facd04d
use slog time format for humanizing logs
johnstcn Mar 1, 2024
c3e7c7b
rename command
johnstcn Mar 1, 2024
9abab12
rm unncessary file
johnstcn Mar 1, 2024
d76c48c
fix usage
johnstcn Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
gen bundle once file created
  • Loading branch information
@johnstcn
johnstcn committed Mar 1, 2024
commit 475eaa87c36fb13148d5b52353056b516f35d0cf
12 changes: 7 additions & 5 deletions cli/support.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ func (r *RootCmd) support() *clibase.Cmd {

deps.AgentID = agt.ID

bun, err := support.Run(inv.Context(), &deps)
if err != nil {
return err
}

if outputPath == "" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could do this even before we fetch the workspace from API since it's not used as part of the filename.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it makes more sense to do the up-front checks first; if the workspace doesn't even exist then there's no point in writing the file.

cwd, err := filepath.Abs(".")
if err != nil {
Expand All @@ -83,6 +78,13 @@ func (r *RootCmd) support() *clibase.Cmd {
}
zwr := zip.NewWriter(w)
defer zwr.Close()

bun, err := support.Run(inv.Context(), &deps)
if err != nil {
_ = os.Remove(outputPath) // best effort
return xerrors.Errorf("create support bundle: %w", err)
}

if err := writeBundle(bun, zwr); err != nil {
return xerrors.Errorf("write support bundle to %s: %w", outputPath, err)
}
Expand Down