ad150c7126
Sweep every CLI output path through the v0.7 envelope contract.
FormatOptions.Emit signature changes to (w, data, meta *output.Meta)
so list commands surface meta.count / has_more in the wire envelope.
TTY indent decision plumbed via FormatOptions.TTY (set by
ResolveDefault). --format and --jq promoted to persistent root flags
so unknown-subcommand paths still reach the typed-envelope guard
(per-command registration would have rejected --format on unknown
commands as cobra-prose exit 2). WEKNORA_FORMAT env-var fallback
honored before TTY-resolved default. AddFormatFlag retained for the
per-command --jq field-hint Long-text addendum.
~55 production Emit call sites swept across cli/cmd/**: list paths
populate meta.count; mutation paths pass nil meta; envelope.profile
threaded via globalProfile. Existing JSON-shape tests migrated to
decode the envelope wrapper.
Multi-target batch operations get a unified shape via new helpers:
- output.BatchItem + output.WriteBatchEnvelope (§4.5 per-item ok
pattern; data:[{id, ok, result?|error?}], meta:{count, successes*,
failures*}; Successes/Failures *int so explicit zero survives
omitempty in all-fail case).
- cmdutil.RunBatch + cmdutil.EmitBatch + cmdutil.DeletedAtNow +
cmdutil.ClassifyContextErr collapse the three previously-duplicated
multi-delete pipelines (doc / chunk / session) into one call site
pattern. doc upload --recursive uses the same helpers with a per-
file resultFn. Summary error sets Silent:true so the stderr
envelope path doesn't duplicate the stdout batch detail (exit 1
preserved via Code → ExitCode).
ConfirmDestructive / ConfirmDestructiveBatch extended with action +
retryCmd parameters. Every destructive command (kb delete, kb edit,
doc delete, doc delete --all, agent delete, agent edit, session
delete, chunk delete, auth logout, api -X DELETE) now attaches
error.risk.{level:"destructive", action:"<noun.verb>"} +
error.retry_command on the exit-10 envelope. kb edit / agent edit
also gain the destructive guard wiring (CHANGELOG listed them as
gated but they were silently executing without -y).
MCP tool handlers' 31 error paths return CallToolResult with
IsError + Content text fallback + StructuredContent (envelope.error
shape via cmdutil.ErrorToDetail). Handler Out type changed from
typed *sdk.X to any so the go-sdk auto-marshal doesn't overwrite
StructuredContent with a zero-struct on error returns. Success path
manually populates CallToolResult.StructuredContent via successResult
helper.
weknora api cleanup:
- -d/--data flag removed; body via --input <file> or --input -
(stdin) only. Aligns with gh / curl convention.
- HTTP method whitelist removed; any non-empty method accepted.
- HTTP Retry-After header → cmdutil.Error.RetryAfterSeconds →
envelope.error.retry_after_seconds.
- runAPIPaginated raw-passthrough fallback now wraps response in
envelope so --paginate never emits bare JSON to stdout.
Test sweep: ~60 cmd/** tests migrated to decode envelope shape.
9 wire-contract goldens updated under cli/acceptance/testdata/wire/.
Spec: docs/superpowers/specs/2026-05-20-weknora-cli-v0.7-design.md §4 / §5
153 lines
5.4 KiB
Go
153 lines
5.4 KiB
Go
package auth
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/config"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
"github.com/Tencent/WeKnora/cli/internal/prompt"
|
|
"github.com/Tencent/WeKnora/cli/internal/secrets"
|
|
)
|
|
|
|
// newLogoutFactory builds a Factory whose Config closure mutates the supplied
|
|
// cfg in place - runLogout writes back via config.Save which touches disk, so
|
|
// tests use t.Setenv("XDG_CONFIG_HOME", t.TempDir()) at the call site to
|
|
// isolate the on-disk file.
|
|
func newLogoutFactory(t *testing.T, cfg *config.Config, store secrets.Store) *cmdutil.Factory {
|
|
t.Helper()
|
|
return &cmdutil.Factory{
|
|
Config: func() (*config.Config, error) { return cfg, nil },
|
|
Secrets: func() (secrets.Store, error) { return store, nil },
|
|
Prompter: func() prompt.Prompter { return &prompt.AgentPrompter{} },
|
|
}
|
|
}
|
|
|
|
func isolateConfig(t *testing.T) {
|
|
t.Helper()
|
|
t.Setenv("XDG_CONFIG_HOME", t.TempDir())
|
|
}
|
|
|
|
func TestLogout_CurrentContext(t *testing.T) {
|
|
isolateConfig(t)
|
|
_, _ = iostreams.SetForTest(t)
|
|
store := secrets.NewMemStore()
|
|
require.NoError(t, store.Set("prod", "access", "jwt-prod"))
|
|
require.NoError(t, store.Set("prod", "refresh", "rfr-prod"))
|
|
require.NoError(t, store.Set("staging", "api_key", "sk-staging"))
|
|
|
|
cfg := &config.Config{
|
|
CurrentContext: "prod",
|
|
Contexts: map[string]config.Context{
|
|
"prod": {Host: "https://prod", TokenRef: store.Ref("prod", "access"), RefreshRef: store.Ref("prod", "refresh")},
|
|
"staging": {Host: "https://staging", APIKeyRef: store.Ref("staging", "api_key")},
|
|
},
|
|
}
|
|
require.NoError(t, runLogout(&LogoutOptions{Yes: true}, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, newLogoutFactory(t, cfg, store)))
|
|
|
|
assert.Empty(t, cfg.CurrentContext, "current_context should clear when removed")
|
|
assert.NotContains(t, cfg.Contexts, "prod")
|
|
assert.Contains(t, cfg.Contexts, "staging", "non-target context untouched")
|
|
|
|
// Secrets gone for the removed context, kept for the survivor.
|
|
if _, err := store.Get("prod", "access"); err == nil {
|
|
t.Error("prod access secret should be deleted")
|
|
}
|
|
if v, _ := store.Get("staging", "api_key"); v != "sk-staging" {
|
|
t.Errorf("staging secret unexpectedly cleared: %q", v)
|
|
}
|
|
}
|
|
|
|
func TestLogout_NamedContext(t *testing.T) {
|
|
isolateConfig(t)
|
|
_, _ = iostreams.SetForTest(t)
|
|
store := secrets.NewMemStore()
|
|
require.NoError(t, store.Set("staging", "api_key", "sk-staging"))
|
|
|
|
cfg := &config.Config{
|
|
CurrentContext: "prod",
|
|
Contexts: map[string]config.Context{
|
|
"prod": {Host: "https://prod", TokenRef: "tok"},
|
|
"staging": {Host: "https://staging", APIKeyRef: store.Ref("staging", "api_key")},
|
|
},
|
|
}
|
|
require.NoError(t, runLogout(&LogoutOptions{Name: "staging", Yes: true}, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, newLogoutFactory(t, cfg, store)))
|
|
|
|
assert.Equal(t, "prod", cfg.CurrentContext, "current_context untouched when removing other")
|
|
assert.NotContains(t, cfg.Contexts, "staging")
|
|
assert.Contains(t, cfg.Contexts, "prod")
|
|
}
|
|
|
|
func TestLogout_All(t *testing.T) {
|
|
isolateConfig(t)
|
|
_, _ = iostreams.SetForTest(t)
|
|
store := secrets.NewMemStore()
|
|
cfg := &config.Config{
|
|
CurrentContext: "prod",
|
|
Contexts: map[string]config.Context{
|
|
"prod": {Host: "https://prod"},
|
|
"staging": {Host: "https://staging"},
|
|
},
|
|
}
|
|
require.NoError(t, runLogout(&LogoutOptions{All: true, Yes: true}, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, newLogoutFactory(t, cfg, store)))
|
|
|
|
assert.Empty(t, cfg.Contexts)
|
|
assert.Empty(t, cfg.CurrentContext)
|
|
}
|
|
|
|
func TestLogout_NoContexts(t *testing.T) {
|
|
isolateConfig(t)
|
|
_, _ = iostreams.SetForTest(t)
|
|
cfg := &config.Config{}
|
|
err := runLogout(&LogoutOptions{}, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, newLogoutFactory(t, cfg, secrets.NewMemStore()))
|
|
require.Error(t, err)
|
|
var typed *cmdutil.Error
|
|
require.ErrorAs(t, err, &typed)
|
|
assert.Equal(t, cmdutil.CodeAuthUnauthenticated, typed.Code)
|
|
}
|
|
|
|
func TestLogout_UnknownName(t *testing.T) {
|
|
isolateConfig(t)
|
|
_, _ = iostreams.SetForTest(t)
|
|
cfg := &config.Config{
|
|
CurrentContext: "prod",
|
|
Contexts: map[string]config.Context{"prod": {Host: "https://prod"}},
|
|
}
|
|
err := runLogout(&LogoutOptions{Name: "ghost"}, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, newLogoutFactory(t, cfg, secrets.NewMemStore()))
|
|
require.Error(t, err)
|
|
var typed *cmdutil.Error
|
|
require.ErrorAs(t, err, &typed)
|
|
assert.Equal(t, cmdutil.CodeLocalProfileNotFound, typed.Code)
|
|
}
|
|
|
|
func TestLogout_NoCurrentNoFlag(t *testing.T) {
|
|
isolateConfig(t)
|
|
_, _ = iostreams.SetForTest(t)
|
|
cfg := &config.Config{
|
|
Contexts: map[string]config.Context{"prod": {Host: "https://prod"}},
|
|
}
|
|
err := runLogout(&LogoutOptions{}, &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, newLogoutFactory(t, cfg, secrets.NewMemStore()))
|
|
require.Error(t, err)
|
|
var typed *cmdutil.Error
|
|
require.ErrorAs(t, err, &typed)
|
|
assert.Equal(t, cmdutil.CodeInputMissingFlag, typed.Code)
|
|
}
|
|
|
|
// TestLogout_Cobra exercises the cobra layer for the mutually-exclusive
|
|
// --name + --all flag pair.
|
|
func TestLogout_Cobra_FlagsMutuallyExclusive(t *testing.T) {
|
|
isolateConfig(t)
|
|
_, _ = iostreams.SetForTest(t)
|
|
cfg := &config.Config{Contexts: map[string]config.Context{"a": {}}}
|
|
cmd := NewCmdLogout(newLogoutFactory(t, cfg, secrets.NewMemStore()))
|
|
cmd.SetContext(context.Background())
|
|
cmd.SetArgs([]string{"--name", "a", "--all"})
|
|
cmd.SilenceErrors = true
|
|
cmd.SilenceUsage = true
|
|
require.Error(t, cmd.Execute())
|
|
}
|