e623e8208f
Removes the entire envelope machinery now that every success path
emits bare JSON:
- cli/internal/format/envelope.go (Envelope, Success, Failure,
SuccessWithRisk, WriteEnvelope, Meta, Notice, UpdateNotice,
VersionSkewNotice, Risk, RiskLevel, ErrorBody) + tests.
- cli/internal/format/filter.go envelope-specific helpers
(WriteEnvelopeFiltered, marshalEnvelope, applyFieldFilter,
filterDataPayload, filterObjectData); the reusable
filterArrayItems / filterObjectKeys / writeJQ stay for bare.go.
- cli/internal/cmdutil/exporter.go + tests (envelope-only).
- cli/internal/cmdutil/PrintErrorEnvelope + ToErrorBody +
operationRiskOf + Error.OperationRisk field + OperationRisk struct.
Error path: all errors now go to stderr via cmdutil.PrintError in
`code: message\nhint: ...` form, regardless of --json. Stdout stays
empty (or holds the partial-success the command already wrote) so
downstream `--json | jq` pipelines never have to filter error shapes
out of the success stream. Typed exit codes (3 auth.* / 4
resource.not_found / 5 input.* / 6 server.rate_limited / 7 server.*
+ network.* / 10 input.confirmation_required) carry the failure
class for agents that branch on it.
Acceptance contract:
- envelope_test.go → wire_test.go (TestEnvelopeGolden → TestWireGolden).
- testdata/envelopes/ → testdata/wire/.
- Error-path cases assert the typed code substring on stderr.
- Orphan whoami.*.json goldens deleted.
AGENTS.md + README.md rewritten for the bare-data contract:
- Drop envelope schema section + dry-run rule.
- Document bare JSON on stdout + `code: msg\nhint: …` on stderr.
- ADR-3 reframed around bare data and why error separation matters
for `--json | jq` pipelines.
WriteJSONFiltered short-circuits to WriteJSON when both filters are
empty (skip the marshal-buffer round-trip for the common case).
Final review pass:
- Fix wire-contract bug: `--json id,name` (space form) is broken by
pflag's NoOptDefVal; AGENTS.md / README.md / SetAgentHelp + the
field-discovery help text all switched to `--json=id,name`.
- Fix `weknora api --jq` silently ignored: api.go now routes through
WriteJSONFiltered with jopts.JQ.
- AGENTS.md: drop the false claim that `auth logout` honors `-y`
(logout is local-only with no ConfirmDestructive guard); list the
actual destructive commands instead.
- Rewrite cli/acceptance/e2e/e2e_test.go for the bare-data wire shape
(was still parsing `out["data"]` / `env["ok"]`).
- Add `JSONOptions.Emit(w, v)` helper; collapse ~33 repeated
`format.WriteJSONFiltered(iostreams.IO.Out, X, jopts.Fields,
jopts.JQ)` sites to `jopts.Emit(iostreams.IO.Out, X)` — drops the
format import from 22 cmd/* files.
- Delete single-caller `cmdutil.MustRequireFlag`; inline as
`_ = cmd.MarkFlagRequired(...)` everywhere.
- Add `_ = cmd.MarkFlagRequired("name")` to `kb create`; it was the
only write command relying on runtime --name validation while
`context add` already used the cobra-level mark.
- `context use`: register `--json` / `--jq` (was always emitting JSON
unconditionally with no human path and no flag — diverged from
every other write command); human mode now prints
`✓ Switched context to X (was Y)`.
- Replace per-package `confirmPrompter` / `scriptedConfirm` /
`errPrompter` test doubles with `testutil.ConfirmPrompter`.
- Rename `chatService` → `ChatService` (export to match siblings
`ListService` / `ViewService`); rename `printUploadSuccess` →
`renderUploadSuccess` (siblings use `render*`).
- `defaultHint(CodeResourceNotFound)`: drop the hardcoded
"list available with `weknora kb list`" — misleading on agent /
doc / session 404. Replaced with "verify the resource ID and try
again".
- Strip stale `v0.2/v0.3` / "envelope" / "v0.0/v0.1 supports only"
historical tags from production comments and a few test
descriptions.
120 lines
4.3 KiB
Go
120 lines
4.3 KiB
Go
// cli/acceptance/contract/helpers_test.go
|
|
package contract_test
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"flag"
|
|
"net/http/httptest"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/Tencent/WeKnora/cli/cmd"
|
|
"github.com/Tencent/WeKnora/cli/cmd/doctor"
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
"github.com/Tencent/WeKnora/cli/internal/secrets"
|
|
sdk "github.com/Tencent/WeKnora/client"
|
|
)
|
|
|
|
// TestMain pins the doctor credential-storage outcome for the whole suite.
|
|
// Otherwise the check probes the real OS keyring, which differs between
|
|
// macOS dev machines (Keychain present → ok) and Linux CI runners without
|
|
// libsecret (file fallback → warn), making golden outputs host-dependent.
|
|
// MemStore is neither *FileStore nor a real keyring, so the doctor's
|
|
// type-switch hits the StatusOK branch.
|
|
func TestMain(m *testing.M) {
|
|
restore := doctor.SetCredStoreFactoryForTest(func() (secrets.Store, error) {
|
|
return secrets.NewMemStore(), nil
|
|
})
|
|
defer restore()
|
|
os.Exit(m.Run())
|
|
}
|
|
|
|
// update is the standard Go test golden-update flag.
|
|
// go test -update ./acceptance/contract/...
|
|
// Mirrors gh / kubectl / golang-migrate convention.
|
|
var update = flag.Bool("update", false, "update golden files")
|
|
|
|
// newTestFactory builds a Factory whose Client returns mockClient.
|
|
// Caller must NOT use t.Parallel() — see iostreams.SetForTest contract.
|
|
//
|
|
// WEKNORA_BASE_URL is set when mockServer is non-nil. v0.0 buildClient does
|
|
// not currently honor this env var (it reads from config.Host); commands that
|
|
// need the mock URL must rely on the mockClient injection above. The env
|
|
// is set anyway as a forward-affordance for any direct net/http callers
|
|
// added in PR-7+ (e.g. doctor's PingBaseURL HEAD /health).
|
|
func newTestFactory(t *testing.T, mockServer *httptest.Server, mockClient *sdk.Client) *cmdutil.Factory {
|
|
t.Helper()
|
|
t.Setenv("XDG_CONFIG_HOME", t.TempDir())
|
|
t.Setenv("XDG_CACHE_HOME", t.TempDir())
|
|
if mockServer != nil {
|
|
t.Setenv("WEKNORA_BASE_URL", mockServer.URL)
|
|
}
|
|
f := cmdutil.New()
|
|
if mockClient != nil {
|
|
f.Client = func() (*sdk.Client, error) { return mockClient, nil }
|
|
}
|
|
return f
|
|
}
|
|
|
|
// runCmd executes the root command in-process and returns captured stdout/stderr.
|
|
// Replaces iostreams.IO singleton via SetForTest (auto-restored in t.Cleanup).
|
|
//
|
|
// Mirrors cmd.Execute(): wires the cobra Out / Err sinks to the same buffers
|
|
// it returns, and re-runs cmdutil.PrintError on stderr for failure cases so
|
|
// the contract assertion sees the typed `code: message\nhint: ...` line.
|
|
func runCmd(t *testing.T, f *cmdutil.Factory, args ...string) (stdout, stderr string, exitCode int) {
|
|
t.Helper()
|
|
out, errBuf := iostreams.SetForTest(t)
|
|
root := cmd.NewRootCmd(f) // exported in cli/cmd/root.go (Task 16)
|
|
root.SetArgs(args)
|
|
root.SetContext(context.Background())
|
|
root.SetOut(out)
|
|
root.SetErr(errBuf)
|
|
_, err := root.ExecuteC()
|
|
if err != nil {
|
|
err = cmd.MapCobraError(err)
|
|
cmdutil.PrintError(iostreams.IO.Err, err)
|
|
}
|
|
return out.String(), errBuf.String(), cmdutil.ExitCode(err)
|
|
}
|
|
|
|
// assertGolden compares got against the JSON golden file at path.
|
|
// With -update, writes got to path.
|
|
//
|
|
// CRLF normalization: Windows checkouts with the default core.autocrlf=true
|
|
// turn LF in tracked text files into CRLF on disk. The command output is
|
|
// always LF, so byte-equal would fail despite identical content.
|
|
// .gitattributes is the primary defense (forcing LF on testdata/**/*.json),
|
|
// but we also strip CR here so a misconfigured contributor checkout doesn't
|
|
// break the suite locally before they push.
|
|
func assertGolden(t *testing.T, got []byte, path string) {
|
|
t.Helper()
|
|
if *update {
|
|
if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
|
|
t.Fatalf("mkdir testdata: %v", err)
|
|
}
|
|
if err := os.WriteFile(path, got, 0644); err != nil {
|
|
t.Fatalf("write golden: %v", err)
|
|
}
|
|
return
|
|
}
|
|
want, err := os.ReadFile(path)
|
|
if err != nil {
|
|
t.Fatalf("read golden %s: %v (run with -update to create)", path, err)
|
|
}
|
|
want = stripCR(want)
|
|
got = stripCR(got)
|
|
if !bytes.Equal(want, got) {
|
|
t.Errorf("stdout mismatch for %s\nwant:\n%s\ngot:\n%s", path, want, got)
|
|
}
|
|
}
|
|
|
|
// stripCR removes CR bytes so CRLF golden files (from Windows autocrlf
|
|
// checkout) compare equal to LF runtime output.
|
|
func stripCR(b []byte) []byte {
|
|
return bytes.ReplaceAll(b, []byte{'\r'}, nil)
|
|
}
|