using queryoptionfilter to populate args.filter

hashicorp · Jul 29, 2023 · db1039a · db1039a
1 parent c7c5876
commit db1039a
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/agent/catalog_endpoint.go b/agent/catalog_endpoint.go
@@ -277,14 +277,11 @@ func (s *HTTPHandlers) CatalogServices(resp http.ResponseWriter, req *http.Reque
 		return nil, err
 	}
 
-	var filterExpression string
-	s.parseFilter(req, &filterExpression)
-
 	args.NodeMetaFilters = s.parseMetaFilter(req)
-	args.Filter = filterExpression
 	if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done {
 		return nil, nil
 	}
+	args.Filter = args.QueryOptions.Filter
 	var out structs.IndexedServices
 	defer setMeta(resp, &out.QueryMeta)