Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion runtimeconditions_profiler/extension/artifact_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from ..yamlio import Yaml
from .identity import parse_identifier
from .definition import dependency_cycle_errors, parse_extension_definition
from .identity import resolve_reference
from .manifest_validator import ManifestVocabularyValidator


Expand Down Expand Up @@ -123,7 +124,7 @@ def _validate_set(self, artifacts: list[ValidatedArtifact]) -> None:

for artifact in artifacts:
for dependency in artifact.dependencies:
if dependency not in definitions_by_id:
if resolve_reference(dependency, definitions_by_id) not in definitions_by_id:
artifact.add(
"extension-dependency",
artifact.extension_definition_uri or artifact.artifact.manifest_uri,
Expand Down
6 changes: 3 additions & 3 deletions runtimeconditions_profiler/extension/definition.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import Any

from ..models import ExtensionDefinition
from .identity import parse_identifier
from .identity import parse_identifier, resolve_reference
from ..util import as_list, as_map, parse_plain_string_list, scalar


Expand Down Expand Up @@ -64,7 +64,7 @@ def visit(current: tuple[str, str]) -> None:
if definition is None:
return
for dependency in definition.dependencies:
visit(dependency)
visit(resolve_reference(dependency, definitions_by_id))
resolved.append(definition)

visit(extension_id)
Expand All @@ -86,7 +86,7 @@ def visit(extension_id: tuple[str, str]) -> None:
definition = definitions_by_id.get(extension_id)
if definition is not None:
for dependency in definition.dependencies:
visit(dependency)
visit(resolve_reference(dependency, definitions_by_id))
visiting.remove(extension_id)
visited.add(extension_id)

Expand Down
16 changes: 16 additions & 0 deletions runtimeconditions_profiler/extension/identity.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

from __future__ import annotations

from collections.abc import Iterable

from ..errors import RuntimeConditionsError


Expand Down Expand Up @@ -58,3 +60,17 @@ def profile_reference(reference: tuple[str, str]) -> str:
def definition_identifier(metadata: dict[str, object]) -> str:
"""Return the ID declared by valid extension metadata."""
return parse_identifier(metadata)[0]


def resolve_reference(reference: tuple[str, str], known: Iterable[tuple[str, str]]) -> tuple[str, str]:
"""Pair a dependency written as a bare id with its version.

Extension dependencies name an extension by its full id string, which carries no
version suffix. When the id matches exactly one known (id, version), return that;
otherwise return the reference unchanged.
"""
keys = list(known)
if reference in keys or reference[1]:
return reference
matches = [key for key in keys if key[0] == reference[0]]
return matches[0] if len(matches) == 1 else reference
10 changes: 9 additions & 1 deletion runtimeconditions_profiler/profile/semantic.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class GeneratedProfileValidator:
def __init__(self, verified: VerifiedBindingSet) -> None:
self.verified = verified
self.by_id: dict[tuple[str, str], VerifiedBindingPackage] = {}
self.versions: dict[str, str] = {}
expected_core = {
"id": CORE_ID, "version": CORE_VERSION,
"semanticSha256": CORE_SEMANTIC_SHA256,
Expand All @@ -101,6 +102,7 @@ def __init__(self, verified: VerifiedBindingSet) -> None:
if extension_id in self.by_id:
_fail(name, f"duplicate installed extension {extension_id}")
self.by_id[extension_id] = package
self.versions[extension_id[0]] = extension_id[1]

def build(
self, extracted: tuple[ExtractedCondition, ...],
Expand Down Expand Up @@ -134,6 +136,12 @@ def build(
)
return profile

def _reference(self, value: Any) -> tuple[str, str]:
"""Read a dependency, which names an extension by its full id string, as (id, version)."""
if isinstance(value, str) and value in self.versions:
return value, self.versions[value]
return parse_identifier(value)

def _closure(self, direct: set[tuple[str, str]]) -> dict[tuple[str, str], VerifiedBindingPackage]:
found: dict[tuple[str, str], VerifiedBindingPackage] = {}
visiting: set[tuple[str, str]] = set()
Expand All @@ -147,7 +155,7 @@ def visit(extension_id: tuple[str, str]) -> None:
if package is None:
_fail(extension_id, "extension has no verified installed binding package")
visiting.add(extension_id)
for dependency in sorted(parse_identifier(dep) for dep in package.extension["spec"].get("dependencies", [])):
for dependency in sorted(self._reference(dep) for dep in package.extension["spec"].get("dependencies", [])):
visit(dependency)
visiting.remove(extension_id)
found[extension_id] = package
Expand Down
30 changes: 20 additions & 10 deletions runtimeconditions_profiler/project/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,16 @@ def _verify_closure(
name = package.installed.distribution
model_entries = package.model["extensions"]
lock_entries = package.release["dependencyLock"]["extensions"]
# Dependencies, edges and package dependencies name an extension by its full id
# string. Look its version up in the closure so it keys the same way as the
# closure entries, which carry id and version separately.
versions = {entry["id"]: entry.get("version", "") for entry in model_entries}

def reference(value: Any) -> tuple[str, str]:
if isinstance(value, str) and value in versions:
return value, versions[value]
return parse_identifier(value)

models = {parse_identifier(entry): entry for entry in model_entries}
locks = {parse_identifier(entry): entry for entry in lock_entries}
if len(models) != len(model_entries) or len(locks) != len(lock_entries) or set(models) != set(locks):
Expand All @@ -506,12 +516,12 @@ def _verify_closure(
key: value for key, value in models[root_id].items() if key != "dependencies"
} != package.model["rootExtension"]:
raise RuntimeConditionsError(f"{name}: model root is absent from extension closure")
edges = {(parse_identifier(entry["from"]), parse_identifier(entry["to"])) for entry in package.model.get("dependencyEdges", [])}
derived_edges = {(parse_identifier(entry), parse_identifier(dep)) for entry in model_entries for dep in entry.get("dependencies", [])}
edges = {(reference(entry["from"]), reference(entry["to"])) for entry in package.model.get("dependencyEdges", [])}
derived_edges = {(parse_identifier(entry), reference(dep)) for entry in model_entries for dep in entry.get("dependencies", [])}
if len(edges) != len(package.model.get("dependencyEdges", [])) or edges != derived_edges:
raise RuntimeConditionsError(f"{name}: model dependency edges do not match extension closure")
for entry in model_entries:
dependencies = [parse_identifier(dep) for dep in entry.get("dependencies", [])]
dependencies = [reference(dep) for dep in entry.get("dependencies", [])]
if len(set(dependencies)) != len(dependencies):
raise RuntimeConditionsError(f"{name}: duplicate extension dependency for {entry['id']}")
reachable: set[tuple[str, str]] = set()
Expand All @@ -523,7 +533,7 @@ def _verify_closure(
if extension_id not in models:
raise RuntimeConditionsError(f"{name}: unresolved model dependency {extension_id}")
reachable.add(extension_id)
pending.extend(parse_identifier(dep) for dep in models[extension_id].get("dependencies", []))
pending.extend(reference(dep) for dep in models[extension_id].get("dependencies", []))
if reachable != set(models):
raise RuntimeConditionsError(f"{name}: model closure has extensions unreachable from its root")
for extension_id, entry in models.items():
Expand All @@ -534,9 +544,9 @@ def _verify_closure(
expected = owner.model["rootExtension"]
if entry["semanticSha256"] != expected["semanticSha256"] or entry.get("version") != expected.get("version"):
raise RuntimeConditionsError(f"{name}: extension closure identity mismatch for {extension_id}")
if {parse_identifier(dep) for dep in entry.get("dependencies", [])} != {parse_identifier(dep) for dep in owner.extension["spec"].get("dependencies", [])}:
if {reference(dep) for dep in entry.get("dependencies", [])} != {reference(dep) for dep in owner.extension["spec"].get("dependencies", [])}:
raise RuntimeConditionsError(f"{name}: extension closure edges differ from packaged definition for {extension_id}")
if lock["semanticSha256"] != entry["semanticSha256"] or lock.get("version") != entry.get("version") or {parse_identifier(dep) for dep in lock.get("dependencies", [])} != {parse_identifier(dep) for dep in entry.get("dependencies", [])}:
if lock["semanticSha256"] != entry["semanticSha256"] or lock.get("version") != entry.get("version") or {reference(dep) for dep in lock.get("dependencies", [])} != {reference(dep) for dep in entry.get("dependencies", [])}:
raise RuntimeConditionsError(f"{name}: dependency lock identity or edges mismatch for {extension_id}")
if lock["sourceSha256"] != _sha256(owner.installed.resources["runtimeconditions.extension.yaml"]):
raise RuntimeConditionsError(f"{name}: dependency lock source digest mismatch for {extension_id}")
Expand All @@ -546,10 +556,10 @@ def _verify_closure(
# At profile time, verify the installed RECORD and resource digests instead.
if len({canonicalize_name(item["coordinate"]) for item in dependencies}) != len(dependencies):
raise RuntimeConditionsError(f"{name}: duplicate binding package dependency")
if len({parse_identifier(item["extension"]) for item in dependencies}) != len(dependencies):
if len({reference(item["extension"]) for item in dependencies}) != len(dependencies):
raise RuntimeConditionsError(f"{name}: duplicate binding extension dependency")
expected_extensions = {parse_identifier(dep) for dep in models[root_id].get("dependencies", [])}
if {parse_identifier(item["extension"]) for item in dependencies} != expected_extensions:
expected_extensions = {reference(dep) for dep in models[root_id].get("dependencies", [])}
if {reference(item["extension"]) for item in dependencies} != expected_extensions:
raise RuntimeConditionsError(f"{name}: direct package dependencies do not match root extension edges")
distribution = metadata.distribution(name)
try:
Expand All @@ -562,7 +572,7 @@ def _verify_closure(
for item in dependencies:
dep_key = canonicalize_name(item["coordinate"])
dependency = all_packages.get(dep_key)
if dependency is None or dependency.installed.import_package != item["name"] or parse_identifier(dependency.model["rootExtension"]) != parse_identifier(item["extension"]):
if dependency is None or dependency.installed.import_package != item["name"] or parse_identifier(dependency.model["rootExtension"]) != reference(item["extension"]):
raise RuntimeConditionsError(f"{name}: binding dependency {item['coordinate']} identity mismatch")
tested = item["testedVersion"]
interval = item["compatibleVersionRange"]
Expand Down
Loading