Align column order

Author: smklein

nexus/db-model/src/oximeter_info.rs

@@ -20,6 +20,10 @@ pub struct OximeterInfo {
     pub time_created: DateTime<Utc>,
     /// When this resource was last modified.
     pub time_modified: DateTime<Utc>,
+    /// The address on which this `oximeter` instance listens for requests.
+    pub ip: ipnetwork::IpNetwork,
+    /// The port on which this `oximeter` instance listens for requests.
+    pub port: SqlU16,
     /// When this resource was expunged.
     //
     // We typically refer to _zones_ as expunged; this isn't quite the same
@@ -31,10 +35,6 @@ pub struct OximeterInfo {
     // producers (and will result in any producers it had been assigned being
     // reassigned to some other collector).
     pub time_expunged: Option<DateTime<Utc>>,
-    /// The address on which this `oximeter` instance listens for requests.
-    pub ip: ipnetwork::IpNetwork,
-    /// The port on which this `oximeter` instance listens for requests.
-    pub port: SqlU16,
 }
 
 impl OximeterInfo {

nexus/db-schema/src/crdb_alignment_test.rs

@@ -566,19 +566,18 @@ async fn diesel_schema_matches_crdb_schema() {
          updating the file."
     );
 
-    column_order_drift.sort();
-    let actual_order = format_list(&column_order_drift);
-    let expected_order =
-        std::fs::read_to_string("tests/output/schema_column_order_drift.txt")
-            .expect("failed to read schema_column_order_drift.txt");
-    similar_asserts::assert_eq!(
-        expected_order,
-        actual_order,
-        "Column order drift list doesn't match expected.\n\n\
-         This file tracks tables where the column order in schema.rs \
-         differs from CRDB. If this list changed, investigate whether \
-         the column order should be fixed rather than updating the file."
-    );
+    if !column_order_drift.is_empty() {
+        column_order_drift.sort();
+        panic!(
+            "Column order in schema.rs differs from CRDB for {} table(s):\n\n\
+             {}\n\n\
+             The column order in the Diesel table! macro must match the \
+             column order in CRDB (dbinit.sql). Reorder the columns in \
+             schema.rs to match.",
+            column_order_drift.len(),
+            column_order_drift.join("\n"),
+        );
+    }
 
     mismatched_columns.sort();
     let actual_drift = format_list(&mismatched_columns);

nexus/db-schema/src/schema.rs

@@ -44,8 +44,8 @@ table! {
         disk_state -> Text,
         attach_instance_id -> Nullable<Uuid>,
         state_generation -> Int8,
-        time_state_updated -> Timestamptz,
         slot -> Nullable<Int2>,
+        time_state_updated -> Timestamptz,
         size_bytes -> Int8,
         block_size -> crate::enums::BlockSizeEnum,
         disk_type -> crate::enums::DiskTypeEnum,
@@ -203,10 +203,10 @@ table! {
         chassis_id -> Nullable<Text>,
         system_name -> Nullable<Text>,
         system_description -> Nullable<Text>,
-        management_ip -> Nullable<Inet>,
         time_created -> Timestamptz,
         time_modified -> Timestamptz,
         time_deleted -> Nullable<Timestamptz>,
+        management_ip -> Nullable<Inet>,
     }
 }
 
@@ -310,8 +310,8 @@ table! {
         time_modified -> Timestamptz,
         time_deleted -> Nullable<Timestamptz>,
         asn -> Int8,
-        bgp_announce_set_id -> Uuid,
         vrf -> Nullable<Text>,
+        bgp_announce_set_id -> Uuid,
         shaper -> Nullable<Text>,
         checker -> Nullable<Text>,
         max_paths -> Int2,
@@ -323,11 +323,10 @@ table! {
         switch_location -> Text,
         port_name -> Text,
         addr -> Nullable<Inet>,
-        asn -> Int8,
-        connect_retry -> Int8,
-        delay_open -> Int8,
         hold_time -> Int8,
         idle_hold_time -> Int8,
+        delay_open -> Int8,
+        connect_retry -> Int8,
         keepalive -> Int8,
         remote_asn -> Nullable<Int8>,
         min_ttl -> Nullable<Int8>,
@@ -337,6 +336,7 @@ table! {
         enforce_first_as -> Bool,
         vlan_id -> Nullable<Int4>,
         router_lifetime -> Int4,
+        asn -> Int8,
     }
 }
 
@@ -447,23 +447,23 @@ table! {
         time_deleted -> Nullable<Timestamptz>,
         project_id -> Uuid,
         user_data -> Binary,
-        ncpus -> Int8,
-        memory -> Int8,
-        hostname -> Text,
-        auto_restart_policy -> Nullable<crate::enums::InstanceAutoRestartPolicyEnum>,
-        auto_restart_cooldown -> Nullable<Interval>,
-        boot_disk_id -> Nullable<Uuid>,
-        cpu_platform -> Nullable<crate::enums::InstanceCpuPlatformEnum>,
         time_state_updated -> Timestamptz,
         state_generation -> Int8,
         active_propolis_id -> Nullable<Uuid>,
         target_propolis_id -> Nullable<Uuid>,
         migration_id -> Nullable<Uuid>,
+        ncpus -> Int8,
+        memory -> Int8,
+        hostname -> Text,
+        updater_id -> Nullable<Uuid>,
+        updater_gen-> Int8,
         state -> crate::enums::InstanceStateEnum,
         time_last_auto_restarted -> Nullable<Timestamptz>,
+        auto_restart_policy -> Nullable<crate::enums::InstanceAutoRestartPolicyEnum>,
+        auto_restart_cooldown -> Nullable<Interval>,
+        boot_disk_id -> Nullable<Uuid>,
         intended_state -> crate::enums::InstanceIntendedStateEnum,
-        updater_id -> Nullable<Uuid>,
-        updater_gen-> Int8,
+        cpu_platform -> Nullable<crate::enums::InstanceCpuPlatformEnum>,
     }
 }
 
@@ -475,13 +475,13 @@ table! {
         time_created -> Timestamptz,
         time_deleted -> Nullable<Timestamptz>,
         instance_id -> Uuid,
+        time_state_updated -> Timestamptz,
+        state_generation -> Int8,
         sled_id -> Uuid,
         propolis_ip -> Inet,
         propolis_port -> Int4,
-        cpu_platform -> crate::enums::VmmCpuPlatformEnum,
-        time_state_updated -> Timestamptz,
-        state_generation -> Int8,
         state -> crate::enums::VmmStateEnum,
+        cpu_platform -> crate::enums::VmmCpuPlatformEnum,
     }
 }
 joinable!(vmm -> sled (sled_id));
@@ -492,13 +492,13 @@ table! {
         name -> Text,
         silo_name -> Text,
         project_name -> Text,
+        active_sled_id -> Uuid,
         time_created -> Timestamptz,
         time_modified -> Timestamptz,
-        state -> crate::enums::VmmStateEnum,
-        active_sled_id -> Uuid,
         migration_id -> Nullable<Uuid>,
         ncpus -> Int8,
         memory -> Int8,
+        state -> crate::enums::VmmStateEnum,
     }
 }
 
@@ -572,13 +572,13 @@ table! {
     silo_utilization(silo_id) {
         silo_id -> Uuid,
         silo_name -> Text,
-        silo_discoverable -> Bool,
         cpus_provisioned -> Int8,
         memory_provisioned -> Int8,
         storage_provisioned -> Int8,
         cpus_allocated -> Int8,
         memory_allocated -> Int8,
         storage_allocated -> Int8,
+        silo_discoverable -> Bool,
     }
 }
 
@@ -608,11 +608,11 @@ table! {
         // original name of `ip` because renaming columns is not idempotent in
         // CRDB as of today.
         ip -> Nullable<Inet>,
-        ipv6 -> Nullable<Inet>,
         slot -> Int2,
         is_primary -> Bool,
         // NOTE: These are the IPv4 transit IPs specifically.
         transit_ips -> Array<Inet>,
+        ipv6 -> Nullable<Inet>,
         transit_ips_v6 -> Array<Inet>,
     }
 }
@@ -666,8 +666,8 @@ table! {
         time_created -> Timestamptz,
         time_modified -> Timestamptz,
         time_deleted -> Nullable<Timestamptz>,
-        ip_version -> crate::enums::IpVersionEnum,
         rcgen -> Int8,
+        ip_version -> crate::enums::IpVersionEnum,
         reservation_type -> crate::enums::IpPoolReservationTypeEnum,
         pool_type -> crate::enums::IpPoolTypeEnum,
     }
@@ -980,9 +980,9 @@ table! {
         id -> Uuid,
         time_created -> Timestamptz,
         time_modified -> Timestamptz,
-        time_expunged -> Nullable<Timestamptz>,
         ip -> Inet,
         port -> Int4,
+        time_expunged -> Nullable<Timestamptz>,
     }
 }
 
@@ -1104,11 +1104,11 @@ table! {
 }
 
 table! {
-    sled_underlay_subnet_allocation (rack_id, sled_id) {
+    sled_underlay_subnet_allocation (hw_baseboard_id, sled_id) {
+        hw_baseboard_id -> Uuid,
         rack_id -> Uuid,
         sled_id -> Uuid,
         subnet_octet -> Int2,
-        hw_baseboard_id -> Uuid,
     }
 }
 allow_tables_to_appear_in_same_query!(rack, sled_underlay_subnet_allocation);
@@ -1141,9 +1141,9 @@ table! {
         model -> Text,
 
         variant -> crate::enums::PhysicalDiskKindEnum,
+        sled_id -> Uuid,
         disk_policy -> crate::enums::PhysicalDiskPolicyEnum,
         disk_state -> crate::enums::PhysicalDiskStateEnum,
-        sled_id -> Uuid,
     }
 }
 
@@ -1323,9 +1323,9 @@ table! {
         time_deleted -> Nullable<Timestamptz>,
         project_id -> Uuid,
         system_router_id -> Uuid,
+        dns_name -> Text,
         vni -> Int4,
         ipv6_prefix -> Inet,
-        dns_name -> Text,
         firewall_gen -> Int8,
         subnet_gen -> Int8,
     }
@@ -1370,8 +1370,8 @@ table! {
         time_created -> Timestamptz,
         time_modified -> Timestamptz,
         time_deleted -> Nullable<Timestamptz>,
-        kind -> crate::enums::RouterRouteKindEnum,
         vpc_router_id -> Uuid,
+        kind -> crate::enums::RouterRouteKindEnum,
         target -> Text,
         destination -> Text,
         vpc_subnet_id -> Nullable<Uuid>,
@@ -1504,17 +1504,17 @@ table! {
 
 table! {
     role_assignment (
-        identity_type,
-        identity_id,
-        resource_type,
         resource_id,
-        role_name
+        resource_type,
+        role_name,
+        identity_id,
+        identity_type
     ) {
-        identity_type -> crate::enums::IdentityTypeEnum,
-        identity_id -> Uuid,
         resource_type -> Text,
         role_name -> Text,
         resource_id -> Uuid,
+        identity_id -> Uuid,
+        identity_type -> crate::enums::IdentityTypeEnum,
     }
 }
 
@@ -1746,7 +1746,6 @@ table! {
         sled_role -> crate::enums::SledRoleEnum,
         usable_hardware_threads -> Int8,
         usable_physical_ram -> Int8,
-        cpu_family -> crate::enums::SledCpuFamilyEnum,
         reservoir_size -> Int8,
 
         ledgered_sled_config -> Nullable<Uuid>,
@@ -1760,14 +1759,16 @@ table! {
         zone_manifest_mupdate_id -> Nullable<Uuid>,
         zone_manifest_boot_disk_error -> Nullable<Text>,
 
+        mupdate_override_boot_disk_path -> Text,
+        mupdate_override_id -> Nullable<Uuid>,
+        mupdate_override_boot_disk_error -> Nullable<Text>,
+
+        cpu_family -> crate::enums::SledCpuFamilyEnum,
+
         measurement_manifest_boot_disk_path -> Text,
         measurement_manifest_source -> Nullable<crate::enums::InvZoneManifestSourceEnum>,
         measurement_manifest_mupdate_id -> Nullable<Uuid>,
         measurement_manifest_boot_disk_error -> Nullable<Text>,
-
-        mupdate_override_boot_disk_path -> Text,
-        mupdate_override_id -> Nullable<Uuid>,
-        mupdate_override_boot_disk_error -> Nullable<Text>,
     }
 }
 
@@ -2248,11 +2249,11 @@ table! {
         snat_ip -> Nullable<Inet>,
         snat_first_port -> Nullable<Int4>,
         snat_last_port -> Nullable<Int4>,
+        external_ip_id -> Nullable<Uuid>,
+        filesystem_pool -> Uuid,
         disposition -> crate::enums::BpZoneDispositionEnum,
         disposition_expunged_as_of_generation -> Nullable<Int8>,
         disposition_expunged_ready_for_cleanup -> Bool,
-        external_ip_id -> Nullable<Uuid>,
-        filesystem_pool -> Uuid,
         image_source -> crate::enums::BpZoneImageSourceEnum,
         image_artifact_sha256 -> Nullable<Text>,
         nexus_generation -> Nullable<Int8>,