nullkey
1b20b06f5e
Output ergonomics:
- `--json` accepts a comma-separated field list (gh-parity); selects
named keys from the per-command payload. Bare `--json` keeps the
full shape.
- `--jq <expr>` evaluates a gojq expression over the JSON; pairs with
`--json field-list` so projection runs before jq.
- `--version` is a global cobra flag in addition to the `version`
subcommand; both render the same line.
- Per-command `--help` now renders the available JSON field list under
"JSON fields available via `--json id,name,...`" (field-discovery
parity with gh / kubectl `-o jsonpath`).
New commands:
- `auth token` — print the active context's credential to stdout for
shell command substitution (`WEKNORA_TOKEN=$(weknora auth token)`).
Default: raw secret, no trailing newline. `--json` emits
`{token, mode, context}`.
- `doc upload --from-url <URL>` — ingest a remote URL via the SDK
`CreateKnowledgeFromURL`. `--name` forwarded as `FileName` so the
server's known-extension heuristic upgrades crawl-mode to
file-download-mode where appropriate.
Includes the simplify post-review polish pass (field-filter unit
tests, --json/--jq compose check, agent_help copy fixes).
52 lines
1.7 KiB
Go
52 lines
1.7 KiB
Go
package cmdutil
|
|
|
|
import (
|
|
"fmt"
|
|
"net/url"
|
|
"strings"
|
|
)
|
|
|
|
// NormalizeHost validates and canonicalizes a `--host` value. Trailing
|
|
// slashes are trimmed. Every failure path returns CodeInputInvalidArgument —
|
|
// a present-but-empty flag is treated as a bad value, not as a missing flag
|
|
// (cobra's required-flag layer is what catches the absent case).
|
|
//
|
|
// Rules:
|
|
// - non-empty
|
|
// - scheme is http or https
|
|
// - URL parses
|
|
// - u.Host is non-empty (rejects "http://" which url.Parse accepts)
|
|
func NormalizeHost(host string) (string, error) {
|
|
host = strings.TrimRight(strings.TrimSpace(host), "/")
|
|
if host == "" {
|
|
return "", NewError(CodeInputInvalidArgument, "--host must not be empty")
|
|
}
|
|
if err := ValidateHTTPURL("--host", host); err != nil {
|
|
return "", err
|
|
}
|
|
return host, nil
|
|
}
|
|
|
|
// ValidateHTTPURL applies the same http/https URL rules NormalizeHost uses,
|
|
// but parameterized by flagLabel so error messages name the caller's flag
|
|
// (e.g. "--host", "--from-url"). Returns CodeInputInvalidArgument on any
|
|
// failure. Empty `value` is not pre-checked here — callers that distinguish
|
|
// "missing" from "malformed" should test for empty before calling.
|
|
func ValidateHTTPURL(flagLabel, value string) error {
|
|
u, err := url.Parse(value)
|
|
if err != nil {
|
|
return NewError(CodeInputInvalidArgument, fmt.Sprintf("%s %q is not a valid URL: %v", flagLabel, value, err))
|
|
}
|
|
if u.Scheme != "http" && u.Scheme != "https" {
|
|
return &Error{
|
|
Code: CodeInputInvalidArgument,
|
|
Message: fmt.Sprintf("%s scheme must be http or https, got %q", flagLabel, u.Scheme),
|
|
Hint: "example: https://kb.example.com",
|
|
}
|
|
}
|
|
if u.Host == "" {
|
|
return NewError(CodeInputInvalidArgument, fmt.Sprintf("%s %q is missing the host portion", flagLabel, value))
|
|
}
|
|
return nil
|
|
}
|