on second thought, use one-off struct so it can have its own description

Author: david-crespo

nexus/src/external_api/http_entrypoints.rs

@@ -2500,7 +2500,7 @@ async fn instance_network_interface_update(
 async fn instance_external_ip_list(
     rqctx: Arc<RequestContext<Arc<ServerContext>>>,
     path_params: Path<InstancePathParam>,
-) -> Result<HttpResponseOk<views::Results<views::ExternalIp>>, HttpError> {
+) -> Result<HttpResponseOk<views::ExternalIps>, HttpError> {
     let apictx = rqctx.context();
     let nexus = &apictx.nexus;
     let path = path_params.into_inner();
@@ -2517,7 +2517,7 @@ async fn instance_external_ip_list(
                 instance_name,
             )
             .await?;
-        Ok(HttpResponseOk(ips.into()))
+        Ok(HttpResponseOk(views::ExternalIps { items: ips }))
     };
     apictx.external_latencies.instrument_dropshot_handler(&rqctx, handler).await
 }

nexus/src/external_api/views.rs

@@ -20,20 +20,6 @@ use std::net::IpAddr;
 use std::net::SocketAddrV6;
 use uuid::Uuid;
 
-/// Wrapper analogous to [`dropshot::ResultsPage`] for unpaginated list endpoints
-#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-#[schemars(rename = "{}Results")]
-pub struct Results<T> {
-    pub items: Vec<T>,
-}
-
-impl<T> From<Vec<T>> for Results<T> {
-    fn from(items: Vec<T>) -> Self {
-        Self { items }
-    }
-}
-
 // IDENTITY METADATA
 
 /// Identity-related metadata that's included in "asset" public API objects
@@ -407,6 +393,13 @@ pub struct ExternalIp {
     pub kind: IpKind,
 }
 
+/// Unpaginated list of [`ExternalIp`]
+#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub struct ExternalIps {
+    pub items: Vec<ExternalIp>,
+}
+
 // RACKS
 
 /// Client view of an [`Rack`]

nexus/tests/integration_tests/instances.rs

@@ -2500,7 +2500,7 @@ async fn test_instance_ephemeral_ip_from_correct_project(
         .execute()
         .await
         .expect("Failed to fetch external IPs")
-        .parsed_body::<views::Results<views::ExternalIp>>()
+        .parsed_body::<views::ExternalIps>()
         .expect("Failed to parse external IPs");
     assert_eq!(ips.items.len(), 1);
     assert_eq!(ips.items[0].kind, IpKind::Ephemeral);

openapi/nexus.json

@@ -2972,7 +2972,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/ExternalIpResults"
+                  "$ref": "#/components/schemas/ExternalIps"
                 }
               }
             }
@@ -7257,8 +7257,8 @@
           }
         ]
       },
-      "ExternalIpResults": {
-        "description": "Wrapper analogous to [`dropshot::ResultsPage`] for unpaginated list endpoints",
+      "ExternalIps": {
+        "description": "Unpaginated list of [`ExternalIp`]",
         "type": "object",
         "properties": {
           "items": {