From 7a124d7d25ae0cf2d26fdb332ada95eaf325e3a3 Mon Sep 17 00:00:00 2001 From: claude Date: Fri, 19 Jun 2026 22:25:14 +0000 Subject: [PATCH] refactor: make static the default branch in _parse_key_config --- bot_bottle/manifest_git.py | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bot_bottle/manifest_git.py b/bot_bottle/manifest_git.py index 401a958..f620c15 100644 --- a/bot_bottle/manifest_git.py +++ b/bot_bottle/manifest_git.py @@ -195,44 +195,44 @@ def _parse_key_config( f"allowed: {', '.join(sorted(_KEY_PROVIDERS))}" ) - if provider == "static": + if provider == "gitea": for k in d: - if k not in {"provider", "path"}: + if k not in {"provider", "forge_token_env", "api_url"}: raise ManifestError( f"bottle '{bottle_name}' {label}.key has unknown key {k!r} " - f"for provider 'static'; allowed: provider, path" + f"for provider 'gitea'; allowed: provider, forge_token_env, api_url" ) - path = d.get("path") - if not isinstance(path, str) or not path: + forge_token_env = d.get("forge_token_env") + if not isinstance(forge_token_env, str) or not forge_token_env: raise ManifestError( f"bottle '{bottle_name}' {label}.key missing required " - f"string field 'path' for provider 'static'" + f"string field 'forge_token_env' for provider 'gitea'" ) - return ManifestKeyConfig(provider=provider, path=path) + api_url_raw = d.get("api_url", "") + if not isinstance(api_url_raw, str): + raise ManifestError( + f"bottle '{bottle_name}' {label}.key 'api_url' must be a string" + ) + return ManifestKeyConfig( + provider=provider, + forge_token_env=forge_token_env, + api_url=api_url_raw, + ) - # provider == "gitea" + # provider == "static" for k in d: - if k not in {"provider", "forge_token_env", "api_url"}: + if k not in {"provider", "path"}: raise ManifestError( f"bottle '{bottle_name}' {label}.key has unknown key {k!r} " - f"for provider 'gitea'; allowed: provider, forge_token_env, api_url" + f"for provider 'static'; allowed: provider, path" ) - forge_token_env = d.get("forge_token_env") - if not isinstance(forge_token_env, str) or not forge_token_env: + path = d.get("path") + if not isinstance(path, str) or not path: raise ManifestError( f"bottle '{bottle_name}' {label}.key missing required " - f"string field 'forge_token_env' for provider 'gitea'" + f"string field 'path' for provider 'static'" ) - api_url_raw = d.get("api_url", "") - if not isinstance(api_url_raw, str): - raise ManifestError( - f"bottle '{bottle_name}' {label}.key 'api_url' must be a string" - ) - return ManifestKeyConfig( - provider=provider, - forge_token_env=forge_token_env, - api_url=api_url_raw, - ) + return ManifestKeyConfig(provider=provider, path=path) @dataclass(frozen=True)