From 5fab4beed48aeec6e25998c3a93d5bc546b06399 Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Fri, 30 Aug 2024 21:17:51 -0500
Subject: [PATCH] remove unused name_or_id query param on bgp announce set list

---
 nexus/external-api/src/lib.rs              | 4 +---
 nexus/src/external_api/http_entrypoints.rs | 4 +---
 nexus/types/src/external_api/params.rs     | 7 -------
 openapi/nexus.json                         | 8 --------
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/nexus/external-api/src/lib.rs b/nexus/external-api/src/lib.rs
index 2c8ec38c7eb..0a45c48a432 100644
--- a/nexus/external-api/src/lib.rs
+++ b/nexus/external-api/src/lib.rs
@@ -1565,9 +1565,7 @@ pub trait NexusExternalApi {
     }]
     async fn networking_bgp_announce_set_list(
         rqctx: RequestContext<Self::Context>,
-        query_params: Query<
-            PaginatedByNameOrId<params::OptionalBgpAnnounceSetSelector>,
-        >,
+        query_params: Query<PaginatedByNameOrId>,
     ) -> Result<HttpResponseOk<Vec<BgpAnnounceSet>>, HttpError>;
 
     /// Delete BGP announce set
diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs
index a297eaa533c..41c3a10d098 100644
--- a/nexus/src/external_api/http_entrypoints.rs
+++ b/nexus/src/external_api/http_entrypoints.rs
@@ -3139,9 +3139,7 @@ impl NexusExternalApi for NexusExternalApiImpl {
 
     async fn networking_bgp_announce_set_list(
         rqctx: RequestContext<ApiContext>,
-        query_params: Query<
-            PaginatedByNameOrId<params::OptionalBgpAnnounceSetSelector>,
-        >,
+        query_params: Query<PaginatedByNameOrId>,
     ) -> Result<HttpResponseOk<Vec<BgpAnnounceSet>>, HttpError> {
         let apictx = rqctx.context();
         let handler = async {
diff --git a/nexus/types/src/external_api/params.rs b/nexus/types/src/external_api/params.rs
index 691f36534d4..bf01b962dce 100644
--- a/nexus/types/src/external_api/params.rs
+++ b/nexus/types/src/external_api/params.rs
@@ -1675,13 +1675,6 @@ pub struct BgpAnnounceSetCreate {
     pub announcement: Vec<BgpAnnouncementCreate>,
 }
 
-/// Optionally select a BGP announce set by a name or id.
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
-pub struct OptionalBgpAnnounceSetSelector {
-    /// A name or id to use when s electing BGP port settings
-    pub name_or_id: Option<NameOrId>,
-}
-
 /// Select a BGP announce set by a name or id.
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub struct BgpAnnounceSetSelector {
diff --git a/openapi/nexus.json b/openapi/nexus.json
index ac437b7c970..291a064cc84 100644
--- a/openapi/nexus.json
+++ b/openapi/nexus.json
@@ -6554,14 +6554,6 @@
               "minimum": 1
             }
           },
-          {
-            "in": "query",
-            "name": "name_or_id",
-            "description": "A name or id to use when s electing BGP port settings",
-            "schema": {
-              "$ref": "#/components/schemas/NameOrId"
-            }
-          },
           {
             "in": "query",
             "name": "page_token",