From 87c64b39e52c716f205b43a52f5e9c0b6ba4cf3a Mon Sep 17 00:00:00 2001 From: Jorge Marey Date: Tue, 25 Feb 2025 23:12:03 +0100 Subject: [PATCH 1/2] Fix catalog service endpoint when querying for a peer service --- agent/catalog_endpoint.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/agent/catalog_endpoint.go b/agent/catalog_endpoint.go index 8af4654b90f2..4a30c6bacc28 100644 --- a/agent/catalog_endpoint.go +++ b/agent/catalog_endpoint.go @@ -354,6 +354,12 @@ func (s *HTTPHandlers) catalogServiceNodes(resp http.ResponseWriter, req *http.R return nil, nil } + s.parsePeerName(req, &args) + s.parseSamenessGroup(req, &args) + if args.SamenessGroup != "" && args.PeerName != "" { + return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: "peer-name and sameness-group are mutually exclusive"} + } + // Check for a tag params := req.URL.Query() if _, ok := params["tag"]; ok { From 553fc323dcc6ccc8d5bd08bd0fd3d87681feb081 Mon Sep 17 00:00:00 2001 From: Jorge Marey Date: Tue, 25 Feb 2025 23:36:43 +0100 Subject: [PATCH 2/2] Add changelog file --- .changelog/22189.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .changelog/22189.txt diff --git a/.changelog/22189.txt b/.changelog/22189.txt new file mode 100644 index 000000000000..bcd522777bde --- /dev/null +++ b/.changelog/22189.txt @@ -0,0 +1,4 @@ +```release-note:bug +api: Correctly use peer query param on catalog service API +``` +