Public Access
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9408111088 | ||
|
|
349057bf5d | ||
|
|
3b2a278f87 | ||
|
|
127f781076 | ||
|
|
d41972093b | ||
|
|
5e0befe777 | ||
|
|
fcc171183c | ||
|
|
9d0e4cf429 | ||
|
|
203d6971b3 |
@@ -2,6 +2,24 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## [0.55.3] - 2026-09-21
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- Honor repo bandit config in badge quality check
|
||||||
|
|
||||||
|
## [0.55.2] - 2026-09-19
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- *(ci)* Supply git identity for dep-PR manifest commits
|
||||||
|
|
||||||
|
## [0.55.1] - 2026-09-19
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- *(ci)* Resolve dep-PR container digest via registry v2 API
|
||||||
|
|
||||||
## [0.55.0] - 2026-09-19
|
## [0.55.0] - 2026-09-19
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|||||||
@@ -16,12 +16,12 @@ quality badges.
|
|||||||
|
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/src/branch/master/LICENSE)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/src/branch/master/LICENSE)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
|
||||||
[](https://www.python.org/downloads/)
|
[](https://www.python.org/downloads/)
|
||||||
|
|
||||||
## Why devx?
|
## Why devx?
|
||||||
|
|
||||||
@@ -87,7 +87,7 @@ extra index and list devx in your dependencies:
|
|||||||
```toml
|
```toml
|
||||||
[project]
|
[project]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"devx>=0.55.0",
|
"devx>=0.55.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.pip]
|
[tool.pip]
|
||||||
@@ -101,8 +101,8 @@ pip install -e .
|
|||||||
```
|
```
|
||||||
|
|
||||||
> **Note:** If your project requires a specific devx version, pin it in
|
> **Note:** If your project requires a specific devx version, pin it in
|
||||||
> `dependencies` (for example, `"devx==0.55.0"`) or use a version constraint
|
> `dependencies` (for example, `"devx==0.55.3"`) or use a version constraint
|
||||||
> (for example, `"devx>=0.55.0,<0.56"`).
|
> (for example, `"devx>=0.55.3,<0.56"`).
|
||||||
|
|
||||||
### Optional extras
|
### Optional extras
|
||||||
|
|
||||||
|
|||||||
+8
-8
@@ -12,12 +12,12 @@ project to be reusable across all oblachno-oss repositories.
|
|||||||
|
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/src/branch/master/LICENSE)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/src/branch/master/LICENSE)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
|
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
|
||||||
[](https://www.python.org/downloads/)
|
[](https://www.python.org/downloads/)
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
@@ -74,14 +74,14 @@ Add devx to your `pyproject.toml` dependencies and configure the registry:
|
|||||||
```toml
|
```toml
|
||||||
[project]
|
[project]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"devx>=0.55.0",
|
"devx>=0.55.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.pip]
|
[tool.pip]
|
||||||
extra-index-url = "https://git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple"
|
extra-index-url = "https://git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple"
|
||||||
```
|
```
|
||||||
|
|
||||||
Pin a specific version if needed: `"devx==0.55.0"` or `"devx>=0.55.0,<0.56"`.
|
Pin a specific version if needed: `"devx==0.55.3"` or `"devx>=0.55.3,<0.56"`.
|
||||||
|
|
||||||
### Optional extras
|
### Optional extras
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
# DEVX-173: Resolve container digest via registry v2 API
|
||||||
|
|
||||||
|
## Problem
|
||||||
|
|
||||||
|
`resolve_container_digest` returns the sha256 of the `manifest.json`
|
||||||
|
blob listed by the Gitea packages API (`/packages/<owner>/container/
|
||||||
|
<name>/<tag>/files`). That blob digest is NOT the OCI manifest digest —
|
||||||
|
`docker pull repo@sha256:<blob>` fails with "not found." Production
|
||||||
|
deploy run 6251 died pulling `sso-bridge@sha256:5ca9...` which the dep
|
||||||
|
PR had recorded in `deploy/sso-bridge-release.json`. The registry serves
|
||||||
|
0.4.1 as `sha256:c0212ed1...` — different digest entirely.
|
||||||
|
|
||||||
|
## Approach
|
||||||
|
|
||||||
|
REQ-1: Keep the packages-API call as the existence check (it has the
|
||||||
|
404-retry semantics needed for the publish race) but resolve the
|
||||||
|
pullable digest via the registry v2 API: `GET /v2/token` with
|
||||||
|
`scope=repository:<owner>/<name>:pull` (basic-auth with the Gitea
|
||||||
|
token), then `GET /v2/<owner>/<name>/manifests/<tag>` with OCI/Docker
|
||||||
|
manifest Accept headers and read `Docker-Content-Digest`. Registry base
|
||||||
|
URL is derived from `GITEA_API_URL` (strip `/api/v1`).
|
||||||
|
|
||||||
|
REQ-2: If the v2 digest lookup fails (non-2xx, missing header), fail
|
||||||
|
closed with a ClickException — never record a blob sha256 as a pullable
|
||||||
|
digest.
|
||||||
|
|
||||||
|
## Test Plan
|
||||||
|
|
||||||
|
- Mocked v2 token + manifest endpoints return digest; recorded value is
|
||||||
|
the `Docker-Content-Digest` header.
|
||||||
|
- 404 retry semantics on the packages-API existence check unchanged.
|
||||||
|
- Missing digest header / non-2xx manifest response → ClickException.
|
||||||
|
- Unit tests cover token request scope and Accept headers.
|
||||||
|
|
||||||
|
## Deploy Plan
|
||||||
|
|
||||||
|
devx release tag; the sso-bridge dep-PR pin bump follows in its own PR.
|
||||||
|
The wrong digest already recorded in infra's manifest is corrected by
|
||||||
|
re-running the dep-PR with the fixed version.
|
||||||
|
|
||||||
|
## Rollback Plan
|
||||||
|
|
||||||
|
Revert; dep-PR records the (unpullable) blob digest again — deploys must
|
||||||
|
then use tag pulls until a corrected manifest lands.
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [x] REQ-1: Digest resolved from `Docker-Content-Digest` via v2 API.
|
||||||
|
- [x] REQ-2: Lookup failures fail closed; no blob-sha256 fallback.
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
# DEVX-174: Set git identity in dep-PR target clone
|
||||||
|
|
||||||
|
## Problem
|
||||||
|
|
||||||
|
`create_dependency_pr` commits the manifest bump in a fresh clone of the
|
||||||
|
target repo. The clone has no `user.name`/`user.email`, so `git commit`
|
||||||
|
exits 128 ("Please tell me who you are") — observed in sso-bridge
|
||||||
|
post-merge run 6284 after the digest and manifest bump both succeeded.
|
||||||
|
|
||||||
|
## Approach
|
||||||
|
|
||||||
|
REQ-1: Pass a CI bot identity inline (`git -c user.name=... -c
|
||||||
|
user.email=... commit`) so the commit works in any environment without
|
||||||
|
mutating global git config.
|
||||||
|
|
||||||
|
## Test Plan
|
||||||
|
|
||||||
|
- Unit test asserting the commit invocation carries `-c user.name` /
|
||||||
|
`-c user.email` arguments.
|
||||||
|
|
||||||
|
## Deploy Plan
|
||||||
|
|
||||||
|
devx release; sso-bridge picks it up via its devx pin on next bump.
|
||||||
|
|
||||||
|
## Rollback Plan
|
||||||
|
|
||||||
|
Revert; dep-PR commit fails again in containers without git identity.
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [x] REQ-1: dep-PR commit supplies explicit identity flags.
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# DEVX-175: Badge generation must honor repo bandit configuration
|
||||||
|
|
||||||
|
## Problem
|
||||||
|
|
||||||
|
`collect_quality()` in `generate_badges.py` runs `bandit -r src/` with no
|
||||||
|
config file. Repos that declare a `[tool.bandit]` section in
|
||||||
|
`pyproject.toml` (skip lists aligned with infrastructure patterns — for
|
||||||
|
example sso-bridge skips B404/B603/B501) lint clean via `make lint-all`, but the
|
||||||
|
quality badge still reports `bandit: FAIL` — a false-FAIL badge that
|
||||||
|
contradicts the actual lint gate.
|
||||||
|
|
||||||
|
## Approach
|
||||||
|
|
||||||
|
REQ-1: When `pyproject.toml` exists in the target repo and contains a
|
||||||
|
`[tool.bandit]` section, pass `-c pyproject.toml` to the bandit invocation
|
||||||
|
in `collect_quality()`.
|
||||||
|
|
||||||
|
REQ-2: Repos without `[tool.bandit]` keep the current invocation unchanged.
|
||||||
|
|
||||||
|
## Test Plan
|
||||||
|
|
||||||
|
- Unit test: repo fixture with `[tool.bandit]` → command includes
|
||||||
|
`-c pyproject.toml`; without the section → plain invocation.
|
||||||
|
- Manual: `python -m devx.tools.generate_badges` in sso-bridge reports
|
||||||
|
`bandit: pass`.
|
||||||
|
|
||||||
|
## Deploy Plan
|
||||||
|
|
||||||
|
devx release → repos pick it up on next devx pin bump; no infra changes.
|
||||||
|
|
||||||
|
## Rollback Plan
|
||||||
|
|
||||||
|
Revert the commit; badges revert to unconfigured bandit runs.
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
- [x] REQ-1 implemented with `# Implements: REQ-1` comment
|
||||||
|
- [x] REQ-2 preserved (no config → unchanged command)
|
||||||
|
- [x] Unit tests cover both branches
|
||||||
|
- [x] `make lint-all` + `make pytest-cov` pass in devx
|
||||||
@@ -48,12 +48,12 @@ Add devx to your `pyproject.toml`:
|
|||||||
```toml
|
```toml
|
||||||
[project]
|
[project]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"devx>=0.55.0",
|
"devx>=0.55.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
dev = [
|
dev = [
|
||||||
"devx>=0.55.0",
|
"devx>=0.55.3",
|
||||||
]
|
]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -6,4 +6,4 @@ create_dependency_pr, auto_merge, release, publish), developer tooling
|
|||||||
molecule testing helpers for Ansible projects.
|
molecule testing helpers for Ansible projects.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__version__ = "0.55.0"
|
__version__ = "0.55.3"
|
||||||
|
|||||||
@@ -96,18 +96,25 @@ def update_pinned_version(file_path: str, package: str, old_version: str, new_ve
|
|||||||
return changed
|
return changed
|
||||||
|
|
||||||
|
|
||||||
|
_MANIFEST_ACCEPT = (
|
||||||
|
"application/vnd.oci.image.index.v1+json, "
|
||||||
|
"application/vnd.docker.distribution.manifest.list.v2+json, "
|
||||||
|
"application/vnd.oci.image.manifest.v1+json, "
|
||||||
|
"application/vnd.docker.distribution.manifest.v2+json"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# Implements: REQ-1 — existence check via packages API (keeps the 404-retry
|
||||||
|
# semantics for the publish race); the pullable digest is then resolved via
|
||||||
|
# the registry v2 API's Docker-Content-Digest header.
|
||||||
def resolve_container_digest(api_url: str, owner: str, name: str, tag: str, token: str, timeout_s: int = 0) -> str:
|
def resolve_container_digest(api_url: str, owner: str, name: str, tag: str, token: str, timeout_s: int = 0) -> str:
|
||||||
"""Resolve the OCI digest for a container image tag via the packages API.
|
"""Verify the container tag exists, then resolve its pullable OCI digest.
|
||||||
|
|
||||||
Implements REQ-1: dependency PRs must only be opened after the producer
|
The packages API proves the tag was published (and 404s while the
|
||||||
artifact exists — this raises ClickException when the tag is missing or
|
producer's image-build workflow races us — ``timeout_s`` retries every
|
||||||
the registry call fails, so the PR is never opened against an artifact
|
15s). The packages-API ``manifest.json`` blob sha256 is NOT pullable
|
||||||
that has not been published. The sha256 of the stored ``manifest.json``
|
via ``repo@sha256:...``, so the digest comes from the registry v2
|
||||||
blob is the manifest content digest (what ``docker pull`` reports).
|
``Docker-Content-Digest`` header instead.
|
||||||
|
|
||||||
Implements REQ-2: ``timeout_s`` > 0 retries the lookup every 15s until
|
|
||||||
the deadline — the dep-PR step races the producer's image-build
|
|
||||||
workflow, which pushes the tag concurrently.
|
|
||||||
"""
|
"""
|
||||||
url = f"{api_url}/packages/{owner}/container/{name}/{tag}/files"
|
url = f"{api_url}/packages/{owner}/container/{name}/{tag}/files"
|
||||||
headers = {"Authorization": f"token {token}"}
|
headers = {"Authorization": f"token {token}"}
|
||||||
@@ -150,17 +157,47 @@ def resolve_container_digest(api_url: str, owner: str, name: str, tag: str, toke
|
|||||||
)
|
)
|
||||||
) from e
|
) from e
|
||||||
break
|
break
|
||||||
for f in resp.json():
|
return _resolve_registry_digest(api_url, owner, name, tag, token)
|
||||||
if f.get("name") == "manifest.json" and f.get("sha256"):
|
|
||||||
return f"sha256:{f['sha256']}"
|
|
||||||
raise click.ClickException(
|
# Implements: REQ-2 — v2 digest resolution fails closed: non-2xx, missing
|
||||||
_(
|
# token, or absent Docker-Content-Digest all raise; a blob sha256 is never
|
||||||
"Registry returned no manifest blob for {owner}/{name}:{tag}.",
|
# recorded as a pullable digest.
|
||||||
owner=owner,
|
def _resolve_registry_digest(api_url: str, owner: str, name: str, tag: str, token: str) -> str:
|
||||||
name=name,
|
registry = api_url.removesuffix("/api/v1").removesuffix("/")
|
||||||
tag=tag,
|
repo = f"{owner}/{name}"
|
||||||
|
try:
|
||||||
|
tok_resp = requests.get( # nosec B310
|
||||||
|
f"{registry}/v2/token",
|
||||||
|
params={"service": "container_registry", "scope": f"repository:{repo}:pull"},
|
||||||
|
auth=("ci", token),
|
||||||
|
timeout=30,
|
||||||
)
|
)
|
||||||
)
|
tok_resp.raise_for_status()
|
||||||
|
bearer = tok_resp.json().get("token", "")
|
||||||
|
man_resp = requests.get( # nosec B310
|
||||||
|
f"{registry}/v2/{repo}/manifests/{tag}",
|
||||||
|
headers={"Authorization": f"Bearer {bearer}", "Accept": _MANIFEST_ACCEPT},
|
||||||
|
timeout=30,
|
||||||
|
)
|
||||||
|
man_resp.raise_for_status()
|
||||||
|
except requests.RequestException as e:
|
||||||
|
status = getattr(getattr(e, "response", None), "status_code", "?")
|
||||||
|
raise click.ClickException(
|
||||||
|
_(
|
||||||
|
"Registry v2 digest lookup failed for {repo}:{tag} (HTTP {status}): {error}",
|
||||||
|
repo=repo,
|
||||||
|
tag=tag,
|
||||||
|
status=status,
|
||||||
|
error=e,
|
||||||
|
)
|
||||||
|
) from e
|
||||||
|
digest = man_resp.headers.get("Docker-Content-Digest", "")
|
||||||
|
if not digest:
|
||||||
|
raise click.ClickException(
|
||||||
|
_("Registry returned no Docker-Content-Digest for {repo}:{tag}.", repo=repo, tag=tag)
|
||||||
|
)
|
||||||
|
return digest
|
||||||
|
|
||||||
|
|
||||||
def update_manifest(file_path: str, section: str, fields: dict[str, str]) -> bool:
|
def update_manifest(file_path: str, section: str, fields: dict[str, str]) -> bool:
|
||||||
@@ -468,7 +505,22 @@ def cli(
|
|||||||
add_files.append(spec_rel)
|
add_files.append(spec_rel)
|
||||||
subprocess.run(["git", "add", *add_files], check=True, cwd=workdir) # nosec B603 B607
|
subprocess.run(["git", "add", *add_files], check=True, cwd=workdir) # nosec B603 B607
|
||||||
commit_msg = f"deps: bump {package} from {old_version} to {new_version}"
|
commit_msg = f"deps: bump {package} from {old_version} to {new_version}"
|
||||||
subprocess.run(["git", "commit", "-m", commit_msg], check=True, cwd=workdir) # nosec B603 B607
|
# Implements: REQ-1 — the fresh clone has no git identity in CI
|
||||||
|
# containers; supply it inline (same bot identity as push_badges).
|
||||||
|
subprocess.run( # nosec B603 B607
|
||||||
|
[
|
||||||
|
"git",
|
||||||
|
"-c",
|
||||||
|
"user.name=gitea-actions-bot",
|
||||||
|
"-c",
|
||||||
|
"user.email=actions@oblachno.fyi",
|
||||||
|
"commit",
|
||||||
|
"-m",
|
||||||
|
commit_msg,
|
||||||
|
],
|
||||||
|
check=True,
|
||||||
|
cwd=workdir,
|
||||||
|
)
|
||||||
subprocess.run( # nosec B603 B607
|
subprocess.run( # nosec B603 B607
|
||||||
["git", "-c", auth_cfg, "push", "origin", branch_name],
|
["git", "-c", auth_cfg, "push", "origin", branch_name],
|
||||||
check=True,
|
check=True,
|
||||||
|
|||||||
@@ -346,11 +346,18 @@ def collect_quality(repo_root: Path) -> dict[str, str | int]:
|
|||||||
results: list[bool] = []
|
results: list[bool] = []
|
||||||
tool_names: list[str] = []
|
tool_names: list[str] = []
|
||||||
|
|
||||||
|
# Implements: REQ-1 (DEVX-175) — honor the repo's [tool.bandit] config so
|
||||||
|
# the badge matches the project's actual lint gate (skip lists etc.).
|
||||||
|
bandit_cmd = [sys.executable, "-m", "bandit", "-r", "src/"]
|
||||||
|
pyproject = repo_root / "pyproject.toml"
|
||||||
|
if pyproject.exists() and "[tool.bandit]" in pyproject.read_text():
|
||||||
|
bandit_cmd += ["-c", "pyproject.toml"]
|
||||||
|
|
||||||
for cmd, name in [
|
for cmd, name in [
|
||||||
([sys.executable, "-m", "ruff", "check", "src/", "tests/"], "ruff check"),
|
([sys.executable, "-m", "ruff", "check", "src/", "tests/"], "ruff check"),
|
||||||
([sys.executable, "-m", "ruff", "format", "--check", "src/", "tests/"], "ruff format"),
|
([sys.executable, "-m", "ruff", "format", "--check", "src/", "tests/"], "ruff format"),
|
||||||
([sys.executable, "-m", "pyright"], "pyright"),
|
([sys.executable, "-m", "pyright"], "pyright"),
|
||||||
([sys.executable, "-m", "bandit", "-r", "src/"], "bandit"),
|
(bandit_cmd, "bandit"),
|
||||||
]:
|
]:
|
||||||
rc, _stdout, stderr = run_command(cmd, cwd=repo_root)
|
rc, _stdout, stderr = run_command(cmd, cwd=repo_root)
|
||||||
if rc == 0:
|
if rc == 0:
|
||||||
|
|||||||
@@ -2967,13 +2967,21 @@
|
|||||||
"ru": "Ошибка поиска в реестре для {owner}/{name}:{tag}: {error}",
|
"ru": "Ошибка поиска в реестре для {owner}/{name}:{tag}: {error}",
|
||||||
"zh": "注册表查询 {owner}/{name}:{tag} 失败:{error}"
|
"zh": "注册表查询 {owner}/{name}:{tag} 失败:{error}"
|
||||||
},
|
},
|
||||||
"Registry returned no manifest blob for {owner}/{name}:{tag}.": {
|
"Registry returned no Docker-Content-Digest for {repo}:{tag}.": {
|
||||||
"bg": "Регистърът не върна manifest blob за {owner}/{name}:{tag}.",
|
"bg": "Регистърът не върна Docker-Content-Digest за {repo}:{tag}.",
|
||||||
"de": "Registry hat keinen Manifest-Blob für {owner}/{name}:{tag} zurückgegeben.",
|
"de": "Registry hat keinen Docker-Content-Digest für {repo}:{tag} zurückgegeben.",
|
||||||
"en": "Registry returned no manifest blob for {owner}/{name}:{tag}.",
|
"en": "Registry returned no Docker-Content-Digest for {repo}:{tag}.",
|
||||||
"pl": "Rejestr nie zwrócił blobu manifestu dla {owner}/{name}:{tag}.",
|
"pl": "Rejestr nie zwrócił Docker-Content-Digest dla {repo}:{tag}.",
|
||||||
"ru": "Реестр не вернул blob манифеста для {owner}/{name}:{tag}.",
|
"ru": "Реестр не вернул Docker-Content-Digest для {repo}:{tag}.",
|
||||||
"zh": "注册表未返回 {owner}/{name}:{tag} 的清单 blob。"
|
"zh": "注册表未返回 {repo}:{tag} 的 Docker-Content-Digest。"
|
||||||
|
},
|
||||||
|
"Registry v2 digest lookup failed for {repo}:{tag} (HTTP {status}): {error}": {
|
||||||
|
"bg": "Неуспешна заявка за дайджест към регистър v2 за {repo}:{tag} (HTTP {status}): {error}",
|
||||||
|
"de": "Registry-v2-Digest-Abfrage für {repo}:{tag} fehlgeschlagen (HTTP {status}): {error}",
|
||||||
|
"en": "Registry v2 digest lookup failed for {repo}:{tag} (HTTP {status}): {error}",
|
||||||
|
"pl": "Zapytanie o skrót do rejestru v2 dla {repo}:{tag} nie powiodło się (HTTP {status}): {error}",
|
||||||
|
"ru": "Ошибка запроса дайджеста к реестру v2 для {repo}:{tag} (HTTP {status}): {error}",
|
||||||
|
"zh": "注册表 v2 摘要查询 {repo}:{tag} 失败 (HTTP {status}):{error}"
|
||||||
},
|
},
|
||||||
"Regular merge commit — running all post-merge jobs.": {
|
"Regular merge commit — running all post-merge jobs.": {
|
||||||
"bg": "Обикновен merge комит — изпълняват се всички post-merge задачи.",
|
"bg": "Обикновен merge комит — изпълняват се всички post-merge задачи.",
|
||||||
|
|||||||
@@ -200,23 +200,39 @@ class TestCreateVikunjaTask:
|
|||||||
assert mock_client.create_task.call_args.args[0] == 3
|
assert mock_client.create_task.call_args.args[0] == 3
|
||||||
|
|
||||||
|
|
||||||
class TestResolveContainerDigest:
|
def _v2_mocks(digest: str = "sha256:deadbeef") -> list[MagicMock]:
|
||||||
"""REQ-1: pre-PR artifact verification via the packages API."""
|
"""Token + manifest responses for the registry v2 digest lookup."""
|
||||||
|
tok = MagicMock()
|
||||||
|
tok.raise_for_status = MagicMock()
|
||||||
|
tok.json.return_value = {"token": "bearer-tok"}
|
||||||
|
man = MagicMock()
|
||||||
|
man.raise_for_status = MagicMock()
|
||||||
|
man.headers = {"Docker-Content-Digest": digest}
|
||||||
|
return [tok, man]
|
||||||
|
|
||||||
def test_returns_digest_from_manifest_blob(self) -> None:
|
|
||||||
|
class TestResolveContainerDigest:
|
||||||
|
"""REQ-1: existence check via packages API; digest via registry v2."""
|
||||||
|
|
||||||
|
def test_returns_digest_from_registry_v2(self) -> None:
|
||||||
from devx.ci.create_dependency_pr import resolve_container_digest
|
from devx.ci.create_dependency_pr import resolve_container_digest
|
||||||
|
|
||||||
mock_resp = MagicMock()
|
files = MagicMock()
|
||||||
mock_resp.raise_for_status = MagicMock()
|
files.raise_for_status = MagicMock()
|
||||||
mock_resp.json.return_value = [
|
files.json.return_value = [{"name": "manifest.json", "sha256": "blob-not-pullable"}]
|
||||||
{"name": "sha256_layer", "sha256": "abc"},
|
with patch(
|
||||||
{"name": "manifest.json", "sha256": "deadbeef"},
|
"devx.ci.create_dependency_pr.requests.get",
|
||||||
]
|
side_effect=[files, *_v2_mocks()],
|
||||||
with patch("devx.ci.create_dependency_pr.requests.get", return_value=mock_resp):
|
) as mock_get:
|
||||||
digest = resolve_container_digest(
|
digest = resolve_container_digest(
|
||||||
"https://git.example.com/api/v1", "oblachno", "sso-bridge", "0.9.1", "tok"
|
"https://git.example.com/api/v1", "oblachno", "sso-bridge", "0.9.1", "tok"
|
||||||
)
|
)
|
||||||
assert digest == "sha256:deadbeef"
|
assert digest == "sha256:deadbeef"
|
||||||
|
man_call = mock_get.call_args_list[2]
|
||||||
|
assert "manifests/0.9.1" in man_call.args[0]
|
||||||
|
assert "oci.image.index" in man_call.kwargs["headers"]["Accept"]
|
||||||
|
tok_call = mock_get.call_args_list[1]
|
||||||
|
assert tok_call.kwargs["params"]["scope"] == "repository:oblachno/sso-bridge:pull"
|
||||||
|
|
||||||
def test_raises_when_version_missing(self) -> None:
|
def test_raises_when_version_missing(self) -> None:
|
||||||
import requests
|
import requests
|
||||||
@@ -231,14 +247,38 @@ class TestResolveContainerDigest:
|
|||||||
with pytest.raises(click.ClickException, match="unpublished artifact"):
|
with pytest.raises(click.ClickException, match="unpublished artifact"):
|
||||||
resolve_container_digest("https://git.example.com/api/v1", "oblachno", "sso-bridge", "9.9.9", "tok")
|
resolve_container_digest("https://git.example.com/api/v1", "oblachno", "sso-bridge", "9.9.9", "tok")
|
||||||
|
|
||||||
def test_raises_when_no_manifest_blob(self) -> None:
|
def test_raises_when_v2_digest_missing(self) -> None:
|
||||||
from devx.ci.create_dependency_pr import resolve_container_digest
|
from devx.ci.create_dependency_pr import resolve_container_digest
|
||||||
|
|
||||||
mock_resp = MagicMock()
|
files = MagicMock()
|
||||||
mock_resp.raise_for_status = MagicMock()
|
files.raise_for_status = MagicMock()
|
||||||
mock_resp.json.return_value = [{"name": "sha256_layer", "sha256": "abc"}]
|
files.json.return_value = []
|
||||||
with patch("devx.ci.create_dependency_pr.requests.get", return_value=mock_resp):
|
tok, man = _v2_mocks(digest="")
|
||||||
with pytest.raises(click.ClickException, match="no manifest blob"):
|
with patch(
|
||||||
|
"devx.ci.create_dependency_pr.requests.get",
|
||||||
|
side_effect=[files, tok, man],
|
||||||
|
):
|
||||||
|
with pytest.raises(click.ClickException, match="no Docker-Content-Digest"):
|
||||||
|
resolve_container_digest("https://git.example.com/api/v1", "oblachno", "sso-bridge", "0.9.1", "tok")
|
||||||
|
|
||||||
|
def test_raises_when_v2_manifest_request_fails(self) -> None:
|
||||||
|
import requests
|
||||||
|
|
||||||
|
from devx.ci.create_dependency_pr import resolve_container_digest
|
||||||
|
|
||||||
|
files = MagicMock()
|
||||||
|
files.raise_for_status = MagicMock()
|
||||||
|
files.json.return_value = []
|
||||||
|
tok, _ = _v2_mocks()
|
||||||
|
err = requests.HTTPError("500")
|
||||||
|
err.response = MagicMock(status_code=500)
|
||||||
|
man = MagicMock()
|
||||||
|
man.raise_for_status.side_effect = err
|
||||||
|
with patch(
|
||||||
|
"devx.ci.create_dependency_pr.requests.get",
|
||||||
|
side_effect=[files, tok, man],
|
||||||
|
):
|
||||||
|
with pytest.raises(click.ClickException, match="v2 digest lookup failed"):
|
||||||
resolve_container_digest("https://git.example.com/api/v1", "oblachno", "sso-bridge", "0.9.1", "tok")
|
resolve_container_digest("https://git.example.com/api/v1", "oblachno", "sso-bridge", "0.9.1", "tok")
|
||||||
|
|
||||||
def test_raises_on_connection_error(self) -> None:
|
def test_raises_on_connection_error(self) -> None:
|
||||||
@@ -621,6 +661,10 @@ class TestBranchCreation:
|
|||||||
# PR title carries the task ID
|
# PR title carries the task ID
|
||||||
assert client.create_pr.call_args.kwargs["title"] == "OBL-INFRA-581: Bump sso_bridge to 0.9.1"
|
assert client.create_pr.call_args.kwargs["title"] == "OBL-INFRA-581: Bump sso_bridge to 0.9.1"
|
||||||
mock_task.assert_called_once()
|
mock_task.assert_called_once()
|
||||||
|
# Commit supplies an explicit identity (fresh clones have none)
|
||||||
|
commit = next(c for c in subprocess.run.call_args_list if "commit" in c.args[0])
|
||||||
|
assert "user.name=gitea-actions-bot" in commit.args[0]
|
||||||
|
assert "user.email=actions@oblachno.fyi" in commit.args[0]
|
||||||
|
|
||||||
def test_retries_404_until_published(self) -> None:
|
def test_retries_404_until_published(self) -> None:
|
||||||
import requests
|
import requests
|
||||||
@@ -635,7 +679,7 @@ class TestBranchCreation:
|
|||||||
ok.raise_for_status = MagicMock()
|
ok.raise_for_status = MagicMock()
|
||||||
ok.json.return_value = [{"name": "manifest.json", "sha256": "cafe"}]
|
ok.json.return_value = [{"name": "manifest.json", "sha256": "cafe"}]
|
||||||
with (
|
with (
|
||||||
patch("devx.ci.create_dependency_pr.requests.get", side_effect=[fail, ok]),
|
patch("devx.ci.create_dependency_pr.requests.get", side_effect=[fail, ok, *_v2_mocks("sha256:cafe")]),
|
||||||
patch("devx.ci.create_dependency_pr.time.sleep"),
|
patch("devx.ci.create_dependency_pr.time.sleep"),
|
||||||
):
|
):
|
||||||
digest = resolve_container_digest(
|
digest = resolve_container_digest(
|
||||||
|
|||||||
@@ -365,6 +365,23 @@ class TestCollectQuality:
|
|||||||
badge = collect_quality(tmp_path)
|
badge = collect_quality(tmp_path)
|
||||||
assert badge["message"] == "A"
|
assert badge["message"] == "A"
|
||||||
|
|
||||||
|
@patch("devx.tools.generate_badges.run_command")
|
||||||
|
def test_bandit_uses_repo_config_when_present(self, mock_run: MagicMock, tmp_path: Path) -> None: # type: ignore[no-untyped-def]
|
||||||
|
(tmp_path / "pyproject.toml").write_text("[tool.bandit]\nskips = ['B501']\n")
|
||||||
|
mock_run.return_value = (0, "", "")
|
||||||
|
collect_quality(tmp_path)
|
||||||
|
bandit_call = [c for c in mock_run.call_args_list if "bandit" in c.args[0]][0]
|
||||||
|
assert "-c" in bandit_call.args[0]
|
||||||
|
assert "pyproject.toml" in bandit_call.args[0]
|
||||||
|
|
||||||
|
@patch("devx.tools.generate_badges.run_command")
|
||||||
|
def test_bandit_plain_invocation_without_repo_config(self, mock_run: MagicMock, tmp_path: Path) -> None: # type: ignore[no-untyped-def]
|
||||||
|
(tmp_path / "pyproject.toml").write_text("[project]\nname = 'x'\n")
|
||||||
|
mock_run.return_value = (0, "", "")
|
||||||
|
collect_quality(tmp_path)
|
||||||
|
bandit_call = [c for c in mock_run.call_args_list if "bandit" in c.args[0]][0]
|
||||||
|
assert "-c" not in bandit_call.args[0]
|
||||||
|
|
||||||
|
|
||||||
class TestGenerateBadges:
|
class TestGenerateBadges:
|
||||||
@patch("devx.tools.generate_badges.collect_quality")
|
@patch("devx.tools.generate_badges.collect_quality")
|
||||||
|
|||||||
Reference in New Issue
Block a user