Address Dave's review comments

Created using spr 1.3.6-beta.1

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

@@ -137,22 +137,6 @@ impl DataStore {
         Ok(all_sleds)
     }
 
-    #[cfg(test)]
-    async fn sled_fetch_by_id(
-        &self,
-        opctx: &OpContext,
-        sled_id: Uuid,
-    ) -> Result<Sled, external::Error> {
-        use db::schema::sled::dsl;
-        dsl::sled
-            .filter(dsl::id.eq(sled_id))
-            .select(Sled::as_select())
-            .limit(1)
-            .get_result_async(&*self.pool_connection_authorized(opctx).await?)
-            .await
-            .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))
-    }
-
     pub async fn sled_reservation_create(
         &self,
         opctx: &OpContext,
@@ -715,6 +699,7 @@ mod test {
         datastore_test, sled_set_policy, sled_set_state, Expected,
         IneligibleSleds,
     };
+    use crate::db::lookup::LookupPath;
     use crate::db::model::ByteCount;
     use crate::db::model::SqlU32;
     use anyhow::{Context, Result};
@@ -847,8 +832,9 @@ mod test {
         );
 
         // The sled should not have been updated.
-        let observed_sled_2 = datastore
-            .sled_fetch_by_id(&opctx, observed_sled.id())
+        let (_, observed_sled_2) = LookupPath::new(&opctx, &datastore)
+            .sled_id(observed_sled.id())
+            .fetch_for(authz::Action::Modify)
             .await
             .unwrap();
         assert_eq!(

nexus/deployment/src/planner.rs

@@ -83,9 +83,6 @@ impl<'a> Planner<'a> {
         // is fine.
         let mut sleds_ineligible_for_services = BTreeSet::new();
 
-        // TODO: this code will also need to _remove_ services from expunged
-        // (and decommissioned?) sleds.
-
         for (sled_id, sled_info) in &self.policy.sleds {
             // Decommissioned sleds don't get any services. (This is an
             // explicit match so that when more states are added, this fails to