diff --git a/internal/app/archied/bootstrap.go b/internal/app/archied/bootstrap.go index 3032aa8fa..424d2b10b 100644 --- a/internal/app/archied/bootstrap.go +++ b/internal/app/archied/bootstrap.go @@ -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 diff --git a/internal/app/archied/provider_secrets.go b/internal/app/archied/provider_secrets.go index a2207553c..42ea23634 100644 --- a/internal/app/archied/provider_secrets.go +++ b/internal/app/archied/provider_secrets.go @@ -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 } diff --git a/internal/app/archied/provider_secrets_test.go b/internal/app/archied/provider_secrets_test.go new file mode 100644 index 000000000..0d3738e4a --- /dev/null +++ b/internal/app/archied/provider_secrets_test.go @@ -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) + } +}