use name lookup helper to look up thing by name!

oxidecomputer · Jan 12, 2024 · d9d8701 · d9d8701
1 parent 6c0518c
commit d9d8701
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 39 deletions.
diff --git a/nexus/db-queries/src/db/datastore/ip_pool.rs b/nexus/db-queries/src/db/datastore/ip_pool.rs
@@ -15,6 +15,7 @@ use crate::db::error::public_error_from_diesel;
 use crate::db::error::public_error_from_diesel_lookup;
 use crate::db::error::ErrorHandler;
 use crate::db::identity::Resource;
+use crate::db::lookup::LookupPath;
 use crate::db::model::ExternalIp;
 use crate::db::model::IpKind;
 use crate::db::model::IpPool;
@@ -217,49 +218,15 @@ impl DataStore {
             })
     }
 
-    /// Looks up an IP pool intended for internal services.
+    /// Look up IP pool intended for internal services by its well-known name.
     ///
     /// This method may require an index by Availability Zone in the future.
     pub async fn ip_pools_service_lookup(
         &self,
         opctx: &OpContext,
     ) -> LookupResult<(authz::IpPool, IpPool)> {
-        use db::schema::ip_pool;
-
-        opctx
-            .authorize(authz::Action::ListChildren, &authz::IP_POOL_LIST)
-            .await?;
-
-        // TODO: just use LookupPath, come on
-        // let (.., authz_pool, pool) = db::lookup::LookupPath::new(&opctx, self)
-        //     .ip_pool_name(*SERVICE_IP_POOL_NAME.parse().unwrap())
-        //     .lookup_for(authz::Action::Read)
-        //     .await?;
-        // Ok((authz_pool, pool))
-
-        // Look up IP pool by its association with the internal silo.
-        // We assume there is only one pool for that silo, or at least,
-        // if there is more than one, it doesn't matter which one we pick.
-        let (authz_pool, pool) = ip_pool::table
-            .filter(ip_pool::time_deleted.is_null())
-            .filter(ip_pool::name.eq(SERVICE_IP_POOL_NAME))
-            .select(IpPool::as_select())
-            .get_result_async(&*self.pool_connection_authorized(opctx).await?)
-            .await
-            .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))
-            .map(|ip_pool| {
-                (
-                    authz::IpPool::new(
-                        authz::FLEET,
-                        ip_pool.id(),
-                        LookupType::ByCompositeId(
-                            "Service IP Pool".to_string(),
-                        ),
-                    ),
-                    ip_pool,
-                )
-            })?;
-        Ok((authz_pool, pool))
+        let name = SERVICE_IP_POOL_NAME.parse().unwrap();
+        LookupPath::new(&opctx, self).ip_pool_name(&Name(name)).fetch().await
     }
 
     /// Creates a new IP pool.

diff --git a/nexus/tests/integration_tests/ip_pools.rs b/nexus/tests/integration_tests/ip_pools.rs
@@ -211,8 +211,8 @@ async fn get_ip_pools(client: &ClientTestContext) -> Vec<IpPool> {
 }
 
 // this test exists primarily because of a bug in the initial implementation
-// where we included a copy of each pool in the list response for every
-// associated silo instead of deduping the result of the left outer join
+// where we included a duplicate of each pool in the list response for every
+// associated silo
 #[nexus_test]
 async fn test_ip_pool_list_dedupe(cptestctx: &ControlPlaneTestContext) {
     let client = &cptestctx.external_client;