diff --git a/agent/structs/structs.go b/agent/structs/structs.go index 6bdfe49cae..484f011cfa 100644 --- a/agent/structs/structs.go +++ b/agent/structs/structs.go @@ -987,24 +987,6 @@ func (ns *NodeService) BestAddress(wan bool) (string, int) { return addr, port } -func (ns *NodeService) compoundID(preferName bool) ServiceID { - var id string - if ns.ID == "" || (preferName && ns.Service != "") { - id = ns.Service - } else { - id = ns.ID - } - - // copy the ent meta and normalize it - entMeta := ns.EnterpriseMeta - entMeta.Normalize() - - return ServiceID{ - ID: id, - EnterpriseMeta: entMeta, - } -} - func (ns *NodeService) CompoundServiceID() ServiceID { id := ns.ID if id == "" { diff --git a/website/pages/api-docs/catalog.mdx b/website/pages/api-docs/catalog.mdx index f7a7bcb77a..1790eaa29c 100644 --- a/website/pages/api-docs/catalog.mdx +++ b/website/pages/api-docs/catalog.mdx @@ -1023,7 +1023,7 @@ $ curl \ - `Service.Namespace` is the Consul Enterprise namespace of a service associated with the gateway -- `ServiceKind` is the kind of service, will be one of "ingress-gateway" or "terminating-gateway". See the Agent +- `GatewayKind` is the kind of service, will be one of "ingress-gateway" or "terminating-gateway". See the Agent [service registration API](/api/agent/service#kind) for more information. - `CAFile` is the path to a CA file the gateway will use for TLS origination to the associated service