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

Remove unused method and fixup docs ref

pull/8099/head
freddygv 2020-06-12 13:15:31 -06:00
parent 0f97b7d63d
commit cd927eed5e
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
agent/structs/structs.go
View File

@ -987,24 +987,6 @@ func (ns *NodeService) BestAddress(wan bool) (string, int) {
return addr, port 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 { func (ns *NodeService) CompoundServiceID() ServiceID {
id := ns.ID id := ns.ID
if id == "" { if id == "" {

2
website/pages/api-docs/catalog.mdx
View File

@ -1023,7 +1023,7 @@ $ curl \
- `Service.Namespace` is the Consul Enterprise namespace of a service associated with the gateway - `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. [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 - `CAFile` is the path to a CA file the gateway will use for TLS origination to the associated service