mirror of
https://github.com/coder/coder.git
synced 2026-09-01 14:53:15 +08:00
61e52532c0
## Problem
Generated reference docs (`docs/reference/cli/*`,
`docs/reference/api/*`) contained raw placeholder and JSON syntax that
came straight from Go CLI help strings and swagger annotations. HTML
renderers treat the angle-bracket tokens (`<team-slug>`, `<uuid>`,
`<KEY>`, etc.) as unknown tags and drop them, so readers see
broken/half-missing text today. The same strings also break MDX parsing.
## Fix
Wrap the placeholder/JSON syntax in backticks **at the source** (Go help
strings and swagger annotation comments), then `make gen`. Rendered docs
now show the placeholders as inline code instead of dropping them.
### Source changes
| File | Placeholder wrapped | Surfaces in |
|------|--------------------|-------------|
| `codersdk/deployment.go` | `` `<organization-name>/<team-slug>` `` |
`cli/server.md`, `coder --help`, settings UI |
| `codersdk/deployment.go` | `` `CODER_AI_GATEWAY_PROVIDER_<N>_*` ``, ``
`CODER_AI_GATEWAY_PROVIDER_<N>_<KEY>` `` | `api/schemas.md` |
| `cli/tokens.go` | `` `<type>:<uuid>` `` | `cli/tokens_create.md`,
`coder --help` |
| `coderd/aitasks.go` | `` `owner:<…>` ``, `` `organization:<…>` ``, ``
`status:<status>` `` | `api/tasks.md` |
| `coderd/exp_chats.go` | `` `pr_status:<…>` `` and sibling filter
tokens | `api/chats.md` |
| `coderd/provisionerdaemons.go`, `coderd/provisionerjobs.go` | ``
`{'tag1':'value1','tag2':'value2'}` `` | `api/organizations.md`,
`api/provisioning.md` |
Everything else in the diff (`coderd/apidoc/*`, `docs/reference/**`,
`*.golden`, `site/src/api/typesGenerated.ts`) is `make gen` output.
## Reviewer notes (the "considered pass" from the ticket)
- **Product-visible:** this changes `coder server --help` and `coder
tokens create --help` output, and the `server-config.yaml` reference
comment. Backticks in terminal help are literal but read fine as
placeholder markers.
- **Settings UI:** the `deployment.go` `Description` also renders in the
deployment settings page. If that field is not Markdown-rendered,
literal backticks will show there. Happy to drop the `deployment.go`
change if you'd rather keep the UI text clean and fix `server.md`
another way.
- **Out of scope here:** `docs/reference/cli/agent-firewall.md`
(`<host>`/`<glob>`) is generated from the external
`github.com/coder/boundary` module, not this repo. It needs an upstream
fix + module bump; not included in this PR.
<details>
<summary>Implementation notes / decision log</summary>
- Scope taken from DOCS-551: source-level backtick pass for generated
reference docs only. Hand-written Markdown fixes are tracked separately
(companion ticket).
- Swagger `@Param` descriptions are Go comments, so the existing `\|`
pipe-escaping in the chats `q` filter is preserved inside the new
backticks (still required for the Markdown table cell to render `|`).
- Verified after `make gen`: generated docs render placeholders as code
spans, table pipes intact; `gofmt` clean; changed Go packages build; no
emdash/endash introduced.
- Deliberately left the `AIProviderConfig` type-level doc comment
untouched because it does not surface in any generated doc (kept the
diff to doc-feeding comments).
</details>
Linear: DOCS-551
---
_Opened by Coder Agents on behalf of @nickvigilante._
---
## Evidence: placeholders dropped on the live docs site
Verified **2026-07-14** against the live site (`coder.com/docs`, i.e.
`main`, pre-merge) by loading each affected page in headless Chrome and
reading the post-hydration DOM (confirmed identical in the raw page
payload). Each simple `<token>` placeholder is parsed as an **empty
custom HTML element**, so the browser renders nothing for it and the
placeholder text disappears from the page.
### What readers see today (before this PR)
| Page (live) | Source Markdown | Rendered on the live site |
|-------------|-----------------|---------------------------|
| [`cli/server`](https://coder.com/docs/reference/cli/server) — OAuth2
GitHub Allowed Teams | `Structured as: <organization-name>/<team-slug>.`
| `Structured as: /.` |
|
[`cli/tokens_create`](https://coder.com/docs/reference/cli/tokens_create)
— `--allow` | `Repeatable allow-list entry (<type>:<uuid>, e.g.
workspace:1234-...).` | `Repeatable allow-list entry (:, e.g.
workspace:1234-...).` |
| [`api/tasks`](https://coder.com/docs/reference/api/tasks) — `q` | `...
status:<status>` | `... status:` (nothing after the colon) |
| [`api/schemas`](https://coder.com/docs/reference/api/schemas) —
AIBridgeConfig (`anthropic`/`bedrock`/`openai`) |
`CODER_AI_GATEWAY_PROVIDER_<N>_*` | `CODER_AI_GATEWAY_PROVIDER__*` |
| [`api/schemas`](https://coder.com/docs/reference/api/schemas) —
AIBridgeConfig (`providers`) | `CODER_AI_GATEWAY_PROVIDER_<N>_<KEY>` |
`CODER_AI_GATEWAY_PROVIDER__` |
[`api/chats`](https://coder.com/docs/reference/api/chats) (`q`) drops
five tokens the same way — `title:<substring>`, `diff_url:<url>`,
`pr:<number>`, `pr_title:<text>`, and the trailing `title:<value>`. The
live parameter description reads (note the dangling `title:`,
`diff_url:`, `pr:`, `pr_title:`):
```text
Search query. Supports title: (case-insensitive, quote multi-word values), archived:bool, has_unread:bool, pr_status:<draft|open|merged|closed> as repeated or comma-separated values, source:<created_by_me|shared_with_me>, diff_url: (quote values containing colons), pr: (exact PR number match), repo:<owner/repo> (case-insensitive substring match against git remote origin or URL), pr_title: (case-insensitive PR title substring). Bare terms are not supported; use title: for title filtering.
```
<details>
<summary>Raw rendered DOM from the live site (headless Chrome,
post-hydration)</summary>
```html
<!-- reference/cli/server -->
Structured as: <organization-name>/<team-slug>.</team-slug></organization-name>
<!-- reference/cli/tokens_create -->
Repeatable allow-list entry (<type>:<uuid>, e.g. workspace:1234-...).</uuid></type>
<!-- reference/api/tasks : only status:<status> drops; the /-containing tokens are escaped and survive -->
Search query for filtering tasks. Supports: owner:<username/uuid/me>, organization:<org-name/uuid>, status:<status></status>
<!-- reference/api/schemas : anthropic / bedrock / openai rows -->
Deprecated: Use Providers with indexed CODER_AI_GATEWAY_PROVIDER_<n>_* env vars instead.</n>
<!-- reference/api/schemas : providers row -->
Providers holds provider instances populated from CODER_AI_GATEWAY_PROVIDER_<n>_<key> env vars and/or the deprecated LegacyOpenAI/LegacyAnthropic/LegacyBedrock fields above.</key></n>
```
The parser auto-inserts closing tags
(`</team-slug></organization-name>`) and lowercases the tag name (`<N>`
becomes `<n>`), leaving `__` where `<N>_` used to be. Every wrapped
placeholder renders correctly as inline code on the [docs preview for
this
branch](https://coder.com/docs/@vigilante%2Fdocs-551-backtick-placeholder-syntax-in-generated-reference-docs-cli/reference/cli/server).
</details>
### Accuracy note — cases that do *not* drop on live
These render fine today, so they are **not** evidence of dropping (the
PR still wraps them for consistency / MDX-safety):
-
[`api/organizations`](https://coder.com/docs/reference/api/organizations)
and
[`api/provisioning`](https://coder.com/docs/reference/api/provisioning):
`{'tag1':'value1','tag2':'value2'}` renders verbatim — curly braces are
not an HTML tag.
- Tokens containing `/` or `|` are escaped by the renderer and stay
visible (as literal `<...>`): `<username/uuid/me>`, `<org-name/uuid>`,
`<owner/repo>`, `<draft|open|merged|closed>`,
`<created_by_me|shared_with_me>`. Backticks still improve their
readability, but they were never dropped.
387 lines
10 KiB
Go
387 lines
10 KiB
Go
package cli
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"slices"
|
|
"strings"
|
|
"time"
|
|
|
|
"golang.org/x/xerrors"
|
|
|
|
"github.com/coder/coder/v2/cli/cliui"
|
|
"github.com/coder/coder/v2/coderd/util/slice"
|
|
"github.com/coder/coder/v2/codersdk"
|
|
"github.com/coder/serpent"
|
|
)
|
|
|
|
func (r *RootCmd) tokens() *serpent.Command {
|
|
cmd := &serpent.Command{
|
|
Use: "tokens",
|
|
Short: "Manage personal access tokens",
|
|
Long: "Tokens are used to authenticate automated clients to Coder.\n" + FormatExamples(
|
|
Example{
|
|
Description: "Create a token for automation",
|
|
Command: "coder tokens create",
|
|
},
|
|
Example{
|
|
Description: "List your tokens",
|
|
Command: "coder tokens ls",
|
|
},
|
|
Example{
|
|
Description: "Create a scoped token",
|
|
Command: "coder tokens create --scope workspace:read --allow workspace:<uuid>",
|
|
},
|
|
Example{
|
|
Description: "Remove a token by ID",
|
|
Command: "coder tokens rm WuoWs4ZsMX",
|
|
},
|
|
),
|
|
Aliases: []string{"token"},
|
|
Handler: func(inv *serpent.Invocation) error {
|
|
return inv.Command.HelpHandler(inv)
|
|
},
|
|
Children: []*serpent.Command{
|
|
r.createToken(),
|
|
r.listTokens(),
|
|
r.viewToken(),
|
|
r.removeToken(),
|
|
},
|
|
}
|
|
return cmd
|
|
}
|
|
|
|
func (r *RootCmd) createToken() *serpent.Command {
|
|
var (
|
|
tokenLifetime string
|
|
name string
|
|
user string
|
|
scopes []string
|
|
allowList []codersdk.APIAllowListTarget
|
|
)
|
|
cmd := &serpent.Command{
|
|
Use: "create",
|
|
Short: "Create a token",
|
|
Middleware: serpent.Chain(
|
|
serpent.RequireNArgs(0),
|
|
),
|
|
Handler: func(inv *serpent.Invocation) error {
|
|
client, err := r.InitClient(inv)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
userID := codersdk.Me
|
|
if user != "" {
|
|
userID = user
|
|
}
|
|
|
|
var parsedLifetime time.Duration
|
|
|
|
tokenConfig, err := client.GetTokenConfig(inv.Context(), userID)
|
|
if err != nil {
|
|
return xerrors.Errorf("get token config: %w", err)
|
|
}
|
|
|
|
if tokenLifetime == "" {
|
|
parsedLifetime = tokenConfig.MaxTokenLifetime
|
|
} else {
|
|
parsedLifetime, err = extendedParseDuration(tokenLifetime)
|
|
if err != nil {
|
|
return xerrors.Errorf("parse lifetime: %w", err)
|
|
}
|
|
|
|
if parsedLifetime > tokenConfig.MaxTokenLifetime {
|
|
return xerrors.Errorf("lifetime (%s) is greater than the maximum allowed lifetime (%s)", parsedLifetime, tokenConfig.MaxTokenLifetime)
|
|
}
|
|
}
|
|
|
|
req := codersdk.CreateTokenRequest{
|
|
Lifetime: parsedLifetime,
|
|
TokenName: name,
|
|
}
|
|
if len(req.Scopes) == 0 {
|
|
req.Scopes = slice.StringEnums[codersdk.APIKeyScope](scopes)
|
|
}
|
|
if len(allowList) > 0 {
|
|
req.AllowList = append([]codersdk.APIAllowListTarget(nil), allowList...)
|
|
}
|
|
|
|
res, err := client.CreateToken(inv.Context(), userID, req)
|
|
if err != nil {
|
|
return xerrors.Errorf("create tokens: %w", err)
|
|
}
|
|
|
|
_, _ = fmt.Fprintln(inv.Stdout, res.Key)
|
|
|
|
return nil
|
|
},
|
|
}
|
|
|
|
cmd.Options = serpent.OptionSet{
|
|
{
|
|
Flag: "lifetime",
|
|
Env: "CODER_TOKEN_LIFETIME",
|
|
Description: "Duration for the token lifetime. Supports standard Go duration units (ns, us, ms, s, m, h) plus d (days) and y (years). Examples: 8h, 30d, 1y, 1d12h30m.",
|
|
Value: serpent.StringOf(&tokenLifetime),
|
|
},
|
|
{
|
|
Flag: "name",
|
|
FlagShorthand: "n",
|
|
Env: "CODER_TOKEN_NAME",
|
|
Description: "Specify a human-readable name.",
|
|
Value: serpent.StringOf(&name),
|
|
},
|
|
{
|
|
Flag: "user",
|
|
FlagShorthand: "u",
|
|
Env: "CODER_TOKEN_USER",
|
|
Description: "Specify the user to create the token for (Only works if logged in user is admin).",
|
|
Value: serpent.StringOf(&user),
|
|
},
|
|
{
|
|
Flag: "scope",
|
|
Description: "Repeatable scope to attach to the token (e.g. workspace:read).",
|
|
Value: serpent.StringArrayOf(&scopes),
|
|
},
|
|
{
|
|
Flag: "allow",
|
|
Description: "Repeatable allow-list entry (`<type>:<uuid>`, e.g. workspace:1234-...).",
|
|
Value: AllowListFlagOf(&allowList),
|
|
},
|
|
}
|
|
|
|
return cmd
|
|
}
|
|
|
|
// tokenListRow is the type provided to the OutputFormatter.
|
|
type tokenListRow struct {
|
|
// For JSON format:
|
|
codersdk.APIKey `table:"-"`
|
|
|
|
// For table format:
|
|
ID string `json:"-" table:"id,default_sort"`
|
|
TokenName string `json:"token_name" table:"name"`
|
|
Scopes string `json:"-" table:"scopes"`
|
|
Allow string `json:"-" table:"allow list"`
|
|
LastUsed time.Time `json:"-" table:"last used"`
|
|
ExpiresAt time.Time `json:"-" table:"expires at"`
|
|
CreatedAt time.Time `json:"-" table:"created at"`
|
|
Owner string `json:"-" table:"owner"`
|
|
}
|
|
|
|
func tokenListRowFromToken(token codersdk.APIKeyWithOwner) tokenListRow {
|
|
return tokenListRowFromKey(token.APIKey, token.Username)
|
|
}
|
|
|
|
func tokenListRowFromKey(token codersdk.APIKey, owner string) tokenListRow {
|
|
return tokenListRow{
|
|
APIKey: token,
|
|
ID: token.ID,
|
|
TokenName: token.TokenName,
|
|
Scopes: joinScopes(token.Scopes),
|
|
Allow: joinAllowList(token.AllowList),
|
|
LastUsed: token.LastUsed,
|
|
ExpiresAt: token.ExpiresAt,
|
|
CreatedAt: token.CreatedAt,
|
|
Owner: owner,
|
|
}
|
|
}
|
|
|
|
func joinScopes(scopes []codersdk.APIKeyScope) string {
|
|
if len(scopes) == 0 {
|
|
return ""
|
|
}
|
|
vals := slice.ToStrings(scopes)
|
|
slices.Sort(vals)
|
|
return strings.Join(vals, ", ")
|
|
}
|
|
|
|
func joinAllowList(entries []codersdk.APIAllowListTarget) string {
|
|
if len(entries) == 0 {
|
|
return ""
|
|
}
|
|
vals := make([]string, len(entries))
|
|
for i, entry := range entries {
|
|
vals[i] = entry.String()
|
|
}
|
|
slices.Sort(vals)
|
|
return strings.Join(vals, ", ")
|
|
}
|
|
|
|
func (r *RootCmd) listTokens() *serpent.Command {
|
|
// we only display the 'owner' column if the --all argument is passed in
|
|
defaultCols := []string{"id", "name", "scopes", "allow list", "last used", "expires at", "created at"}
|
|
if slices.Contains(os.Args, "-a") || slices.Contains(os.Args, "--all") {
|
|
defaultCols = append(defaultCols, "owner")
|
|
}
|
|
|
|
var (
|
|
all bool
|
|
includeExpired bool
|
|
displayTokens []tokenListRow
|
|
formatter = cliui.NewOutputFormatter(
|
|
cliui.TableFormat([]tokenListRow{}, defaultCols),
|
|
cliui.JSONFormat(),
|
|
)
|
|
)
|
|
|
|
cmd := &serpent.Command{
|
|
Use: "list",
|
|
Aliases: []string{"ls"},
|
|
Short: "List tokens",
|
|
Middleware: serpent.Chain(
|
|
serpent.RequireNArgs(0),
|
|
),
|
|
Handler: func(inv *serpent.Invocation) error {
|
|
client, err := r.InitClient(inv)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
tokens, err := client.Tokens(inv.Context(), codersdk.Me, codersdk.TokensFilter{
|
|
IncludeAll: all,
|
|
IncludeExpired: includeExpired,
|
|
})
|
|
if err != nil {
|
|
return xerrors.Errorf("list tokens: %w", err)
|
|
}
|
|
|
|
displayTokens = make([]tokenListRow, len(tokens))
|
|
|
|
for i, token := range tokens {
|
|
displayTokens[i] = tokenListRowFromToken(token)
|
|
}
|
|
|
|
out, err := formatter.Format(inv.Context(), displayTokens)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if out == "" {
|
|
cliui.Info(inv.Stderr, "No tokens found.")
|
|
return nil
|
|
}
|
|
|
|
_, err = fmt.Fprintln(inv.Stdout, out)
|
|
return err
|
|
},
|
|
}
|
|
|
|
cmd.Options = serpent.OptionSet{
|
|
{
|
|
Flag: "all",
|
|
FlagShorthand: "a",
|
|
Description: "Specifies whether all users' tokens will be listed or not (must have Owner role to see all tokens).",
|
|
Value: serpent.BoolOf(&all),
|
|
},
|
|
{
|
|
Name: "include-expired",
|
|
Flag: "include-expired",
|
|
Description: "Include expired tokens in the output. By default, expired tokens are hidden.",
|
|
Value: serpent.BoolOf(&includeExpired),
|
|
},
|
|
}
|
|
|
|
formatter.AttachOptions(&cmd.Options)
|
|
return cmd
|
|
}
|
|
|
|
func (r *RootCmd) viewToken() *serpent.Command {
|
|
formatter := cliui.NewOutputFormatter(
|
|
cliui.TableFormat([]tokenListRow{}, []string{"id", "name", "scopes", "allow list", "last used", "expires at", "created at", "owner"}),
|
|
cliui.JSONFormat(),
|
|
)
|
|
|
|
cmd := &serpent.Command{
|
|
Use: "view <name|id>",
|
|
Short: "Display detailed information about a token",
|
|
Middleware: serpent.Chain(
|
|
serpent.RequireNArgs(1),
|
|
),
|
|
Handler: func(inv *serpent.Invocation) error {
|
|
client, err := r.InitClient(inv)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
tokenName := inv.Args[0]
|
|
token, err := client.APIKeyByName(inv.Context(), codersdk.Me, tokenName)
|
|
if err != nil {
|
|
maybeID := strings.Split(tokenName, "-")[0]
|
|
token, err = client.APIKeyByID(inv.Context(), codersdk.Me, maybeID)
|
|
if err != nil {
|
|
return xerrors.Errorf("fetch api key by name or id: %w", err)
|
|
}
|
|
}
|
|
|
|
row := tokenListRowFromKey(*token, "")
|
|
out, err := formatter.Format(inv.Context(), []tokenListRow{row})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = fmt.Fprintln(inv.Stdout, out)
|
|
return err
|
|
},
|
|
}
|
|
|
|
formatter.AttachOptions(&cmd.Options)
|
|
return cmd
|
|
}
|
|
|
|
func (r *RootCmd) removeToken() *serpent.Command {
|
|
var deleteToken bool
|
|
cmd := &serpent.Command{
|
|
Use: "remove <name|id|token>",
|
|
Aliases: []string{"delete"},
|
|
Short: "Expire or delete a token",
|
|
Long: "Remove a token by expiring it. Use --delete to permanently hard-" +
|
|
"delete the token instead.",
|
|
Middleware: serpent.Chain(
|
|
serpent.RequireNArgs(1),
|
|
),
|
|
Handler: func(inv *serpent.Invocation) error {
|
|
client, err := r.InitClient(inv)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
token, err := client.APIKeyByName(inv.Context(), codersdk.Me, inv.Args[0])
|
|
if err != nil {
|
|
// If it's a token, we need to extract the ID.
|
|
maybeID := strings.Split(inv.Args[0], "-")[0]
|
|
token, err = client.APIKeyByID(inv.Context(), codersdk.Me, maybeID)
|
|
if err != nil {
|
|
return xerrors.Errorf("fetch api key by name or id: %w", err)
|
|
}
|
|
}
|
|
|
|
if deleteToken {
|
|
err = client.DeleteAPIKey(inv.Context(), codersdk.Me, token.ID)
|
|
if err != nil {
|
|
return xerrors.Errorf("delete api key: %w", err)
|
|
}
|
|
cliui.Infof(inv.Stdout, "Token has been deleted.")
|
|
return nil
|
|
}
|
|
|
|
err = client.ExpireAPIKey(inv.Context(), codersdk.Me, token.ID)
|
|
if err != nil {
|
|
return xerrors.Errorf("expire api key: %w", err)
|
|
}
|
|
cliui.Infof(inv.Stdout, "Token has been expired.")
|
|
return nil
|
|
},
|
|
}
|
|
|
|
cmd.Options = serpent.OptionSet{
|
|
{
|
|
Flag: "delete",
|
|
Description: "Permanently delete the token instead of expiring it. This removes the audit trail.",
|
|
Value: serpent.BoolOf(&deleteToken),
|
|
},
|
|
}
|
|
|
|
return cmd
|
|
}
|