From 90eedebe0e3e6d61a300d7aa8bacaedf87033bc6 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Wed, 11 Sep 2024 21:27:54 -0500 Subject: [PATCH] [nexus] remove unnecessary `name_or_id` param from bgp config list endpoint (#6560) Missed this in #6498. Closes #6467 (again). --- nexus/external-api/src/lib.rs | 2 +- nexus/src/external_api/http_entrypoints.rs | 2 +- nexus/types/src/external_api/params.rs | 7 ------- openapi/nexus.json | 8 -------- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/nexus/external-api/src/lib.rs b/nexus/external-api/src/lib.rs index c877b92bb6..76c8f0b633 100644 --- a/nexus/external-api/src/lib.rs +++ b/nexus/external-api/src/lib.rs @@ -1484,7 +1484,7 @@ pub trait NexusExternalApi { }] async fn networking_bgp_config_list( rqctx: RequestContext, - query_params: Query>, + query_params: Query, ) -> Result>, HttpError>; //TODO pagination? the normal by-name/by-id stuff does not work here diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs index 41c3a10d09..8f19b2ebde 100644 --- a/nexus/src/external_api/http_entrypoints.rs +++ b/nexus/src/external_api/http_entrypoints.rs @@ -2991,7 +2991,7 @@ impl NexusExternalApi for NexusExternalApiImpl { async fn networking_bgp_config_list( rqctx: RequestContext, - query_params: Query>, + query_params: Query, ) -> Result>, 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 015c216f61..96fcec44fd 100644 --- a/nexus/types/src/external_api/params.rs +++ b/nexus/types/src/external_api/params.rs @@ -1653,13 +1653,6 @@ pub struct BgpConfigSelector { pub name_or_id: NameOrId, } -/// List BGP configs with an optional name or id. -#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq)] -pub struct BgpConfigListSelector { - /// A name or id to use when selecting BGP config. - pub name_or_id: Option, -} - #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)] pub struct BgpPeerConfig { pub peers: Vec, diff --git a/openapi/nexus.json b/openapi/nexus.json index 6b0ca3449e..3c82886911 100644 --- a/openapi/nexus.json +++ b/openapi/nexus.json @@ -6423,14 +6423,6 @@ "minimum": 1 } }, - { - "in": "query", - "name": "name_or_id", - "description": "A name or id to use when selecting BGP config.", - "schema": { - "$ref": "#/components/schemas/NameOrId" - } - }, { "in": "query", "name": "page_token",