and the column gets a s/boot_disk/boot_disk_id/g

Author: iximeow

nexus/db-model/src/instance.rs

@@ -64,8 +64,8 @@ pub struct Instance {
     pub auto_restart_policy: Option<InstanceAutoRestart>,
 
     /// The primary boot disk for this instance.
-    #[diesel(column_name = boot_disk)]
-    pub boot_disk: Option<Uuid>,
+    #[diesel(column_name = boot_disk_id)]
+    pub boot_disk_id: Option<Uuid>,
 
     #[diesel(embed)]
     pub runtime_state: InstanceRuntimeState,
@@ -117,9 +117,9 @@ impl Instance {
             // TODO(eliza): allow this to be configured via the instance-create
             // params...
             auto_restart_policy: None,
-            // Intentionally ignore `params.boot_disk` here: we can't set
-            // `boot_disk` until the referenced disk is attached.
-            boot_disk: None,
+            // Intentionally ignore `params.boot_disk_id` here: we can't set
+            // `boot_disk_id` until the referenced disk is attached.
+            boot_disk_id: None,
             runtime_state,
 
             updater_gen: Generation::new(),
@@ -235,6 +235,6 @@ impl InstanceRuntimeState {
 #[derive(Clone, Debug, AsChangeset, Serialize, Deserialize)]
 #[diesel(table_name = instance, treat_none_as_null = true)]
 pub struct InstanceUpdate {
-    #[diesel(column_name = boot_disk)]
-    pub boot_disk: Option<Uuid>,
+    #[diesel(column_name = boot_disk_id)]
+    pub boot_disk_id: Option<Uuid>,
 }

nexus/db-model/src/schema.rs

@@ -408,7 +408,7 @@ table! {
         memory -> Int8,
         hostname -> Text,
         auto_restart_policy -> Nullable<crate::InstanceAutoRestartEnum>,
-        boot_disk -> Nullable<Uuid>,
+        boot_disk_id -> Nullable<Uuid>,
         time_state_updated -> Timestamptz,
         state_generation -> Int8,
         active_propolis_id -> Nullable<Uuid>,

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

@@ -337,8 +337,8 @@ impl DataStore {
                         .eq_any(ok_to_detach_instance_states)
                         .and(instance::dsl::active_propolis_id.is_null())
                         .and(
-                            instance::dsl::boot_disk.ne(authz_disk.id())
-                                .or(instance::dsl::boot_disk.is_null())
+                            instance::dsl::boot_disk_id.ne(authz_disk.id())
+                                .or(instance::dsl::boot_disk_id.is_null())
                         )),
             disk::table
                 .into_boxed()
@@ -392,7 +392,7 @@ impl DataStore {
                                 // Ok-to-be-detached instance states:
                                 api::external::InstanceState::Creating |
                                 api::external::InstanceState::Stopped => {
-                                    if collection.boot_disk == Some(authz_disk.id()) {
+                                    if collection.boot_disk_id == Some(authz_disk.id()) {
                                         return Err(Error::conflict(
                                             "boot disk cannot be detached"
                                         ));

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

@@ -206,7 +206,7 @@ impl From<InstanceAndActiveVmm> for external::Instance {
                 .hostname
                 .parse()
                 .expect("found invalid hostname in the database"),
-            boot_disk_id: value.instance.boot_disk.into(),
+            boot_disk_id: value.instance.boot_disk_id.into(),
             runtime: external::InstanceRuntimeState {
                 run_state: value.effective_state(),
                 time_run_state_updated,
@@ -940,7 +940,7 @@ impl DataStore {
                         }
                     }
 
-                    if let Some(disk_id) = update.boot_disk.clone() {
+                    if let Some(disk_id) = update.boot_disk_id.clone() {
                         // Ensure the disk is currently attached before updating
                         // the database.
                         let expected_state = api::external::DiskState::Attached(
@@ -972,7 +972,7 @@ impl DataStore {
                     // here.
                     //
                     // NOTE: from this point forward it is OK if we update the
-                    // instance's `boot_disk` column with the updated value
+                    // instance's `boot_disk_id` column with the updated value
                     // again. It will have already been assigned with constraint
                     // checking performed above, so updates will just be
                     // repetitive, not harmful.
@@ -1774,7 +1774,7 @@ mod tests {
                             params::InstanceNetworkInterfaceAttachment::None,
                         external_ips: Vec::new(),
                         disks: Vec::new(),
-                        boot_disk: None,
+                        boot_disk_id: None,
                         ssh_public_keys: None,
                         start: false,
                     },

nexus/src/app/instance.rs

@@ -304,7 +304,7 @@ impl super::Nexus {
         let (.., authz_project, authz_instance) =
             instance_lookup.lookup_for(authz::Action::Modify).await?;
 
-        let boot_disk = match params.boot_disk.clone() {
+        let boot_disk_id = match params.boot_disk.clone() {
             Some(disk) => {
                 let selector = params::DiskSelector {
                     project: match &disk {
@@ -323,7 +323,7 @@ impl super::Nexus {
             None => None,
         };
 
-        let update = InstanceUpdate { boot_disk };
+        let update = InstanceUpdate { boot_disk_id };
         self.datastore()
             .reconfigure_instance(opctx, &authz_instance, update)
             .await
@@ -1054,7 +1054,7 @@ impl super::Nexus {
 
             // Propolis wants the name of the boot disk rather than ID, because we send names
             // rather than IDs in the disk requsts as assembled below.
-            if db_instance.boot_disk == Some(disk.id()) {
+            if db_instance.boot_disk_id == Some(disk.id()) {
                 boot_disk_name = Some(disk.name().to_string());
             }
 
@@ -1079,16 +1079,16 @@ impl super::Nexus {
         // look up a name when assembling the Propolis request, we might as well
         // remove this check; we can just pass the ID and rely on Propolis' own
         // check that the boot disk is attached.
-        if let Some(instance_boot_disk) = db_instance.boot_disk.as_ref() {
+        if let Some(instance_boot_disk_id) = db_instance.boot_disk_id.as_ref() {
             if boot_disk_name.is_none() {
                 error!(self.log, "instance boot disk is not attached";
-                   "boot_disk" => ?instance_boot_disk,
+                   "boot_disk_id" => ?instance_boot_disk_id,
                    "instance id" => %db_instance.id());
 
                 return Err(InstanceStateChangeError::Other(Error::internal_error(&format!(
                     "instance {} has boot disk {:?} but it is not attached",
                     db_instance.id(),
-                    db_instance.boot_disk.as_ref(),
+                    db_instance.boot_disk_id.as_ref(),
                 ))));
             }
         }

nexus/src/app/sagas/instance_create.rs

@@ -1066,7 +1066,7 @@ async fn sic_set_boot_disk(
     };
 
     let initial_configuration =
-        nexus_db_model::InstanceUpdate { boot_disk: Some(authz_disk.id()) };
+        nexus_db_model::InstanceUpdate { boot_disk_id: Some(authz_disk.id()) };
 
     datastore
         .reconfigure_instance(&opctx, &authz_instance, initial_configuration)
@@ -1098,7 +1098,7 @@ async fn sic_set_boot_disk_undo(
     // If there was a boot disk, clear it. If there was not a boot disk,
     // this is a no-op.
     let undo_configuration =
-        nexus_db_model::InstanceUpdate { boot_disk: None };
+        nexus_db_model::InstanceUpdate { boot_disk_id: None };
 
     datastore
         .reconfigure_instance(&opctx, &authz_instance, undo_configuration)

schema/crdb/dbinit.sql

@@ -1114,7 +1114,7 @@ CREATE TABLE IF NOT EXISTS omicron.public.instance (
      * does not want our policy, and instead should be permitted control over
      * its boot-time fates.
      */
-    boot_disk UUID,
+    boot_disk_id UUID,
 
     CONSTRAINT vmm_iff_active_propolis CHECK (
         ((state = 'vmm') AND (active_propolis_id IS NOT NULL)) OR