Move ClickhouseClusterConfig construction from BlueprintBuilder to planner (#9370)

This is staged on top of #9347 and is a part of #9238. In particular, by
moving this from the builder to the planner, we can remove the builder's
need for an inventory collection entirely.

There should be no functional changes here; it's just moving code around
(with some reformatting to break it up a bit) and then removing the
`collection` argument from all the callers of
`BlueprintBuilder::new_based_on()`.

Author: jgallagher

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

@@ -2227,7 +2227,6 @@ fn cmd_blueprint_edit(
         &sim.log,
         blueprint,
         &planning_input,
-        &latest_collection,
         creator,
         rng,
     )

live-tests/tests/common/reconfigurator.rs

@@ -81,7 +81,6 @@ pub async fn blueprint_load_target_enabled(
 pub async fn blueprint_edit_current_target(
     log: &slog::Logger,
     planning_input: &PlanningInput,
-    collection: &Collection,
     nexus: &nexus_lockstep_client::Client,
     edit_fn: &dyn Fn(&mut BlueprintBuilder) -> Result<(), anyhow::Error>,
 ) -> Result<(Blueprint, Blueprint), anyhow::Error> {
@@ -94,7 +93,6 @@ pub async fn blueprint_edit_current_target(
         log,
         &blueprint1,
         &planning_input,
-        &collection,
         "test-suite",
         PlannerRng::from_entropy(),
     )

live-tests/tests/test_nexus_add_remove.rs

@@ -10,7 +10,6 @@ use common::LiveTestContext;
 use common::reconfigurator::blueprint_edit_current_target;
 use futures::TryStreamExt;
 use live_tests_macros::live_test;
-use nexus_inventory::CollectionBuilder;
 use nexus_lockstep_client::types::BlueprintTargetSet;
 use nexus_lockstep_client::types::QuiesceState;
 use nexus_lockstep_client::types::Saga;
@@ -59,11 +58,6 @@ async fn test_nexus_add_remove(lc: &LiveTestContext) {
         PlanningInputFromDb::assemble(&opctx, &datastore, planner_config)
             .await
             .expect("planning input");
-    let collection = datastore
-        .inventory_get_latest_collection(opctx)
-        .await
-        .expect("latest inventory collection")
-        .unwrap_or_else(|| CollectionBuilder::new("test").build());
     let initial_nexus_clients = lc.all_internal_nexus_clients().await.unwrap();
     let nexus = initial_nexus_clients.first().expect("internal Nexus client");
 
@@ -75,7 +69,6 @@ async fn test_nexus_add_remove(lc: &LiveTestContext) {
     let (blueprint1, blueprint2) = blueprint_edit_current_target(
         log,
         &planning_input,
-        &collection,
         &nexus,
         &|builder: &mut BlueprintBuilder| {
             // We have to tell the builder what image source to use for the new
@@ -196,7 +189,6 @@ async fn test_nexus_add_remove(lc: &LiveTestContext) {
     let (_blueprint2, blueprint3) = blueprint_edit_current_target(
         log,
         &planning_input,
-        &collection,
         &nexus,
         &|builder: &mut BlueprintBuilder| {
             builder

live-tests/tests/test_nexus_handoff.rs

@@ -55,7 +55,7 @@ async fn test_nexus_handoff(lc: &LiveTestContext) {
     // That blueprint should be propagated to all sleds.  We wait just a bit
     // here to deal with races set up by other tests failing or other ongoing
     // activity.
-    let collection = blueprint_wait_sled_configs_propagated(
+    let _collection = blueprint_wait_sled_configs_propagated(
         opctx,
         datastore,
         &blueprint_initial,
@@ -171,7 +171,6 @@ async fn test_nexus_handoff(lc: &LiveTestContext) {
         blueprint_edit_current_target(
             log,
             &planning_input,
-            &collection,
             &nexus,
             &|builder: &mut BlueprintBuilder| {
                 let mut external_networking_alloc =
@@ -228,7 +227,7 @@ async fn test_nexus_handoff(lc: &LiveTestContext) {
     // SMF may still be starting up the zone.  Even once the Nexus process
     // starts, it will become blocked on the "not yet" DbMetadataNexusState,
     // waiting for handoff.
-    let collection = blueprint_wait_sled_configs_propagated(
+    let _collection = blueprint_wait_sled_configs_propagated(
         opctx,
         datastore,
         &blueprint_new_nexus,
@@ -273,7 +272,6 @@ async fn test_nexus_handoff(lc: &LiveTestContext) {
         blueprint_edit_current_target(
             log,
             &planning_input,
-            &collection,
             &nexus,
             &|builder: &mut BlueprintBuilder| {
                 builder.set_nexus_generation(next_generation);
@@ -439,7 +437,6 @@ async fn test_nexus_handoff(lc: &LiveTestContext) {
         blueprint_edit_current_target(
             log,
             &planning_input,
-            &collection,
             new_nexus,
             &|builder: &mut BlueprintBuilder| {
                 for (id, current_zone) in &current_nexus_zones {

nexus/db-queries/src/db/datastore/deployment.rs

@@ -3113,7 +3113,6 @@ mod tests {
     use crate::db::raw_query_builder::QueryBuilder;
     use gateway_types::rot::RotSlot;
     use nexus_db_model::IpVersion;
-    use nexus_inventory::CollectionBuilder;
     use nexus_inventory::now_db_precision;
     use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
     use nexus_reconfigurator_planning::blueprint_builder::Ensure;
@@ -3439,7 +3438,6 @@ mod tests {
             &logctx.log,
             &blueprint1,
             &planning_input,
-            &collection,
             "test",
             PlannerRng::from_entropy(),
         )
@@ -3787,7 +3785,6 @@ mod tests {
             &logctx.log,
             &blueprint2,
             &planning_input,
-            &collection,
             "dummy",
             PlannerRng::from_entropy(),
         )
@@ -3844,7 +3841,6 @@ mod tests {
             &logctx.log,
             &blueprint3,
             &planning_input,
-            &collection,
             "dummy",
             PlannerRng::from_entropy(),
         )
@@ -3898,7 +3894,6 @@ mod tests {
             &logctx.log,
             &blueprint4,
             &planning_input,
-            &collection,
             "dummy",
             PlannerRng::from_entropy(),
         )
@@ -3956,7 +3951,6 @@ mod tests {
             &logctx.log,
             &blueprint5,
             &planning_input,
-            &collection,
             "dummy",
             PlannerRng::from_entropy(),
         )
@@ -4020,9 +4014,6 @@ mod tests {
             .unwrap_err();
         assert!(err.to_string().contains("no target blueprint set"));
 
-        // Create an initial empty collection
-        let collection = CollectionBuilder::new("test").build();
-
         // Create three blueprints:
         // * `blueprint1` has no parent
         // * `blueprint2` and `blueprint3` both have `blueprint1` as parent
@@ -4034,7 +4025,6 @@ mod tests {
             &logctx.log,
             &blueprint1,
             &EMPTY_PLANNING_INPUT,
-            &collection,
             "test2",
             PlannerRng::from_entropy(),
         )
@@ -4044,7 +4034,6 @@ mod tests {
             &logctx.log,
             &blueprint1,
             &EMPTY_PLANNING_INPUT,
-            &collection,
             "test3",
             PlannerRng::from_entropy(),
         )
@@ -4145,7 +4134,6 @@ mod tests {
             &logctx.log,
             &blueprint3,
             &EMPTY_PLANNING_INPUT,
-            &collection,
             "test3",
             PlannerRng::from_entropy(),
         )
@@ -4179,9 +4167,6 @@ mod tests {
         let db = TestDatabase::new_with_datastore(&logctx.log).await;
         let (opctx, datastore) = (db.opctx(), db.datastore());
 
-        // Create an initial empty collection
-        let collection = CollectionBuilder::new("test").build();
-
         // Create an initial blueprint and a child.
         let blueprint1 = BlueprintBuilder::build_empty_with_sleds(
             std::iter::empty(),
@@ -4191,7 +4176,6 @@ mod tests {
             &logctx.log,
             &blueprint1,
             &EMPTY_PLANNING_INPUT,
-            &collection,
             "test2",
             PlannerRng::from_entropy(),
         )
@@ -4431,7 +4415,6 @@ mod tests {
             &logctx.log,
             &blueprint1,
             &example_system.input,
-            &example_system.collection,
             &format!("{test_name}-2"),
             PlannerRng::from_entropy(),
         )

nexus/db-queries/src/db/datastore/vpc.rs

@@ -3322,17 +3322,12 @@ mod tests {
         // sled IDs running services.
         assert_service_sled_ids(&datastore, &[]).await;
 
-        // Build an initial empty collection
-        let collection =
-            system.to_collection_builder().expect("collection builder").build();
-
         // Create a blueprint that has a Nexus on our third sled.
         let bp1 = {
             let mut builder = BlueprintBuilder::new_based_on(
                 &logctx.log,
                 &bp0,
                 &planning_input,
-                &collection,
                 "test",
                 PlannerRng::from_entropy(),
             )
@@ -3426,7 +3421,6 @@ mod tests {
                 &logctx.log,
                 &bp2,
                 &planning_input,
-                &collection,
                 "test",
                 PlannerRng::from_entropy(),
             )

nexus/reconfigurator/execution/src/dns.rs

@@ -330,7 +330,6 @@ mod test {
     use nexus_db_queries::authz;
     use nexus_db_queries::context::OpContext;
     use nexus_db_queries::db::DataStore;
-    use nexus_inventory::CollectionBuilder;
     use nexus_inventory::now_db_precision;
     use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
     use nexus_reconfigurator_planning::blueprint_editor::ExternalNetworkingAllocator;
@@ -1563,12 +1562,10 @@ mod test {
         }
         .build()
         .unwrap();
-        let collection = CollectionBuilder::new("test").build();
         let mut builder = BlueprintBuilder::new_based_on(
             &log,
             &blueprint,
             &planning_input,
-            &collection,
             "test suite",
             PlannerRng::from_entropy(),
         )

nexus/reconfigurator/execution/src/sagas.rs

@@ -140,7 +140,6 @@ mod test {
             log,
             &blueprint1,
             &example.input,
-            &example.collection,
             "test suite",
             PlannerRng::from_entropy(),
         )
@@ -197,7 +196,6 @@ mod test {
             log,
             &blueprint2,
             &example.input,
-            &example.collection,
             "test suite",
             PlannerRng::from_entropy(),
         )