clean up tempdirs after tests

Author: jgallagher

illumos-utils/src/running_zone.rs

@@ -1008,7 +1008,7 @@ impl ZoneBuilderFactory {
 
     /// For use in unit tests that don't require actual zone creation to occur.
     pub fn fake(
-        temp_dir: Option<&String>,
+        temp_dir: Option<&str>,
         zones_api: Arc<dyn crate::zone::Api>,
     ) -> Self {
         let temp_dir = match temp_dir {

sled-agent/config-reconciler/src/reconciler_task/zones.rs

@@ -682,6 +682,7 @@ mod tests {
     use super::*;
     use crate::CurrentlyManagedZpoolsReceiver;
     use anyhow::anyhow;
+    use camino_tempfile::Utf8TempDir;
     use illumos_utils::dladm::Etherstub;
     use illumos_utils::dladm::EtherstubVnic;
     use illumos_utils::link::VnicAllocator;
@@ -702,6 +703,7 @@ mod tests {
     struct FakeZoneBuilder {
         vnic_alloc: VnicAllocator<Etherstub>,
         factory: ZoneBuilderFactory,
+        tempdir: Utf8TempDir,
     }
 
     impl FakeZoneBuilder {
@@ -712,11 +714,14 @@ mod tests {
                 vnic_source,
                 illumos_utils::fakes::dladm::Dladm::new(),
             );
+            let tempdir =
+                Utf8TempDir::with_prefix("test-config-reconciler-zones-")
+                    .expect("created temp dir");
             let factory = ZoneBuilderFactory::fake(
-                None,
+                Some(tempdir.path().as_str()),
                 illumos_utils::fakes::zone::Zones::new(),
             );
-            Self { vnic_alloc, factory }
+            Self { vnic_alloc, factory, tempdir }
         }
 
         async fn make_running_zone(
@@ -891,7 +896,8 @@ mod tests {
             OmicronZones::new(nonexistent_mount_config(), TimeSyncConfig::Skip);
 
         let fake_zone_id = OmicronZoneUuid::new_v4();
-        let fake_zone = FakeZoneBuilder::new()
+        let fake_zone_builder = FakeZoneBuilder::new();
+        let fake_zone = fake_zone_builder
             .make_running_zone("test", logctx.log.clone())
             .await;
         zones.zones.insert(OmicronZone {
@@ -1011,7 +1017,8 @@ mod tests {
         }
 
         // Set up our fake sled-agent to return success.
-        let fake_zone = FakeZoneBuilder::new()
+        let fake_zone_builder = FakeZoneBuilder::new();
+        let fake_zone = fake_zone_builder
             .make_running_zone("test", logctx.log.clone())
             .await;
         sled_agent_facilities.push_start_response(Ok(fake_zone));
@@ -1066,7 +1073,8 @@ mod tests {
             },
             image_source: OmicronZoneImageSource::InstallDataset,
         };
-        let fake_zone = FakeZoneBuilder::new()
+        let fake_zone_builder = FakeZoneBuilder::new();
+        let fake_zone = fake_zone_builder
             .make_running_zone("test", logctx.log.clone())
             .await;
 

sled-agent/src/instance.rs

@@ -2428,7 +2428,7 @@ mod tests {
         propolis_addr: SocketAddr,
         nexus_client: NexusClient,
         storage_handle: StorageHandle,
-        temp_dir: &String,
+        temp_dir: &str,
     ) -> (Instance, MetricsRx) {
         let id = InstanceUuid::new_v4();
         let propolis_id = PropolisUuid::from_untyped_uuid(PROPOLIS_ID);
@@ -2524,7 +2524,7 @@ mod tests {
         log: &Logger,
         storage_handle: StorageHandle,
         nexus_client: NexusClient,
-        temp_dir: &String,
+        temp_dir: &str,
     ) -> (InstanceManagerServices, MetricsRx) {
         let vnic_allocator = VnicAllocator::new(
             "Instance",
@@ -2579,7 +2579,7 @@ mod tests {
                 log,
                 storage_harness.handle().clone(),
                 nexus.nexus_client.clone(),
-                &temp_guard.path().to_string(),
+                temp_guard.path().as_str(),
             );
 
             let InstanceManagerServices {
@@ -2643,7 +2643,6 @@ mod tests {
         let storage_handle = storage_harness.handle().clone();
 
         let temp_guard = Utf8TempDir::new().unwrap();
-        let temp_dir = temp_guard.path().to_string();
 
         let (inst, mut metrics_rx) = timeout(
             TIMEOUT_DURATION,
@@ -2652,7 +2651,7 @@ mod tests {
                 propolis_addr,
                 nexus_client,
                 storage_handle,
-                &temp_dir,
+                temp_guard.path().as_str(),
             ),
         )
         .await
@@ -2729,7 +2728,6 @@ mod tests {
         let storage_handle = storage_harness.handle().clone();
 
         let temp_guard = Utf8TempDir::new().unwrap();
-        let temp_dir = temp_guard.path().to_string();
 
         let (inst, _) = timeout(
             TIMEOUT_DURATION,
@@ -2739,7 +2737,7 @@ mod tests {
                 SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::LOCALHOST, 1, 0, 0)),
                 nexus_client,
                 storage_handle,
-                &temp_dir,
+                temp_guard.path().as_str(),
             ),
         )
         .await
@@ -3142,7 +3140,7 @@ mod tests {
                 &log,
                 storage_harness.handle().clone(),
                 nexus_client,
-                &temp_guard.path().to_string(),
+                temp_guard.path().as_str(),
             );
             let propolis_id = PropolisUuid::new_v4();
             let propolis_addr = SocketAddr::V4(SocketAddrV4::new(

sled-agent/src/services.rs

@@ -1744,7 +1744,7 @@ impl ServiceManager {
         let mut zone_builder = match self.inner.system_api.fake_install_dir() {
             None => ZoneBuilderFactory::new().builder(),
             Some(dir) => ZoneBuilderFactory::fake(
-                Some(&dir.as_str().to_string()),
+                Some(&dir.as_str()),
                 illumos_utils::fakes::zone::Zones::new(),
             )
             .builder(),