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
use unix ts for filename
  • Loading branch information
@johnstcn
johnstcn committed Mar 1, 2024
commit f42a1dd83a6b7c733cdd5bb9a52df136a20f1f43
10 changes: 2 additions & 8 deletions cli/support.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"cdr.dev/slog"
"cdr.dev/slog/sloggers/sloghuman"
"github.com/coder/coder/v2/cli/clibase"
"github.com/coder/coder/v2/coderd/util/tz"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/support"
)
Expand Down Expand Up @@ -74,12 +73,7 @@ func (r *RootCmd) support() *clibase.Cmd {
if err != nil {
return xerrors.Errorf("could not determine current working directory: %w", err)
}
loc, err := tz.TimezoneIANA()
if err != nil {
loc = time.UTC
}
tsStr := time.Now().In(loc).Format("2006-01-02-150405")
fname := "coder-support-" + tsStr + ".zip"
fname := fmt.Sprintf("coder-support-%d.zip", time.Now().Unix())
outputPath = filepath.Join(cwd, fname)
}

Expand All @@ -101,7 +95,7 @@ func (r *RootCmd) support() *clibase.Cmd {
Flag: "output",
FlagShorthand: "o",
Env: "CODER_SUPPORT_BUNDLE_OUTPUT",
Description: "Path to which to output the generated support bundle. Defaults to coder-support-YYYYmmdd-HHMMSS.zip.",
Description: "File path for writing the generated support bundle. Defaults to coder-support-$(date +%s).zip.",
Value: clibase.StringOf(&outputPath),
},
}
Expand Down