Skip to content

Conversation

labbott
Copy link
Contributor

@labbott labbott commented Aug 18, 2025

No description provided.

@labbott labbott marked this pull request as draft August 18, 2025 20:25
@labbott labbott force-pushed the measurement_corpus_take_2 branch 2 times, most recently from 06aab1e to a557323 Compare August 19, 2025 17:30
@labbott labbott force-pushed the measurement_corpus_take_2 branch 2 times, most recently from fd54c92 to 78974d0 Compare September 3, 2025 18:25
@labbott labbott changed the title WIP: Measurement Corpus (take 2) Add measurement corpus for installation via wicket Sep 3, 2025
@labbott labbott force-pushed the measurement_corpus_take_2 branch from 78974d0 to 02578df Compare September 3, 2025 18:43
@labbott labbott marked this pull request as ready for review September 3, 2025 18:44
@labbott labbott force-pushed the measurement_corpus_take_2 branch from 02578df to b2b01bf Compare September 3, 2025 18:55
Copy link
Contributor

@sunshowers sunshowers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(reviewed on my phone, full review later)

@@ -160,6 +189,9 @@ async fn fetch_hash(
struct Manifest {
#[serde(rename = "artifact")]
artifacts: HashMap<KnownArtifactKind, Vec<Artifact>>,
// Add a default for backwards compatibility
#[serde(rename = "measurement_corpus")]
corpus: Option<Source>,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm can this be part of the artifacts map above?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it could. This may be a hold over from very early drafts of this work where I was trying to be backwards compatible. I'll give this a test on the SP/RoT end.

/// A component that means "all possible components (host phase 2, control
/// plane, and measurements)", used for writes for now. It is possible
/// that this component will go away in the future.
All,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this might run into issues if the variant is unknown to the old Wicketd version. I'd serialize this as "both" for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahhh yeah I think you're right. I was trying to improve the clarity but I'll keep it here for now.

@@ -205,6 +211,7 @@ impl fmt::Display for WriteComponent {
Self::HostPhase2 => f.write_str("host phase 2"),
Self::ControlPlane => f.write_str("control plane"),
Self::Unknown => f.write_str("unknown"),
Self::MeasurementCorpus => f.write_str("measurement corpus"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you move MeasurementCorpus to above Unknown?

@@ -320,13 +329,16 @@ impl InstallOpts {
StepHandle::ready(ArtifactsToDownload {
host_phase_2,
control_plane,
// We only support measurement corpus in the installinator document
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should get rid of this path I think — could you file an issue for that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be installed for wicket via the installinator document.
For now, the measurements are treated as a subset of the control
plane installation procedure. This may change as we add reconfigurator
support.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants