fix: restore [forge] token_env backward compat, fixing prod crash-loop
Both archied production containers (archie-core-archied-1 and -winter-1)
were crash-looping on carina with "forge token (engine \"env\", key
\"ARCHIE_GITHUB_TOKEN\") is required" despite being configured for gitea.
Root cause: the secrets-engine migration replaced [forge]'s flat
token_env string field with a {engine, key} struct (Forge.Token), but
dropped the old field entirely instead of keeping it as a deprecated
fallback like NATSConfig and TelegramConfig already do. TOML silently
ignores unknown keys, so deployed configs still using token_env had
their token config dropped without any warning, and finalize()
defaulted to demanding ARCHIE_GITHUB_TOKEN.
Fix: re-added Forge.TokenEnv and honor it in finalize() when the new
Token struct is unset, matching the existing NATS/Telegram pattern.
New-style [forge.token] still wins if both are present. Added
regression tests for both cases.
Operationally also fixed the two live configs on carina
(~/.config/archie/config.toml, winter.toml) to the new schema, and
added missing work_dir/db_path to winter.toml (its container had no
config-overlay, so it was defaulting to /root/.local/share/archie
instead of the mounted volume). Both containers verified healthy and
processing real issues after restart.
This commit is contained in:
1 parent
b9ecf37a48
commit
63719cc3ec
2 files changed
+59
-1
No files matched your search
@@ -188,6 +188,14 @@ type Forge struct {
|
||||
Type string `toml:"type" yaml:"type"`
|
||||
Host string `toml:"host" yaml:"host"`
|
||||
Token secret.SecretRef `toml:"token" yaml:"token"`
|
||||
// TokenEnv is the pre-secrets-engine way of naming the token's env var
|
||||
// directly under [forge] (e.g. `token_env = "ARCHIE_GITEA_TOKEN"`).
|
||||
// Deprecated: set token = {engine = "env", key = "..."} instead. Kept
|
||||
// so existing deployed configs don't silently fall back to demanding
|
||||
// ARCHIE_GITHUB_TOKEN (see finalize) — TOML decoding does not error on
|
||||
// unknown fields, so a stale token_env would otherwise be dropped
|
||||
// without any warning.
|
||||
TokenEnv string `toml:"token_env" yaml:"token_env"`
|
||||
}
|
||||
|
||||
// Dispatch configures how archied discovers work and reflects task state
|
||||
@@ -545,7 +553,11 @@ func finalize(cfg Config) (Config, error) {
|
||||
cfg.Forge.Host = "https://github.com"
|
||||
}
|
||||
if cfg.Forge.Token.Engine == "" && cfg.Forge.Token.Key == "" {
|
||||
cfg.Forge.Token = secret.SecretRef{Engine: "env", Key: "ARCHIE_GITHUB_TOKEN"}
|
||||
if cfg.Forge.TokenEnv != "" {
|
||||
cfg.Forge.Token = secret.SecretRef{Engine: "env", Key: cfg.Forge.TokenEnv}
|
||||
} else {
|
||||
cfg.Forge.Token = secret.SecretRef{Engine: "env", Key: "ARCHIE_GITHUB_TOKEN"}
|
||||
}
|
||||
}
|
||||
if cfg.Agent.Mode == "" {
|
||||
if cfg.Containers.Enabled {
|
||||
|
||||
@@ -358,6 +358,52 @@ func TestLoadDispatchAckReaction(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestLoadForgeTokenEnvBackwardCompat guards against a real production
|
||||
// incident: the secrets-engine migration replaced [forge]'s flat
|
||||
// token_env string with a {engine, key} struct, but TOML silently ignores
|
||||
// unknown fields — so deployed configs still using the old token_env key
|
||||
// had their token config dropped entirely and finalize() defaulted to
|
||||
// demanding ARCHIE_GITHUB_TOKEN, crash-looping a gitea-backed daemon.
|
||||
func TestLoadForgeTokenEnvBackwardCompat(t *testing.T) {
|
||||
path := filepath.Join(t.TempDir(), "config.toml")
|
||||
contents := "bot_user = \"widget\"\n" +
|
||||
"[forge]\ntype = \"gitea\"\nhost = \"https://git.example.test\"\ntoken_env = \"MY_GITEA_TOKEN\"\n" +
|
||||
"[[repos]]\nowner = \"acme\"\nname = \"app\"\n"
|
||||
if err := os.WriteFile(path, []byte(contents), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
cfg, err := Load(path)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if cfg.Forge.Token != (secret.SecretRef{Engine: "env", Key: "MY_GITEA_TOKEN"}) {
|
||||
t.Errorf("Forge.Token = %#v, want {env MY_GITEA_TOKEN} (from legacy token_env)", cfg.Forge.Token)
|
||||
}
|
||||
}
|
||||
|
||||
// TestLoadForgeTokenTakesPrecedenceOverTokenEnv verifies the new-style
|
||||
// [forge.token] wins when both the legacy token_env and the new token
|
||||
// struct are present (e.g. mid-migration configs).
|
||||
func TestLoadForgeTokenTakesPrecedenceOverTokenEnv(t *testing.T) {
|
||||
path := filepath.Join(t.TempDir(), "config.toml")
|
||||
contents := "bot_user = \"widget\"\n" +
|
||||
"[forge]\ntype = \"gitea\"\ntoken_env = \"OLD_TOKEN\"\n" +
|
||||
"[forge.token]\nengine = \"env\"\nkey = \"NEW_TOKEN\"\n" +
|
||||
"[[repos]]\nowner = \"acme\"\nname = \"app\"\n"
|
||||
if err := os.WriteFile(path, []byte(contents), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
cfg, err := Load(path)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if cfg.Forge.Token != (secret.SecretRef{Engine: "env", Key: "NEW_TOKEN"}) {
|
||||
t.Errorf("Forge.Token = %#v, want {env NEW_TOKEN} (new-style token wins)", cfg.Forge.Token)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadRejectsInvalidConfigEnumsAndGlobs(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
|
||||
Reference in new issue
Block a user