CLI: coder licenses list #3686
Merged
CLI: coder licenses list #3686
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
Signed-off-by: Spike Curtis <spike@coder.com>
Signed-off-by: Spike Curtis <spike@coder.com>
johnstcn
reviewed
Aug 25, 2022
Comment on lines
-256
to
+257
| cb, err := base64.URLEncoding.DecodeString(parts[1]) | ||
| cb, err := base64.RawURLEncoding.DecodeString(parts[1]) |
There was a problem hiding this comment.
For those who had to look this up, there are four kinds of base64 encoding [1] [2]:
base64.URLEncoding: filename and URL-safe encoding, with paddingbase64.RawURLEncoding: filename and URL-safe encoding, without paddingbase64.StdEncoding: not safe for use in filenames and URLs, with paddingbase64.RawStdEncoding: not safe for use in filenames and URLs, without padding
[1] https://pkg.go.dev/encoding/base64#pkg-variables
[2] https://www.rfc-editor.org/rfc/rfc4648.html#section-4
johnstcn
reviewed
Aug 25, 2022
Comment on lines
+38
to
+61
| // We need a license in the DB, so that when we call GET api/v2/licenses there is one in the | ||
| // list to check authz on. | ||
| claims := &Claims{ | ||
| RegisteredClaims: jwt.RegisteredClaims{ | ||
| Issuer: "test@coder.test", | ||
| IssuedAt: jwt.NewNumericDate(time.Now()), | ||
| NotBefore: jwt.NewNumericDate(time.Now()), | ||
| ExpiresAt: jwt.NewNumericDate(time.Now().Add(2 * time.Hour)), | ||
| }, | ||
| LicenseExpires: jwt.NewNumericDate(time.Now().Add(time.Hour)), | ||
| AccountType: AccountTypeSalesforce, | ||
| AccountID: "testing", | ||
| Version: CurrentVersion, | ||
| Features: Features{ | ||
| UserLimit: 0, | ||
| AuditLog: 1, | ||
| }, | ||
| } | ||
| lic, err := makeLicense(claims, privKey, keyID) | ||
| require.NoError(t, err) | ||
| _, err = a.Client.AddLicense(ctx, codersdk.AddLicenseRequest{ | ||
| License: lic, | ||
| }) | ||
| require.NoError(t, err) |
There was a problem hiding this comment.
(nit, observation, non-blocking): This seems like something that we could shoe-horn into a coderdtest convenience function, as it might be useful elsewhere.
There was a problem hiding this comment.
yeah, it's gonna be needed for basically any test of enterprise-licensed features on the API...
I take this back. I have a better idea for enterprise features. But, it's needed for testing the parts of the API that deal with actual licenses.
johnstcn
approved these changes
Aug 25, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #3280
Also fixes a bug in the API where we used the wrong base64 encoding variant for JWTs.
Also, also adds proper support for testing that the API checks authz before returning licenses