Skip to content

Prefer source token for artifact selector resolution #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shiny-code-bot merged 1 commit into from
May 28, 2026
Merged

Prefer source token for artifact selector resolution #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion odoo_devkit/local_runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2087,7 +2087,9 @@ def resolve_artifact_runtime_source_repository_refs(
runtime_values: dict[str, str],
) -> tuple[dict[str, str], tuple[dict[str, str], ...]]:
resolved_values = dict(runtime_values)
github_token = resolve_github_token_for_build(runtime_values)
github_token = clean_optional_value(runtime_values.get("GITHUB_TOKEN")) or first_clean_optional_value(
(os.environ.get("GITHUB_TOKEN"), os.environ.get("GH_TOKEN"))
)
selector_metadata: list[dict[str, str]] = []
for env_key in ARTIFACT_SOURCE_ENV_KEYS:
raw_value = runtime_values.get(env_key, "")
Expand Down
20 changes: 20 additions & 0 deletions tests/test_runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1645,6 +1645,26 @@ def test_resolve_artifact_runtime_source_refs_uses_environment_token_fallback(se
),
)

def test_resolve_artifact_runtime_source_refs_prefers_runtime_github_token(self) -> None:
runtime_values = {
"GITHUB_TOKEN": "source-token",
"ODOO_ADDON_REPOSITORIES": "cbusillo/disable_odoo_online@main",
}
with mock.patch.dict(os.environ, {"GHCR_TOKEN": "package-token", "GITHUB_TOKEN": "env-token"}):
with mock.patch(
"odoo_devkit.local_runtime.resolve_source_repository_ref_to_git_sha",
return_value="411f6b8e85cac72dc7aa2e2dc5540001043c327d",
) as resolve_ref_mock:
local_runtime.resolve_artifact_runtime_source_repository_refs(
runtime_values=runtime_values
)

resolve_ref_mock.assert_called_once_with(
repository="cbusillo/disable_odoo_online",
ref="main",
github_token="source-token",
)

def test_resolve_source_repository_ref_to_git_sha_rejects_ambiguous_matches(self) -> None:
ambiguous_stdout = (
"1111111111111111111111111111111111111111\trefs/heads/main\n2222222222222222222222222222222222222222\trefs/tags/main\n"
Expand Down