8000 feat!: add table format to 'coder license ls' by Emyrk · Pull Request #8421 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat!: add table format to 'coder license ls' #8421

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 8 commits into from
Jul 12, 2023
Merged

feat!: add table format to 'coder license ls' #8421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1a959c6
feat: add table format to 'coder license ls'
Emyrk Jul 10, 2023
6fa7d8d
feat: license expires_at to table view
Emyrk Jul 11, 2023
a05b88e
Add back human expiration to json
Emyrk Jul 11, 2023
0de5426
Parse all_features
Emyrk Jul 11, 2023
d185ff8
Add trial to parsed fields
Emyrk Jul 11, 2023
74d99c2
make gen
Emyrk Jul 11, 2023
3385ee9
Fix unit tests
Emyrk Jul 11, 2023
a4e475c
fix typo, exclude 0 claims
Emyrk Jul 12, 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
Prev Previous commit
fix typo, exclude 0 claims
  • Loading branch information
@Emyrk
Emyrk committed Jul 12, 2023
commit a4e475c97d549ea17d965b42475b0bdf8e8e78e5
2 changes: 1 addition & 1 deletion codersdk/licenses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (l *License) ExpiresAt() (time.Time, error) {
return time.Time{}, xerrors.Errorf("license_expires claim has unexpected type %T", expClaim)
}

func (l *License) Trail() bool {
func (l *License) Trial() bool {
if trail, ok := l.Claims["trail"].(bool); ok {
return trail
}
Expand Down
15 changes: 10 additions & 5 deletions enterprise/cli/licenses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,15 @@ func (r *RootCmd) licensesList() *clibase.Cmd {
} else {
var strs []string
if lic.AllFeaturesClaim() {
strs = append(strs, "all")
}
for k, v := range features {
strs = append(strs, fmt.Sprintf("%s=%v", k, v))
// If all features are enabled, just include that
strs = append(strs, "all features")
} else {
for k, v := range features {
if v > 0 {
// Only include claims > 0
strs = append(strs, fmt.Sprintf("%s=%v", k, v))
}
}
}
formattedFeatures = strings.Join(strs, ", ")
}
Expand All @@ -181,7 +186,7 @@ func (r *RootCmd) licensesList() *clibase.Cmd {
UploadedAt: lic.UploadedAt,
Features: formattedFeatures,
ExpiresAt: exp,
Trial: lic.Trail(),
Trial: lic.Trial(),
})
}
return out, nil
Expand Down
0