cargo check --all-targets works

oxidecomputer · Oct 24, 2023 · bbddcb4 · bbddcb4
1 parent 34903bc
commit bbddcb4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/installinator/Cargo.toml b/installinator/Cargo.toml
@@ -30,6 +30,7 @@ reqwest.workspace = true
 serde.workspace = true
 sha2.workspace = true
 sled-hardware.workspace = true
+sled-storage.workspace = true
 slog.workspace = true
 slog-async.workspace = true
 slog-envlogger.workspace = true

diff --git a/installinator/src/hardware.rs b/installinator/src/hardware.rs
@@ -6,10 +6,11 @@ use anyhow::anyhow;
 use anyhow::ensure;
 use anyhow::Context;
 use anyhow::Result;
-use sled_hardware::Disk;
 use sled_hardware::DiskVariant;
 use sled_hardware::HardwareManager;
 use sled_hardware::SledMode;
+use sled_storage::disk::Disk;
+use sled_storage::disk::RawDisk;
 use slog::info;
 use slog::Logger;
 
@@ -28,7 +29,8 @@ impl Hardware {
                 anyhow!("failed to create HardwareManager: {err}")
             })?;
 
-        let disks = hardware.disks();
+        let disks: Vec<RawDisk> =
+            hardware.disks().into_iter().map(|disk| disk.into()).collect();
 
         info!(
             log, "found gimlet hardware";

diff --git a/installinator/src/write.rs b/installinator/src/write.rs
@@ -122,8 +122,9 @@ impl WriteDestination {
                     );
 
                     let zpool_name = disk.zpool_name().clone();
-                    let control_plane_dir = zpool_name
-                        .dataset_mountpoint(sled_hardware::INSTALL_DATASET);
+                    let control_plane_dir = zpool_name.dataset_mountpoint(
+                        sled_storage::dataset::INSTALL_DATASET,
+                    );
 
                     match drives.entry(slot) {
                         Entry::Vacant(entry) => {

diff --git a/sled-agent/src/bootstrap/secret_retriever.rs b/sled-agent/src/bootstrap/secret_retriever.rs
@@ -92,7 +92,7 @@ impl LrtqOrHardcodedSecretRetriever {
 ///
 /// The local retriever only returns keys for epoch 0
 #[derive(Debug)]
-pub struct HardcodedSecretRetriever {}
+struct HardcodedSecretRetriever {}
 
 #[async_trait]
 impl SecretRetriever for HardcodedSecretRetriever {

diff --git a/sled-storage/src/disk.rs b/sled-storage/src/disk.rs
@@ -116,6 +116,13 @@ impl RawDisk {
     pub fn is_real(&self) -> bool {
         !self.is_synthetic()
     }
+
+    pub fn devfs_path(&self) -> &Utf8PathBuf {
+        match self {
+            Self::Real(disk) => disk.devfs_path(),
+            Self::Synthetic(_) => unreachable!(),
+        }
+    }
 }
 
 /// A physical [`PooledDisk`] or a [`SyntheticDisk`] that contains or is backed