Skip to content

Harden hosted environment resolution and reporting #68

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

Open
hadarishav wants to merge 1 commit into
base: feat/hosted-harness-e2e-runtime
Choose a base branch
from
Open

Harden hosted environment resolution and reporting #68

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
29 changes: 28 additions & 1 deletion src/fi/alk/harness/bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,21 @@ def export_session_bundle(
create_environment_plan,
write_environment_plan,
)
from .environment_resolution import (
ENVIRONMENT_RESOLUTION_FILE,
load_environment_resolution,
)

resolution = None
if (session / ENVIRONMENT_RESOLUTION_FILE).is_file():
resolution = load_environment_resolution(session)
if resolution.source_fingerprint != raw["provenance"]["source_digest"]:
raise BundleError("environment_resolution_source_fingerprint_mismatch")
shutil.copy2(
session / ENVIRONMENT_RESOLUTION_FILE,
staging / ENVIRONMENT_RESOLUTION_FILE,
)
generated.append(ENVIRONMENT_RESOLUTION_FILE)

plan = create_environment_plan(
source=PlanSource(
Expand All @@ -553,6 +568,15 @@ def export_session_bundle(
readiness=[ReadinessProbe.model_validate(item) for item in readiness],
metadata={
"managed": bool(provisioned and provisioned.managed),
"packaging_type": (
provisioned.packaging_type if provisioned else "unknown"
),
"runtime_adapter": (
provisioned.runtime_adapter if provisioned else "unknown"
),
"selected_runtime": (
provisioned.selected_runtime if provisioned else ""
),
"generated_runtime_fingerprint": (
provisioned.runtime_fingerprint if provisioned else ""
),
Expand All @@ -561,7 +585,10 @@ def export_session_bundle(
write_environment_plan(staging, plan)
generated.append(ENVIRONMENT_PLAN_FILE)
raw["provenance"]["generated_files"] = generated
raw["metadata"] = {"environment_plan_digest": plan.digest}
raw["metadata"] = {
"environment_plan_digest": plan.digest,
"environment_resolution_digest": resolution.digest if resolution else "",
}
seal_bundle(staging, raw)
if final.exists():
shutil.rmtree(final)
Expand Down
Loading
Loading