Skip to content

[v13] Show <1m for remaining tsh status valid time for last minute #25224

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
stevenGravy merged 3 commits into from
Apr 27, 2023
Merged

[v13] Show <1m for remaining tsh status valid time for last minute #25224

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e58a55c
Show <1m for remaining tsh status time instead of 0s
stevenGravy Apr 25, 2023
4fc1ca9
simplify time check
stevenGravy Apr 25, 2023
ad3053a
logic change
stevenGravy Apr 26, 2023
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
6 changes: 5 additions & 1 deletion tool/tsh/tsh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3786,10 +3786,14 @@ func onShow(cf *CLIConf) error {
// printStatus prints the status of the profile.
func printStatus(debug bool, p *profileInfo, env map[string]string, isActive bool) {
var prefix string
duration := time.Until(p.ValidUntil)
humanDuration := "EXPIRED"
duration := time.Until(p.ValidUntil)
if duration.Nanoseconds() > 0 {
humanDuration = fmt.Sprintf("valid for %v", duration.Round(time.Minute))
// If certificate is valid for less than a minute, display "<1m" instead of "0s".
if duration < time.Minute {
humanDuration = "valid for <1m"
}
}

proxyURL := p.getProxyURLLine(isActive, env)
Expand Down