Skip to content

feat(cli): extend duration to longer units #15040

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 10 commits into from
Oct 16, 2024
Merged

feat(cli): extend duration to longer units #15040

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93e2e47
feat(cli): extend duration to longer units
defelmnq Oct 10, 2024
617fda1
feat(cli): call codersk to get default token lifetime
defelmnq Oct 10, 2024
6ce2600
fix: golden files and docs
defelmnq Oct 10, 2024
950c056
feat(cli): extend duration to longer units
defelmnq Oct 14, 2024
e294630
Merge remote-tracking branch 'origin/feat/improve-duration-flags' int…
defelmnq Oct 14, 2024
02cfb2b
feat(cli): improve long duration testing and negative values
defelmnq Oct 14, 2024
c51cf20
feat(cli): improve long duration testing and negative values
defelmnq Oct 14, 2024
256c085
feat(cli): improve long duration testing and negative values
defelmnq Oct 14, 2024
12e2c2d
feat(cli): improve long duration testing and negative values
defelmnq Oct 14, 2024
7723ae9
Merge remote-tracking branch 'origin/main' into feat/improve-duration…
defelmnq Oct 16, 2024
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
Next Next commit
feat(cli): call codersk to get default token lifetime
  • Loading branch information
@defelmnq
defelmnq committed Oct 10, 2024
commit 617fda1cbb833593b1ea251d3c174967ef9d6100
19 changes: 15 additions & 4 deletions cli/tokens.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,21 @@ func (r *RootCmd) createToken() *serpent.Command {
userID = user
}

parsedLifetime, err := extendedParseDuration(tokenLifetime)
if err != nil {
return xerrors.Errorf("parse lifetime: %w", err)
var parsedLifetime time.Duration
var err error

if tokenLifetime == "" {
tokenConfig, err := client.GetTokenConfig(inv.Context(), userID)
if err != nil {
return xerrors.Errorf("get token config: %w", err)
}

parsedLifetime = tokenConfig.MaxTokenLifetime
} else {
parsedLifetime, err = extendedParseDuration(tokenLifetime)
if err != nil {
return xerrors.Errorf("parse lifetime: %w", err)
}
Comment on lines +78 to +81
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: given that we have the token config available, we can check if the requested lifetime is greater than MaxTokenLifetime client-side. This may not be completely necessary though, as the API will disallow creating tokens with lifetime greater than MaximumTokenDuration. Dealer's choice!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah you're completely right - makes sense I just changed it a bit to handle the config fetched ! 👌

}

res, err := client.CreateToken(inv.Context(), userID, codersdk.CreateTokenRequest{
Expand All @@ -88,7 +100,6 @@ func (r *RootCmd) createToken() *serpent.Command {
Flag: "lifetime",
Env: "CODER_TOKEN_LIFETIME",
Description: "Specify a duration for the lifetime of the token.",
Default: (time.Hour * 24 * 30).String(),
Value: serpent.StringOf(&tokenLifetime),
},
{
Expand Down
Loading