github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set connect or ingress boolean after checking for query param

pull/8064/head
Chris Piraino 2020-06-09 14:45:21 -05:00
parent 4837069fe0
commit ca41f80493
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/health_endpoint.go
View File

@ -164,7 +164,7 @@ func (s *HTTPServer) HealthServiceNodes(resp http.ResponseWriter, req *http.Requ
func (s *HTTPServer) healthServiceNodes(resp http.ResponseWriter, req *http.Request, connect bool) (interface{}, error) { func (s *HTTPServer) healthServiceNodes(resp http.ResponseWriter, req *http.Request, connect bool) (interface{}, error) {
// Set default DC // Set default DC
args := structs.ServiceSpecificRequest{Connect: connect} args := structs.ServiceSpecificRequest{}
if err := s.parseEntMetaNoWildcard(req, &args.EnterpriseMeta); err != nil { if err := s.parseEntMetaNoWildcard(req, &args.EnterpriseMeta); err != nil {
return nil, err return nil, err
} }
@ -185,19 +185,19 @@ func (s *HTTPServer) healthServiceNodes(resp http.ResponseWriter, req *http.Requ
prefix := "/v1/health/service/" prefix := "/v1/health/service/"
if connect { if connect {
prefix = "/v1/health/connect/" prefix = "/v1/health/connect/"
}
// Check for ingress request only when requesting connect services // Check for ingress request only when requesting connect services
if connect {
ingress, err := getBoolQueryParam(params, "ingress") ingress, err := getBoolQueryParam(params, "ingress")
if err != nil { if err != nil {
resp.WriteHeader(http.StatusBadRequest) resp.WriteHeader(http.StatusBadRequest)
fmt.Fprint(resp, "Invalid value for ?ingress") fmt.Fprint(resp, "Invalid value for ?ingress")
return nil, nil return nil, nil
} }
if ingress { if ingress {
args.Connect = false
args.Ingress = true args.Ingress = true
} else {
args.Connect = true
} }
} }