Include namespace and partition in error messages when validating ingress header manip

pull/10613/head
Paul Banks 3 years ago
parent 1079089f20
commit b38e84df63

@ -173,12 +173,12 @@ func (e *IngressGatewayConfigEntry) Validate() error {
if err := validateInnerEnterpriseMeta(&s.EnterpriseMeta, &e.EnterpriseMeta); err != nil { if err := validateInnerEnterpriseMeta(&s.EnterpriseMeta, &e.EnterpriseMeta); err != nil {
return fmt.Errorf("Services[%d].%v", i, err) return fmt.Errorf("Services[%d].%v", i, err)
} }
sn := NewServiceName(s.Name, &s.EnterpriseMeta)
if err := s.RequestHeaders.Validate(listener.Protocol); err != nil { if err := s.RequestHeaders.Validate(listener.Protocol); err != nil {
return fmt.Errorf("request headers %s (service %q on listener on port %d)", err, s.Name, listener.Port) return fmt.Errorf("request headers %s (service %q on listener on port %d)", err, sn.String(), listener.Port)
} }
if err := s.ResponseHeaders.Validate(listener.Protocol); err != nil { if err := s.ResponseHeaders.Validate(listener.Protocol); err != nil {
return fmt.Errorf("response headers %s (service %q on listener on port %d)", err, s.Name, listener.Port) return fmt.Errorf("response headers %s (service %q on listener on port %d)", err, sn.String(), listener.Port)
} }
if listener.Protocol == "tcp" { if listener.Protocol == "tcp" {

Loading…
Cancel
Save