feat!: add table format to 'coder license ls' #8421
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mafredri
approved these changes
Jul 11, 2023
enterprise/cli/licenses.go
Outdated
| } else { | ||
| var strs []string | ||
| if lic.AllFeaturesClaim() { | ||
| strs = append(strs, "all") |
There was a problem hiding this comment.
Do we need to add all zero features if we add all?
UUID UPLOADED AT FEATURES EXPIRES AT
1d6fab30-b9fe-40f1-8510-f054bbe252ab 2022-11-05T16:45:44Z audit_log=1, user_limit=5 2023-08-26T22:19:20Z
6a6fa845-b022-4980-953f-982617bdf74e 2023-01-19T22:01:43Z all, workspace_quota=0, audit_log=0, browser_only=0, rbac=0, scim=0, user_limit=0 2023-10-10T21:01:34Z
In this case, I think simply omitting those would make sense: all, workspace_quota=0, audit_log=0, browser_only=0, rbac=0, scim=0, user_limit=0 -> all.
There was a problem hiding this comment.
I was honestly curious why we even include the claim if it's 0.
You are right though, I'll omit 0s.
codersdk/licenses.go
Outdated
| return time.Time{}, xerrors.Errorf("license_expires claim has unexpected type %T", expClaim) | ||
| } | ||
|
|
||
| func (l *License) Trail() bool { |
| for i := range list { | ||
| humanExp, err := list[i].ExpiresAt() | ||
| if err == nil { | ||
| list[i].Claims[codersdk.LicenseExpiryClaim+"_human"] = humanExp.Format(time.RFC3339) |
There was a problem hiding this comment.
I'd say both this and the change in default output would warrant a breaking change.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this does
Closes #7697
If anyone has an idea on a better way to format the claims, lmk.
We might want to just move the License struct to the
codersdkso we can json unmarshal the claims easier.Behavior changes
license_expiresclaim in the json payload from a unix timestamp to a RFC3339 string in the-o jsonoutput. I kept this, but moved it tolicense_expires_human. I did this to maintain the original rational, but also preserve the original payload. The original reasoning was probably because the table view did not exist.coder licenses ls -o jsonfor the json output.