[2/n] [reconfigurator-cli] support 'latest' and 'target' as blueprint specifiers (#8128)

Especially when issuing a long series of edit commands as I'd like to do
in a subsequent PR, having to specify each blueprint by hand in these
scripts is a bit of a manual process. This symbolic identifier makes it
easier to write scripts.

Depends on #8121.

Author: sunshowers

dev-tools/reconfigurator-cli/src/lib.rs

@@ -19,9 +19,9 @@ use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
 use nexus_reconfigurator_planning::example::ExampleSystemBuilder;
 use nexus_reconfigurator_planning::planner::Planner;
 use nexus_reconfigurator_planning::system::{SledBuilder, SystemDescription};
-use nexus_reconfigurator_simulation::SimState;
 use nexus_reconfigurator_simulation::SimStateBuilder;
 use nexus_reconfigurator_simulation::Simulator;
+use nexus_reconfigurator_simulation::{BlueprintId, SimState};
 use nexus_types::deployment::OmicronZoneNic;
 use nexus_types::deployment::PlanningInput;
 use nexus_types::deployment::SledFilter;
@@ -53,6 +53,7 @@ use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::fmt::Write;
 use std::io::IsTerminal;
+use std::str::FromStr;
 use swrite::{SWrite, swriteln};
 use tabled::Tabled;
 use tufaceous_artifact::ArtifactHash;
@@ -333,8 +334,9 @@ struct InventoryArgs {
 
 #[derive(Debug, Args)]
 struct BlueprintPlanArgs {
-    /// id of the blueprint on which this one will be based
-    parent_blueprint_id: BlueprintUuid,
+    /// id of the blueprint on which this one will be based, "latest", or
+    /// "target"
+    parent_blueprint_id: BlueprintIdOpt,
     /// id of the inventory collection to use in planning
     ///
     /// Must be provided unless there is only one collection in the loaded
@@ -344,8 +346,8 @@ struct BlueprintPlanArgs {
 
 #[derive(Debug, Args)]
 struct BlueprintEditArgs {
-    /// id of the blueprint to edit
-    blueprint_id: BlueprintUuid,
+    /// id of the blueprint to edit, "latest", or "target"
+    blueprint_id: BlueprintIdOpt,
     /// "creator" field for the new blueprint
     #[arg(long)]
     creator: Option<String>,
@@ -393,6 +395,41 @@ enum BlueprintEditCommands {
     },
 }
 
+#[derive(Clone, Debug)]
+enum BlueprintIdOpt {
+    /// use the target blueprint
+    Target,
+    /// use the latest blueprint sorted by time created
+    Latest,
+    /// use a specific blueprint
+    Id(BlueprintUuid),
+}
+
+impl FromStr for BlueprintIdOpt {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "latest" => Ok(BlueprintIdOpt::Latest),
+            // These values match the ones supported in omdb.
+            "current-target" | "current" | "target" => {
+                Ok(BlueprintIdOpt::Target)
+            }
+            _ => Ok(BlueprintIdOpt::Id(s.parse()?)),
+        }
+    }
+}
+
+impl From<BlueprintIdOpt> for BlueprintId {
+    fn from(value: BlueprintIdOpt) -> Self {
+        match value {
+            BlueprintIdOpt::Latest => BlueprintId::Latest,
+            BlueprintIdOpt::Target => BlueprintId::Target,
+            BlueprintIdOpt::Id(id) => BlueprintId::Id(id),
+        }
+    }
+}
+
 #[derive(Clone, Debug, Subcommand)]
 enum SpUpdateComponent {
     /// update the SP itself
@@ -442,8 +479,8 @@ fn parse_blueprint_zone_image_version(
 
 #[derive(Debug, Args)]
 struct BlueprintArgs {
-    /// id of the blueprint
-    blueprint_id: BlueprintUuid,
+    /// id of the blueprint, "latest", or "target"
+    blueprint_id: BlueprintIdOpt,
 }
 
 #[derive(Debug, Args)]
@@ -452,8 +489,8 @@ struct BlueprintDiffDnsArgs {
     dns_group: CliDnsGroup,
     /// DNS version to diff against
     dns_version: u32,
-    /// id of the blueprint
-    blueprint_id: BlueprintUuid,
+    /// id of the blueprint, "latest", or "target"
+    blueprint_id: BlueprintIdOpt,
 }
 
 #[derive(Clone, Copy, Debug, ValueEnum)]
@@ -466,24 +503,24 @@ enum CliDnsGroup {
 struct BlueprintDiffInventoryArgs {
     /// id of the inventory collection
     collection_id: CollectionUuid,
-    /// id of the blueprint
-    blueprint_id: BlueprintUuid,
+    /// id of the blueprint, "latest", or "target"
+    blueprint_id: BlueprintIdOpt,
 }
 
 #[derive(Debug, Args)]
 struct BlueprintSaveArgs {
-    /// id of the blueprint
-    blueprint_id: BlueprintUuid,
+    /// id of the blueprint, "latest", or "target"
+    blueprint_id: BlueprintIdOpt,
     /// output file
     filename: Utf8PathBuf,
 }
 
 #[derive(Debug, Args)]
 struct BlueprintDiffArgs {
-    /// id of the first blueprint
-    blueprint1_id: BlueprintUuid,
-    /// id of the second blueprint
-    blueprint2_id: BlueprintUuid,
+    /// id of the first blueprint, "latest", or "target"
+    blueprint1_id: BlueprintIdOpt,
+    /// id of the second blueprint, "latest", or "target"
+    blueprint2_id: BlueprintIdOpt,
 }
 
 #[derive(Debug, Subcommand)]
@@ -777,7 +814,9 @@ fn cmd_blueprint_blippy(
     args: BlueprintArgs,
 ) -> anyhow::Result<Option<String>> {
     let state = sim.current_state();
-    let blueprint = state.system().get_blueprint(args.blueprint_id)?;
+    let resolved_id =
+        state.system().resolve_blueprint_id(args.blueprint_id.into())?;
+    let blueprint = state.system().get_blueprint(&resolved_id)?;
     let report =
         Blippy::new(&blueprint).into_report(BlippyReportSortKey::Severity);
     Ok(Some(format!("{}", report.display())))
@@ -791,9 +830,10 @@ fn cmd_blueprint_plan(
     let rng = state.rng_mut().next_planner_rng();
     let system = state.system_mut();
 
-    let parent_blueprint_id = args.parent_blueprint_id;
+    let parent_blueprint_id =
+        system.resolve_blueprint_id(args.parent_blueprint_id.into())?;
     let collection_id = args.collection_id;
-    let parent_blueprint = system.get_blueprint(parent_blueprint_id)?;
+    let parent_blueprint = system.get_blueprint(&parent_blueprint_id)?;
     let collection = match collection_id {
         Some(collection_id) => system.get_collection(collection_id)?,
         None => {
@@ -826,7 +866,7 @@ fn cmd_blueprint_plan(
     let blueprint = planner.plan().context("generating blueprint")?;
     let rv = format!(
         "generated blueprint {} based on parent blueprint {}",
-        blueprint.id, parent_blueprint_id,
+        blueprint.id, parent_blueprint.id,
     );
     system.add_blueprint(blueprint)?;
 
@@ -843,8 +883,8 @@ fn cmd_blueprint_edit(
     let rng = state.rng_mut().next_planner_rng();
     let system = state.system_mut();
 
-    let blueprint_id = args.blueprint_id;
-    let blueprint = system.get_blueprint(blueprint_id)?;
+    let resolved_id = system.resolve_blueprint_id(args.blueprint_id.into())?;
+    let blueprint = system.get_blueprint(&resolved_id)?;
     let creator = args.creator.as_deref().unwrap_or("reconfigurator-cli");
     let planning_input = sim
         .planning_input(blueprint)
@@ -972,8 +1012,8 @@ fn cmd_blueprint_edit(
         .clone_from(&blueprint.cockroachdb_fingerprint);
 
     let rv = format!(
-        "blueprint {} created from blueprint {}: {}",
-        new_blueprint.id, blueprint_id, label
+        "blueprint {} created from {}: {}",
+        new_blueprint.id, resolved_id, label
     );
     system.add_blueprint(new_blueprint)?;
 
@@ -1006,7 +1046,8 @@ fn cmd_blueprint_show(
     args: BlueprintArgs,
 ) -> anyhow::Result<Option<String>> {
     let state = sim.current_state();
-    let blueprint = state.system().get_blueprint(args.blueprint_id)?;
+    let blueprint =
+        state.system().resolve_and_get_blueprint(args.blueprint_id.into())?;
     Ok(Some(format!("{}", blueprint.display())))
 }
 
@@ -1019,8 +1060,10 @@ fn cmd_blueprint_diff(
     let blueprint2_id = args.blueprint2_id;
 
     let state = sim.current_state();
-    let blueprint1 = state.system().get_blueprint(blueprint1_id)?;
-    let blueprint2 = state.system().get_blueprint(blueprint2_id)?;
+    let blueprint1 =
+        state.system().resolve_and_get_blueprint(blueprint1_id.into())?;
+    let blueprint2 =
+        state.system().resolve_and_get_blueprint(blueprint2_id.into())?;
 
     let sled_diff = blueprint2.diff_since_blueprint(&blueprint1);
     swriteln!(rv, "{}", sled_diff.display());
@@ -1098,7 +1141,8 @@ fn cmd_blueprint_diff_dns(
     let blueprint_id = args.blueprint_id;
 
     let state = sim.current_state();
-    let blueprint = state.system().get_blueprint(blueprint_id)?;
+    let blueprint =
+        state.system().resolve_and_get_blueprint(blueprint_id.into())?;
 
     let existing_dns_config = match dns_group {
         CliDnsGroup::Internal => {
@@ -1140,7 +1184,8 @@ fn cmd_blueprint_diff_inventory(
 
     let state = sim.current_state();
     let _collection = state.system().get_collection(collection_id)?;
-    let _blueprint = state.system().get_blueprint(blueprint_id)?;
+    let _blueprint =
+        state.system().resolve_and_get_blueprint(blueprint_id.into())?;
     // See https://github.com/oxidecomputer/omicron/issues/7242
     // let diff = blueprint.diff_since_collection(&collection);
     // Ok(Some(diff.display().to_string()))
@@ -1154,14 +1199,16 @@ fn cmd_blueprint_save(
     let blueprint_id = args.blueprint_id;
 
     let state = sim.current_state();
-    let blueprint = state.system().get_blueprint(blueprint_id)?;
+    let resolved_id =
+        state.system().resolve_blueprint_id(blueprint_id.into())?;
+    let blueprint = state.system().get_blueprint(&resolved_id)?;
 
     let output_path = &args.filename;
     let output_str = serde_json::to_string_pretty(&blueprint)
         .context("serializing blueprint")?;
     std::fs::write(&output_path, &output_str)
         .with_context(|| format!("write {:?}", output_path))?;
-    Ok(Some(format!("saved blueprint {} to {:?}", blueprint_id, output_path)))
+    Ok(Some(format!("saved {} to {:?}", resolved_id, output_path)))
 }
 
 fn cmd_save(

dev-tools/reconfigurator-cli/tests/input/cmds-set-zone-images.txt

@@ -4,25 +4,25 @@ load-example --nsleds 1 --ndisks-per-sled 3 --seed test_set_zone_images
 blueprint-show 971eeb12-1830-4fa0-a699-98ea0164505c
 
 # Set a couple zones' image sources to specific artifacts.
-blueprint-edit 971eeb12-1830-4fa0-a699-98ea0164505c set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-blueprint-edit 9766ca20-38d4-4380-b005-e7c43c797e7c set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 artifact valid-non-semver 7b4281a6bd5946bb96b332c62afe289bef275e58b9ba031085f8827655f434b3
+blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+blueprint-edit latest set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 artifact valid-non-semver 7b4281a6bd5946bb96b332c62afe289bef275e58b9ba031085f8827655f434b3
 
 blueprint-show f714e6ea-e85a-4d7d-93c2-a018744fe176
 blueprint-diff 971eeb12-1830-4fa0-a699-98ea0164505c f714e6ea-e85a-4d7d-93c2-a018744fe176
 
 # Set these zones' image sources back to the install dataset.
-blueprint-edit f714e6ea-e85a-4d7d-93c2-a018744fe176 set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
-blueprint-edit bb128f06-a2e1-44c1-8874-4f789d0ff896 set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 install-dataset
+blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
+blueprint-edit latest set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 install-dataset
 blueprint-show d9c572a1-a68c-4945-b1ec-5389bd588fe9
 blueprint-diff f714e6ea-e85a-4d7d-93c2-a018744fe176 d9c572a1-a68c-4945-b1ec-5389bd588fe9
 
 # test help output
-blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 help
-blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 set-zone-image help
+blueprint-edit latest help
+blueprint-edit latest set-zone-image help
 
 # test error case: no such zone id
-blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 set-zone-image 126f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
+blueprint-edit latest set-zone-image 126f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
 # test error case: invalid version identifier
-blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 🫡 5d835e8666bd5cf65be66efbca6847b24e41fd85993448a211ad7be5fea559ab
+blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 🫡 5d835e8666bd5cf65be66efbca6847b24e41fd85993448a211ad7be5fea559ab
 # test error case: bad hash
-blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 aaaa
+blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 aaaa

dev-tools/reconfigurator-cli/tests/output/cmds-set-mgs-updates-stdout

@@ -2770,7 +2770,7 @@ Commands:
   help              Print this message or the help of the given subcommand(s)
 
 Arguments:
-  <BLUEPRINT_ID>  id of the blueprint to edit
+  <BLUEPRINT_ID>  id of the blueprint to edit, "latest", or "target"
 
 Options:
       --creator <CREATOR>  "creator" field for the new blueprint

dev-tools/reconfigurator-cli/tests/output/cmds-set-zone-images-stdout

@@ -107,12 +107,12 @@ parent:    1b013011-2062-4b48-b544-a32b23bce83a
 
 > # Set a couple zones' image sources to specific artifacts.
 
-> blueprint-edit 971eeb12-1830-4fa0-a699-98ea0164505c set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-blueprint 9766ca20-38d4-4380-b005-e7c43c797e7c created from blueprint 971eeb12-1830-4fa0-a699-98ea0164505c: set sled 868d5b02-7792-4fc0-b6a9-654afcae9ea0 zone 026f8db9-b966-45ec-bf89-fb7b41a04cc9 image source to artifact: version 1.2.3
+> blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+blueprint 9766ca20-38d4-4380-b005-e7c43c797e7c created from latest blueprint (971eeb12-1830-4fa0-a699-98ea0164505c): set sled 868d5b02-7792-4fc0-b6a9-654afcae9ea0 zone 026f8db9-b966-45ec-bf89-fb7b41a04cc9 image source to artifact: version 1.2.3
 warn: no validation is done on the requested image source
 
-> blueprint-edit 9766ca20-38d4-4380-b005-e7c43c797e7c set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 artifact valid-non-semver 7b4281a6bd5946bb96b332c62afe289bef275e58b9ba031085f8827655f434b3
-blueprint f714e6ea-e85a-4d7d-93c2-a018744fe176 created from blueprint 9766ca20-38d4-4380-b005-e7c43c797e7c: set sled 868d5b02-7792-4fc0-b6a9-654afcae9ea0 zone 72d12821-646d-4296-a081-ef5fb3a0ca24 image source to artifact: version valid-non-semver
+> blueprint-edit latest set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 artifact valid-non-semver 7b4281a6bd5946bb96b332c62afe289bef275e58b9ba031085f8827655f434b3
+blueprint f714e6ea-e85a-4d7d-93c2-a018744fe176 created from latest blueprint (9766ca20-38d4-4380-b005-e7c43c797e7c): set sled 868d5b02-7792-4fc0-b6a9-654afcae9ea0 zone 72d12821-646d-4296-a081-ef5fb3a0ca24 image source to artifact: version valid-non-semver
 warn: no validation is done on the requested image source
 
 > 
@@ -392,12 +392,12 @@ external DNS:
 
 > # Set these zones' image sources back to the install dataset.
 
-> blueprint-edit f714e6ea-e85a-4d7d-93c2-a018744fe176 set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
-blueprint bb128f06-a2e1-44c1-8874-4f789d0ff896 created from blueprint f714e6ea-e85a-4d7d-93c2-a018744fe176: set sled 868d5b02-7792-4fc0-b6a9-654afcae9ea0 zone 026f8db9-b966-45ec-bf89-fb7b41a04cc9 image source to install dataset
+> blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
+blueprint bb128f06-a2e1-44c1-8874-4f789d0ff896 created from latest blueprint (f714e6ea-e85a-4d7d-93c2-a018744fe176): set sled 868d5b02-7792-4fc0-b6a9-654afcae9ea0 zone 026f8db9-b966-45ec-bf89-fb7b41a04cc9 image source to install dataset
 warn: no validation is done on the requested image source
 
-> blueprint-edit bb128f06-a2e1-44c1-8874-4f789d0ff896 set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 install-dataset
-blueprint d9c572a1-a68c-4945-b1ec-5389bd588fe9 created from blueprint bb128f06-a2e1-44c1-8874-4f789d0ff896: set sled 868d5b02-7792-4fc0-b6a9-654afcae9ea0 zone 72d12821-646d-4296-a081-ef5fb3a0ca24 image source to install dataset
+> blueprint-edit latest set-zone-image 72d12821-646d-4296-a081-ef5fb3a0ca24 install-dataset
+blueprint d9c572a1-a68c-4945-b1ec-5389bd588fe9 created from latest blueprint (bb128f06-a2e1-44c1-8874-4f789d0ff896): set sled 868d5b02-7792-4fc0-b6a9-654afcae9ea0 zone 72d12821-646d-4296-a081-ef5fb3a0ca24 image source to install dataset
 warn: no validation is done on the requested image source
 
 > blueprint-show d9c572a1-a68c-4945-b1ec-5389bd588fe9
@@ -675,7 +675,7 @@ external DNS:
 
 > # test help output
 
-> blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 help
+> blueprint-edit latest help
 edit contents of a blueprint directly
 
 Usage: blueprint-edit [OPTIONS] <BLUEPRINT_ID> <COMMAND>
@@ -690,14 +690,14 @@ Commands:
   help              Print this message or the help of the given subcommand(s)
 
 Arguments:
-  <BLUEPRINT_ID>  id of the blueprint to edit
+  <BLUEPRINT_ID>  id of the blueprint to edit, "latest", or "target"
 
 Options:
       --creator <CREATOR>  "creator" field for the new blueprint
       --comment <COMMENT>  "comment" field for the new blueprint
   -h, --help               Print help
 
-> blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 set-zone-image help
+> blueprint-edit latest set-zone-image help
 set the image source for a zone
 
 Usage: blueprint-edit <BLUEPRINT_ID> set-zone-image <ZONE_ID> <COMMAND>
@@ -717,14 +717,14 @@ Options:
 
 > # test error case: no such zone id
 
-> blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 set-zone-image 126f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
+> blueprint-edit latest set-zone-image 126f8db9-b966-45ec-bf89-fb7b41a04cc9 install-dataset
 error: could not find parent sled for zone 126f8db9-b966-45ec-bf89-fb7b41a04cc9
 
 > # test error case: invalid version identifier
 
-> blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 🫡 5d835e8666bd5cf65be66efbca6847b24e41fd85993448a211ad7be5fea559ab
+> blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 🫡 5d835e8666bd5cf65be66efbca6847b24e41fd85993448a211ad7be5fea559ab
 
 > # test error case: bad hash
 
-> blueprint-edit d9c572a1-a68c-4945-b1ec-5389bd588fe9 set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 aaaa
+> blueprint-edit latest set-zone-image 026f8db9-b966-45ec-bf89-fb7b41a04cc9 artifact 1.2.3 aaaa