luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

license: show Terminated field in `license get` command (#16892)

This commit is contained in:
Tim Gross 2023-04-17 09:01:43 -04:00 committed by GitHub
parent 62548616d4
commit 04e049caed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/16892.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
license: show Terminated field in `license get` command
```

12
command/license.go
View File

@ -47,20 +47,27 @@ func (l *LicenseCommand) Run(args []string) int {
func OutputLicenseReply(ui cli.Ui, resp *api.LicenseReply) int { func OutputLicenseReply(ui cli.Ui, resp *api.LicenseReply) int {
now := time.Now() now := time.Now()
expired := resp.License.ExpirationTime.Before(now) expired := resp.License.ExpirationTime.Before(now)
outputLicenseInfo(ui, resp.License, expired) terminated := resp.License.TerminationTime.Before(now)
outputLicenseInfo(ui, resp.License, expired, terminated)
if expired { if expired {
return 1 return 1
} }
return 0 return 0
} }
func outputLicenseInfo(ui cli.Ui, lic *api.License, expired bool) { func outputLicenseInfo(ui cli.Ui, lic *api.License, expired, terminated bool) {
expStr := "" expStr := ""
if expired { if expired {
expStr = fmt.Sprintf("Expired At|%s", lic.ExpirationTime.String()) expStr = fmt.Sprintf("Expired At|%s", lic.ExpirationTime.String())
} else { } else {
expStr = fmt.Sprintf("Expires At|%s", lic.ExpirationTime.String()) expStr = fmt.Sprintf("Expires At|%s", lic.ExpirationTime.String())
} }
termStr := ""
if terminated {
termStr = fmt.Sprintf("Terminated At|%s", lic.TerminationTime.String())
} else {
termStr = fmt.Sprintf("Terminates At|%s", lic.TerminationTime.String())
}
validity := "valid" validity := "valid"
if expired { if expired {
@ -73,6 +80,7 @@ func outputLicenseInfo(ui cli.Ui, lic *api.License, expired bool) {
fmt.Sprintf("Customer ID|%s", lic.CustomerID), fmt.Sprintf("Customer ID|%s", lic.CustomerID),
fmt.Sprintf("Issued At|%s", lic.IssueTime), fmt.Sprintf("Issued At|%s", lic.IssueTime),
expStr, expStr,
termStr,
fmt.Sprintf("Datacenter|%s", lic.InstallationID), fmt.Sprintf("Datacenter|%s", lic.InstallationID),
} }
ui.Output(formatKV(output)) ui.Output(formatKV(output))

3
website/content/docs/commands/license/get.mdx
View File

@ -36,9 +36,8 @@ Product = nomad
License Status = valid License Status = valid
License ID = e23f63b1-00ec-4e67-e926-c22e7937ceec License ID = e23f63b1-00ec-4e67-e926-c22e7937ceec
Customer ID = 350356e5-8aec-bdf4-8510-b205079ccad2 Customer ID = 350356e5-8aec-bdf4-8510-b205079ccad2
Issued At = 2021-03-31 14:21:16.969610774 +0000 UTC
Expires At = 2020-05-09 00:00:00 +0000 UTC Expires At = 2020-05-09 00:00:00 +0000 UTC
License ID = e23f63b1-00ec-4e67-e926-c22e7937ceec
Customer ID = 350356e5-8aec-bdf4-8510-b205079ccad2
Terminates At = 2020-05-10 00:00:00 +0000 UTC Terminates At = 2020-05-10 00:00:00 +0000 UTC
Datacenter = * Datacenter = *
Modules: Modules: