Merge branch 'main' into pgambrill/release_notes_0.7.0

Author: Coco-Ben

…admin-cli/src/measurement/bundle/args.rs …attestation/measured_boot/bundle/args.rscrates/admin-cli/src/measurement/bundle/args.rs renamed to crates/admin-cli/src/attestation/measured_boot/bundle/args.rs crates/admin-cli/src/measurement/bundle/args.rs renamed to crates/admin-cli/src/attestation/measured_boot/bundle/args.rs

@@ -46,8 +46,10 @@ use clap::Parser;
 use measured_boot::pcr::PcrRegisterValue;
 use measured_boot::records::MeasurementBundleState;
 
+use crate::attestation::measured_boot::global::cmds::{
+    IdNameIdentifier, IdentifierType, get_identifier,
+};
 use crate::cfg::measurement::parse_pcr_register_values;
-use crate::measurement::global::cmds::{IdNameIdentifier, IdentifierType, get_identifier};
 
 /// CmdBundle provides a container for the `bundle` subcommand, which itself
 /// contains other subcommands for working with profiles.

…admin-cli/src/measurement/bundle/cmds.rs …attestation/measured_boot/bundle/cmds.rscrates/admin-cli/src/measurement/bundle/cmds.rs renamed to crates/admin-cli/src/attestation/measured_boot/bundle/cmds.rs crates/admin-cli/src/measurement/bundle/cmds.rs renamed to crates/admin-cli/src/attestation/measured_boot/bundle/cmds.rs

@@ -30,10 +30,10 @@ use measured_boot::bundle::MeasurementBundle;
 use measured_boot::records::MeasurementBundleRecord;
 use serde::Serialize;
 
-use crate::measurement::bundle::args::{
+use crate::attestation::measured_boot::bundle::args::{
     CmdBundle, Create, Delete, FindClosestMatch, List, ListMachines, Rename, SetState, Show,
 };
-use crate::measurement::{MachineIdList, global};
+use crate::attestation::measured_boot::{MachineIdList, global};
 use crate::rpc::ApiClient;
 
 /// dispatch matches + dispatches the correct command for

…/admin-cli/src/measurement/bundle/mod.rs …/attestation/measured_boot/bundle/mod.rscrates/admin-cli/src/measurement/bundle/mod.rs renamed to crates/admin-cli/src/attestation/measured_boot/bundle/mod.rs crates/admin-cli/src/measurement/bundle/mod.rs renamed to crates/admin-cli/src/attestation/measured_boot/bundle/mod.rs

@@ -27,10 +27,10 @@ use measured_boot::journal::MeasurementJournal;
 use measured_boot::records::MeasurementJournalRecord;
 use serde::Serialize;
 
-use crate::measurement::global;
-use crate::measurement::journal::args::{CmdJournal, Delete, List, Promote, Show};
-use crate::measurement::report::args::Promote as ReportPromoteArgs;
-use crate::measurement::report::cmds::promote as report_promote;
+use crate::attestation::measured_boot::global;
+use crate::attestation::measured_boot::journal::args::{CmdJournal, Delete, List, Promote, Show};
+use crate::attestation::measured_boot::report::args::Promote as ReportPromoteArgs;
+use crate::attestation::measured_boot::report::cmds::promote as report_promote;
 use crate::rpc::ApiClient;
 
 /// dispatch matches + dispatches the correct command for

…admin-cli/src/measurement/global/cmds.rs …attestation/measured_boot/global/cmds.rscrates/admin-cli/src/measurement/global/cmds.rs renamed to crates/admin-cli/src/attestation/measured_boot/global/cmds.rs crates/admin-cli/src/measurement/global/cmds.rs renamed to crates/admin-cli/src/attestation/measured_boot/global/cmds.rs

@@ -25,8 +25,8 @@ use measured_boot::records::CandidateMachineSummary;
 use measured_boot::report::MeasurementReport;
 use serde::Serialize;
 
-use crate::measurement::global;
-use crate::measurement::machine::args::{Attest, CmdMachine, Show};
+use crate::attestation::measured_boot::global;
+use crate::attestation::measured_boot::machine::args::{Attest, CmdMachine, Show};
 use crate::rpc::ApiClient;
 
 /// dispatch matches + dispatches the correct command