sidecar-proxy refactor

agent/sidecar_service.go

@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 )
 
-const sidecarIDSuffix = "-sidecar-proxy"
+const sidecarIDSuffix = structs.SidecarProxySuffix
 
 func sidecarIDFromServiceID(serviceID string) string {
 	return serviceID + sidecarIDSuffix
@@ -93,7 +93,7 @@ func sidecarServiceFromNodeService(ns *structs.NodeService, token string) (*stru
 		sidecar.Kind = structs.ServiceKindConnectProxy
 	}
 	if sidecar.Service == "" {
-		sidecar.Service = ns.Service + "-sidecar-proxy"
+		sidecar.Service = ns.Service + structs.SidecarProxySuffix
 	}
 	if sidecar.Address == "" {
 		// Inherit address from the service if it's provided

agent/structs/config_entry_exports.go

@@ -57,6 +57,7 @@ func (e *ExportedServicesConfigEntry) ToMap() map[string]map[string][]string {
 				consumers = append(consumers, c.Partition)
 			}
 			resp[svc.Namespace][svc.Name] = consumers
+			resp[svc.Namespace][svc.Name+SidecarProxySuffix] = consumers
 		}
 	}
 	return resp

agent/structs/structs.go

@@ -1257,6 +1257,8 @@ func (a ServiceAddress) ToAPIServiceAddress() api.ServiceAddress {
 	return api.ServiceAddress{Address: a.Address, Port: a.Port}
 }
 
+const SidecarProxySuffix = "-sidecar-proxy"
+
 // NodeService is a service provided by a node
 type NodeService struct {
 	// Kind is the kind of service this is. Different kinds of services may