Updating ClustersHandler::makeRequest to return text response when qu…

…ery param parsing fails Signed-off-by: Demitri Swan <demitriswan@google.com>
envoyproxy · May 24, 2024 · 06785a6 · 06785a6
1 parent 2bba5b4
commit 06785a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/source/server/admin/clusters_handler.cc b/source/server/admin/clusters_handler.cc
@@ -83,7 +83,10 @@ Http::Code ClustersHandler::handlerClusters(Http::ResponseHeaderMap& response_he
 Admin::RequestPtr ClustersHandler::makeRequest(AdminStream& admin_stream) {
   Buffer::OwnedImpl response;
   ClustersParams params;
-  params.parse(admin_stream.getRequestHeaders().getPathValue(), response);
+  Http::Code code = params.parse(admin_stream.getRequestHeaders().getPathValue(), response);
+  if (code != Http::Code::OK) {
+    return Admin::makeStaticTextRequest(response, code);
+  }
   return std::make_unique<ClustersRequest>(ClustersRequest::DefaultChunkLimit, server_, params);
 }
 

diff --git a/test/server/admin/clusters_params_test.cc b/test/server/admin/clusters_params_test.cc
@@ -15,11 +15,6 @@ struct ParamsCase {
 
 class ParamsFixture : public testing::TestWithParam<ParamsCase> {};
 
-TEST(ClustersParamsTest, ClustersParamsHasExpectedDefaultValue) {
-  ClustersParams params;
-  EXPECT_EQ(params.format_, ClustersParams::Format::Text);
-}
-
 TEST(ClustersParamsTest, FormatDefaultsToTextWhenNotSupplied) {
   ClustersParams params;
   Buffer::OwnedImpl buffer;