scan VPCs by name, not ID (didn't realize they had names when I started)

Author: david-crespo

omicron-nexus/src/db/datastore.rs

@@ -48,7 +48,6 @@ use super::schema::Disk;
 use super::schema::Instance;
 use super::schema::LookupByAttachedInstance;
 use super::schema::LookupByUniqueId;
-use super::schema::LookupByUniqueIdInProject;
 use super::schema::LookupByUniqueName;
 use super::schema::LookupByUniqueNameInProject;
 use super::schema::Project;
@@ -726,11 +725,11 @@ impl DataStore {
     pub async fn project_list_vpcs(
         &self,
         project_id: &Uuid,
-        pagparams: &DataPageParams<'_, Uuid>,
+        pagparams: &DataPageParams<'_, Name>,
     ) -> ListResult<api::VPC> {
         let client = self.pool.acquire().await?;
         sql_fetch_page_by::<
-            LookupByUniqueIdInProject,
+            LookupByUniqueNameInProject,
             VPC,
             <VPC as Table>::ModelType,
         >(&client, (project_id,), pagparams, VPC::ALL_COLUMNS)

omicron-nexus/src/db/schema.rs

@@ -399,25 +399,6 @@ impl<'a, R: ResourceTable> LookupKey<'a, R> for LookupByUniqueNameInProject {
     }
 }
 
-/**
- * Implementation of [`LookupKey`] for looking up objects within a project by
- * the project_id and the object's id
- */
-pub struct LookupByUniqueIdInProject;
-impl<'a, R: ResourceTable> LookupKey<'a, R> for LookupByUniqueIdInProject {
-    type ScopeKey = (&'a Uuid,);
-    const SCOPE_KEY_COLUMN_NAMES: &'static [&'static str] = &["project_id"];
-    type ItemKey = Uuid;
-    const ITEM_KEY_COLUMN_NAME: &'static str = "id";
-
-    fn where_select_error(
-        _scope_key: Self::ScopeKey,
-        item_key: &Self::ItemKey,
-    ) -> Error {
-        Error::not_found_by_id(R::RESOURCE_TYPE, item_key)
-    }
-}
-
 /**
  * Implementation of [`LookupKey`] for looking up objects by name within the
  * scope of an instance (SQL column "attach_instance_id").  This is really just

omicron-nexus/src/http_entrypoints_external.rs

@@ -667,7 +667,7 @@ async fn instance_disks_delete_disk(
  }]
 async fn project_vpcs_get(
     rqctx: Arc<RequestContext<Arc<ServerContext>>>,
-    query_params: Query<PaginatedById>,
+    query_params: Query<PaginatedByName>,
     path_params: Path<ProjectPathParam>,
 ) -> Result<HttpResponseOk<ResultsPage<VPCView>>, HttpError> {
     let apictx = rqctx.context();
@@ -682,7 +682,7 @@ async fn project_vpcs_get(
         )
         .await?;
     let view_list = to_view_list(vpc_stream).await;
-    Ok(HttpResponseOk(ScanById::results_page(&query, view_list)?))
+    Ok(HttpResponseOk(ScanByName::results_page(&query, view_list)?))
 }
 
 /**

omicron-nexus/src/nexus.rs

@@ -1005,7 +1005,7 @@ impl Nexus {
     pub async fn project_list_vpcs(
         &self,
         project_name: &Name,
-        pagparams: &DataPageParams<'_, Uuid>,
+        pagparams: &DataPageParams<'_, Name>,
     ) -> ListResult<VPC> {
         let project_id =
             self.db_datastore.project_lookup_id_by_name(project_name).await?;

omicron-nexus/tests/output/nexus-openapi.json

@@ -970,7 +970,7 @@
             "in": "query",
             "name": "sort_by",
             "schema": {
-              "$ref": "#/components/schemas/IdSortMode"
+              "$ref": "#/components/schemas/NameSortMode"
             },
             "style": "form"
           },