Skip to content

cli: streamline autostart ux #2251

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 14 commits into from
Jun 13, 2022
Merged

cli: streamline autostart ux #2251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7c7a290
wip
johnstcn Jun 9, 2022
8983ef9
Merge remote-tracking branch 'origin/main' into cj/1647/autostart-set…
johnstcn Jun 10, 2022
84f1a12
fix some unit tests
johnstcn Jun 10, 2022
bad0ac2
fix more unit tests
johnstcn Jun 10, 2022
68187d8
more fixes
johnstcn Jun 10, 2022
bcb1e8c
fix handling of powershell output
johnstcn Jun 10, 2022
2556ba2
update CLI output
johnstcn Jun 10, 2022
0884e0c
make schedule format easier to parse
johnstcn Jun 10, 2022
377b708
improve time parsing
johnstcn Jun 10, 2022
25ef437
Address PR comments
johnstcn Jun 13, 2022
4bab79f
fixup! Address PR comments
johnstcn Jun 13, 2022
e6921a7
a pox upon you darwin
johnstcn Jun 13, 2022
9e76791
remove unused import on windows
johnstcn Jun 13, 2022
6a82f77
add missing time formats
johnstcn Jun 13, 2022
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
more fixes
  • Loading branch information
@johnstcn
johnstcn committed Jun 10, 2022
commit 68187d88c0a717b0e32f75e5908b00535d986c2e
13 changes: 11 additions & 2 deletions coderd/util/tz/tz_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"path/filepath"
"strings"
"time"

"golang.org/x/xerrors"
)

const etcLocaltime = "/etc/localtime"
Expand Down Expand Up @@ -36,10 +38,17 @@ func TimezoneIANA() (*time.Location, error) {
return nil, xerrors.Errorf("read location of %s: %w", etcLocaltime, err)
}

stripped := strings.Replace(lp, etcLocaltime, "", -1)
// On Darwin, /var/db/timezone/zoneinfo is also a symlink
realZoneInfoPath, err := filepath.EvalSymlinks(zoneInfoPath)
if err != nil {
return nil, xerrors.Errorf("read location of %s: %w", zoneInfoPath, err)
}

stripped := strings.Replace(lp, realZoneInfoPath, "", -1)
stripped = strings.TrimPrefix(stripped, string(filepath.Separator))
loc, err := time.LoadLocation(stripped)
if err != nil {
return nil, xerrors.Errorf("invalid location %q guessed from %s: %w", stripped, lp, err)
}
return loc
return loc, nil
}
3 changes: 2 additions & 1 deletion coderd/util/tz/tz_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

const etcLocaltime = "/etc/localtime"
const zoneInfoPath = "/usr/share/zoneinfo/"
const zoneInfoPath = "/usr/share/zoneinfo"

// TimezoneIANA attempts to determine the local timezone in IANA format.
// If the TZ environment variable is set, this is used.
Expand Down Expand Up @@ -40,6 +40,7 @@ func TimezoneIANA() (*time.Location, error) {
}

stripped := strings.Replace(lp, zoneInfoPath, "", -1)
stripped = strings.TrimPrefix(stripped, string(filepath.Separator))
loc, err := time.LoadLocation(stripped)
if err != nil {
return nil, xerrors.Errorf("invalid location %q guessed from %s: %w", stripped, lp, err)
Expand Down
2 changes: 1 addition & 1 deletion coderd/util/tz/tz_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TimezoneIANA() (*time.Location, error) {
}

// https://superuser.com/a/1584968
cmd := exec.Command("powershell.exe", "-nologo", "-noprofile")
cmd := exec.Command("powershell.exe", "-NoLogo", "-NoProfile", "-NonInteractive")
stdin, err := cmd.StdinPipe()
if err != nil {
return nil, xerrors.Errorf("run powershell: %w", err)
Expand Down