AI/mcp-framework
1
0
Fork 0
Code Issues Pull requests Projects Releases 40 Packages Wiki Activity Actions

perf: avoid bitwarden probe in runtime description

Browse source
This commit is contained in:
thibaud-lclr 2026-05-02 15:47:07 +02:00
parent 893600ffd5
commit 1e11181c02
3 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/secrets.md
View file

@ -187,7 +187,8 @@ effective := secretstore.EffectiveBackendPolicy(store)
fmt.Println("backend effectif:", effective) // bitwarden-cli, env-only, keyring-any... fmt.Println("backend effectif:", effective) // bitwarden-cli, env-only, keyring-any...
``` ```
Pour obtenir en un seul appel une description runtime (source manifeste, policy déclarée/effective, disponibilité) : Pour obtenir en un seul appel une description runtime légère (source manifeste,
policy déclarée/effective, backend affiché) :
```go ```go
desc, err := secretstore.DescribeRuntime(secretstore.DescribeRuntimeOptions{ desc, err := secretstore.DescribeRuntime(secretstore.DescribeRuntimeOptions{
@ -202,7 +203,8 @@ fmt.Println(secretstore.FormatBackendStatus(desc))
// declared=... effective=... display=... ready=... source=... // declared=... effective=... display=... ready=... source=...
``` ```
Pour un préflight réutilisable dans `setup`, `config show` et `config test` : `DescribeRuntime` ne contacte pas Bitwarden par défaut. Pour vérifier réellement
la disponibilité du backend, utiliser le préflight :
```go ```go
report, err := secretstore.PreflightFromManifest(secretstore.PreflightOptions{ report, err := secretstore.PreflightFromManifest(secretstore.PreflightOptions{

4
secretstore/runtime.go
View file

@ -16,6 +16,7 @@ type DescribeRuntimeOptions struct {
BitwardenCommand string BitwardenCommand string
BitwardenDebug bool BitwardenDebug bool
DisableBitwardenCache bool DisableBitwardenCache bool
CheckReady bool
Shell string Shell string
ManifestLoader ManifestLoader ManifestLoader ManifestLoader
ExecutableResolver ExecutableResolver ExecutableResolver ExecutableResolver
@ -91,7 +92,7 @@ func DescribeRuntime(options DescribeRuntimeOptions) (RuntimeDescription, error)
desc.EffectivePolicy = effective desc.EffectivePolicy = effective
desc.DisplayName = BackendDisplayName(effective) desc.DisplayName = BackendDisplayName(effective)
} }
if desc.EffectivePolicy == BackendBitwardenCLI { if options.CheckReady && desc.EffectivePolicy == BackendBitwardenCLI {
if err := verifyBitwardenCLIReady(Options{ if err := verifyBitwardenCLIReady(Options{
BitwardenCommand: options.BitwardenCommand, BitwardenCommand: options.BitwardenCommand,
BitwardenDebug: options.BitwardenDebug, BitwardenDebug: options.BitwardenDebug,
@ -107,6 +108,7 @@ func DescribeRuntime(options DescribeRuntimeOptions) (RuntimeDescription, error)
} }
func PreflightFromManifest(options PreflightOptions) (PreflightReport, error) { func PreflightFromManifest(options PreflightOptions) (PreflightReport, error) {
options.CheckReady = true
desc, err := DescribeRuntime(options) desc, err := DescribeRuntime(options)
if err != nil { if err != nil {
return PreflightReport{}, err return PreflightReport{}, err

22
secretstore/runtime_test.go
View file

@ -46,16 +46,9 @@ func TestDescribeRuntimeReturnsDeclaredAndEffectivePolicies(t *testing.T) {
} }
} }
func TestDescribeRuntimeReportsUnavailableBitwardenAsNotReady(t *testing.T) { func TestDescribeRuntimeDoesNotProbeBitwardenByDefault(t *testing.T) {
withBitwardenRunner(t, func(command string, stdin []byte, args ...string) ([]byte, error) { withBitwardenRunner(t, func(command string, stdin []byte, args ...string) ([]byte, error) {
switch { return nil, errors.New("unexpected bitwarden invocation")
case len(args) == 1 && args[0] == "--version":
return []byte("2026.1.0\n"), nil
case len(args) == 1 && args[0] == "status":
return []byte(`{"status":"locked"}`), nil
default:
return nil, errors.New("unexpected bitwarden invocation")
}
}) })
desc, err := DescribeRuntime(DescribeRuntimeOptions{ desc, err := DescribeRuntime(DescribeRuntimeOptions{
@ -80,14 +73,11 @@ func TestDescribeRuntimeReportsUnavailableBitwardenAsNotReady(t *testing.T) {
if desc.EffectivePolicy != BackendBitwardenCLI { if desc.EffectivePolicy != BackendBitwardenCLI {
t.Fatalf("EffectivePolicy = %q, want %q", desc.EffectivePolicy, BackendBitwardenCLI) t.Fatalf("EffectivePolicy = %q, want %q", desc.EffectivePolicy, BackendBitwardenCLI)
} }
if desc.Ready { if !desc.Ready {
t.Fatalf("Ready = %v, want false", desc.Ready) t.Fatalf("Ready = %v, want true without readiness probe", desc.Ready)
} }
if !errors.Is(desc.ReadyError, ErrBWLocked) { if desc.ReadyError != nil {
t.Fatalf("ReadyError = %v, want ErrBWLocked", desc.ReadyError) t.Fatalf("ReadyError = %v, want nil without readiness probe", desc.ReadyError)
}
if !strings.Contains(desc.ReadyError.Error(), "set -x BW_SESSION (bw unlock --raw)") {
t.Fatalf("ReadyError = %v, want fish remediation", desc.ReadyError)
} }
} }