fix(archied): the State Store seeds provider-settings from the operator's secret reference
configuredSecretRegistry resolved provider keys in place, and the State Store's copy of the config shared the providers map with b.cfg, so ImportConfig seeded the process-local ARCHIE_PROVIDER_<hash> env name. Provider resolution now runs only in the daemon and gateway boot (openStores).
This commit is contained in:
1 parent
4426c0e685
commit
ff77612bfd
3 files changed
+30
-3
No files matched your search
@@ -361,6 +361,10 @@ func (b *boot) openStores(ctx context.Context) error {
|
||||
return err
|
||||
}
|
||||
b.secrets = secrets
|
||||
if err := resolveProviderSecrets(&b.cfg, secrets, log); err != nil {
|
||||
log.Error("resolve provider secrets", "err", err)
|
||||
return err
|
||||
}
|
||||
b.forgeClient, b.token = resolveForge(cfg.Forge, secrets, log)
|
||||
|
||||
// The daemon and gateway do not serve the State Store's tables: the
|
||||
|
||||
@@ -30,9 +30,6 @@ func configuredSecretRegistry(cfg *config.Config, log *slog.Logger) (*secret.Reg
|
||||
}
|
||||
log.Info("secret engines loaded", "count", loaded)
|
||||
}
|
||||
if err := resolveProviderSecrets(cfg, registry, log); err != nil {
|
||||
return nil, fmt.Errorf("resolve provider secrets: %w", err)
|
||||
}
|
||||
return registry, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package archied
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
"testing"
|
||||
|
||||
"github.com/samcharles93/archie-core/internal/config"
|
||||
"github.com/samcharles93/archie-core/internal/secret"
|
||||
)
|
||||
|
||||
// The State Store seeds provider-settings from the config it booted with, so
|
||||
// building its secret registry must leave every provider's source reference
|
||||
// in place rather than rewriting it to a process-local env name.
|
||||
func TestConfiguredSecretRegistryKeepsProviderReferences(t *testing.T) {
|
||||
ref := secret.SecretRef{Engine: "env", Key: "OPENAI_KEY"}
|
||||
t.Setenv("OPENAI_KEY", "sk-test")
|
||||
cfg := config.Config{Providers: map[string]config.Provider{"openai": {Class: "openai", APIKey: ref}}}
|
||||
|
||||
if _, err := configuredSecretRegistry(&cfg, slog.New(slog.DiscardHandler)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
got := cfg.Providers["openai"]
|
||||
if got.APIKey != ref || got.APIKeyEnv != "" {
|
||||
t.Fatalf("provider rewritten: api_key=%+v api_key_env=%q", got.APIKey, got.APIKeyEnv)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user