Add ClickHouse config to blueprint6 and remove exception tables

Author: sarataha

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

@@ -3814,7 +3814,7 @@ mod tests {
 
         // Now make a new blueprint (with no meaningful changes) to ensure we
         // can delete the last test blueprint we generated above.
-        let blueprint6 = BlueprintBuilder::new_based_on(
+        let mut blueprint6 = BlueprintBuilder::new_based_on(
             &logctx.log,
             &blueprint5,
             &planning_input,
@@ -3824,6 +3824,23 @@ mod tests {
         )
         .expect("failed to create builder")
         .build();
+
+        // Add ClickHouse configuration to exercise those tables
+        if let Some((_, sled_config)) = blueprint6.sleds.iter().next() {
+            if let Some(zone_config) = sled_config.zones.iter().next() {
+                let zone_id = zone_config.id;
+                let mut cfg = ClickhouseClusterConfig::new(
+                    format!("cluster-{TEST_NAME}"),
+                    "test-secret".into(),
+                );
+                cfg.max_used_keeper_id = KeeperId::from(1u64);
+                cfg.max_used_server_id = ServerId::from(1u64);
+                cfg.keepers.insert(zone_id, KeeperId::from(1u64));
+                cfg.servers.insert(zone_id, ServerId::from(1u64));
+                blueprint6.clickhouse_cluster_config = Some(cfg);
+            }
+        }
+
         datastore
             .blueprint_insert(&opctx, &blueprint6)
             .await
@@ -4695,29 +4712,17 @@ mod tests {
         /// Verify that every blueprint-related table contains ≥1 row across test blueprints.
         /// Complements `ensure_blueprint_fully_deleted`.
         fn ensure_fully_populated(&self) {
-            // Exception tables that may be empty in the test blueprints:
-            // - ClickHouse tables: only populated when blueprint includes ClickHouse configuration
-            let exception_tables = [
-                "bp_clickhouse_cluster_config",
-                "bp_clickhouse_keeper_zone_id_to_node_id",
-                "bp_clickhouse_server_zone_id_to_node_id",
-            ];
-
-            // Check that all non-exception tables have at least one row
+            // Check that all tables have at least one row
             let empty_tables = self.empty_tables();
-            let problematic_tables: Vec<_> = empty_tables
-                .into_iter()
-                .filter(|table| !exception_tables.contains(&table.as_str()))
-                .collect();
 
-            if !problematic_tables.is_empty() {
+            if !empty_tables.is_empty() {
                 panic!(
                     "Expected tables to be populated across test blueprints: {:?}\n\n\
                     If every blueprint should be expected to have a value in this table, then this is a bug. \
                     Otherwise, you may need to add a table to the exception list in `ensure_fully_populated()`. \
                     If you do this, please ensure that you add a test to `test_representative_blueprint()` that creates a \
                     blueprint that _does_ populate this table and verifies it.",
-                    problematic_tables
+                    empty_tables
                 );
             }
         }