chore: Merge upstream main

Signed-off-by: Kyle Felter <kfelter@nvidia.com>

Author: kfelternv

Cargo.lock

@@ -458,7 +458,7 @@ fn convert_endpoints_to_nice_table(endpoints: &[ExploredEndpoint]) -> Box<Table>
         "BMC Mac Address",
         "Vendor",
         "MachineId",
-        "Preingt State",
+        "Pre-ingestion State",
         "Serial Number",
         "Last Exploration Error",
     ];

crates/admin-cli/src/site_explorer/get_report/cmd.rs

@@ -3633,7 +3633,7 @@ async fn test_network_details_migration(
     let mut conn = env.pool.acquire().await.unwrap();
     sqlx::query(include_str!(concat!(
         env!("CARGO_MANIFEST_DIR"),
-        "/../api-db/migrations/20250505194055_network_segment_id_to_network_details.sql"
+        "/../api-db/migrations.pre-squash.20260708172302/20250505194055_network_segment_id_to_network_details.sql"
     )))
     .execute(conn.as_mut())
     .await

crates/api-core/src/tests/instance.rs

@@ -109,7 +109,7 @@ async fn test_nmx_c_partition_id_migration_deletes_legacy_nmx_m_rows(pool: sqlx:
 
     sqlx::raw_sql(include_str!(concat!(
         env!("CARGO_MANIFEST_DIR"),
-        "/../api-db/migrations/20260526120000_nvlink_partitions_nmx_c_partition_id.sql"
+        "/../api-db/migrations.pre-squash.20260708172302/20260526120000_nvlink_partitions_nmx_c_partition_id.sql"
     )))
     .execute(conn.as_mut())
     .await

crates/api-core/src/tests/nvl_instance.rs

@@ -20,4 +20,5 @@ fn main() {
     // generated by `sqlx migrate build-script`
     // trigger recompilation when a new migration is added
     println!("cargo:rerun-if-changed=migrations");
+    println!("cargo:rerun-if-changed=migrations.pre-squash.20260708172302");
 }