diff --git a/agent/catalog_endpoint.go b/agent/catalog_endpoint.go index 760ad5f50..5853bd819 100644 --- a/agent/catalog_endpoint.go +++ b/agent/catalog_endpoint.go @@ -235,7 +235,7 @@ func (s *HTTPHandlers) CatalogNodes(resp http.ResponseWriter, req *http.Request) // Setup the request args := structs.DCSpecificRequest{} s.parseSource(req, &args.Source) - if err := parseEntMetaPartition(req, &args.EnterpriseMeta); err != nil { + if err := s.parseEntMetaPartition(req, &args.EnterpriseMeta); err != nil { return nil, err } args.NodeMetaFilters = s.parseMetaFilter(req) diff --git a/agent/coordinate_endpoint.go b/agent/coordinate_endpoint.go index 08f92f7d9..4a100e154 100644 --- a/agent/coordinate_endpoint.go +++ b/agent/coordinate_endpoint.go @@ -82,7 +82,7 @@ func (s *HTTPHandlers) CoordinateNodes(resp http.ResponseWriter, req *http.Reque if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done { return nil, nil } - if err := parseEntMetaPartition(req, &args.EnterpriseMeta); err != nil { + if err := s.parseEntMetaPartition(req, &args.EnterpriseMeta); err != nil { return nil, err } @@ -108,7 +108,7 @@ func (s *HTTPHandlers) CoordinateNode(resp http.ResponseWriter, req *http.Reques if done := s.parse(resp, req, &args.Datacenter, &args.QueryOptions); done { return nil, nil } - if err := parseEntMetaPartition(req, &args.EnterpriseMeta); err != nil { + if err := s.parseEntMetaPartition(req, &args.EnterpriseMeta); err != nil { return nil, err } diff --git a/agent/http_oss.go b/agent/http_oss.go index 4b7808ab2..3eedaae0f 100644 --- a/agent/http_oss.go +++ b/agent/http_oss.go @@ -18,7 +18,7 @@ func (s *HTTPHandlers) parseEntMeta(req *http.Request, entMeta *structs.Enterpri return BadRequestError{Reason: "Invalid query parameter: \"ns\" - Namespaces are a Consul Enterprise feature"} } - return parseEntMetaPartition(req, entMeta) + return s.parseEntMetaPartition(req, entMeta) } func (s *HTTPHandlers) validateEnterpriseIntentionNamespace(logName, ns string, _ bool) error { @@ -75,7 +75,7 @@ func (s *HTTPHandlers) uiTemplateDataTransform(data map[string]interface{}) erro return nil } -func parseEntMetaPartition(req *http.Request, meta *structs.EnterpriseMeta) error { +func (s *HTTPHandlers) parseEntMetaPartition(req *http.Request, meta *structs.EnterpriseMeta) error { if headerAP := req.Header.Get("X-Consul-Partition"); headerAP != "" { return BadRequestError{Reason: "Invalid header: \"X-Consul-Partition\" - Partitions are a Consul Enterprise feature"} } diff --git a/agent/ui_endpoint.go b/agent/ui_endpoint.go index 4bb9eab16..a2626135d 100644 --- a/agent/ui_endpoint.go +++ b/agent/ui_endpoint.go @@ -618,7 +618,7 @@ func (s *HTTPHandlers) UIMetricsProxy(resp http.ResponseWriter, req *http.Reques s.clearTokenFromHeaders(req) var entMeta structs.EnterpriseMeta - if err := parseEntMetaPartition(req, &entMeta); err != nil { + if err := s.parseEntMetaPartition(req, &entMeta); err != nil { return nil, err } authz, err := s.agent.delegate.ResolveTokenAndDefaultMeta(token, &entMeta, nil)