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

agent: remove ConnectProxyServiceName

pull/4275/head
Mitchell Hashimoto 2018-03-11 09:31:31 -07:00
parent 2feef5f7a3
commit 3b07686648
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/agent_endpoint_test.go
View File

@ -78,8 +78,8 @@ func TestAgent_Services_ConnectProxy(t *testing.T) {
srv1 := &structs.NodeService{ srv1 := &structs.NodeService{
Kind: structs.ServiceKindConnectProxy, Kind: structs.ServiceKindConnectProxy,
ID: structs.ConnectProxyServiceName, ID: "db-proxy",
Service: structs.ConnectProxyServiceName, Service: "db-proxy",
Port: 5000, Port: 5000,
ProxyDestination: "db", ProxyDestination: "db",
} }
@ -90,7 +90,7 @@ func TestAgent_Services_ConnectProxy(t *testing.T) {
assert.Nil(err) assert.Nil(err)
val := obj.(map[string]*structs.NodeService) val := obj.(map[string]*structs.NodeService)
assert.Len(val, 1) assert.Len(val, 1)
actual := val[structs.ConnectProxyServiceName] actual := val["db-proxy"]
assert.Equal(structs.ServiceKindConnectProxy, actual.Kind) assert.Equal(structs.ServiceKindConnectProxy, actual.Kind)
assert.Equal("db", actual.ProxyDestination) assert.Equal("db", actual.ProxyDestination)
} }

3
agent/structs/catalog.go
View File

@ -18,7 +18,4 @@ const (
// Consul server node in the catalog. // Consul server node in the catalog.
ConsulServiceID = "consul" ConsulServiceID = "consul"
ConsulServiceName = "consul" ConsulServiceName = "consul"
// ConnectProxyServiceName is the name of the proxy services.
ConnectProxyServiceName = "connect-proxy"
) )

2
agent/structs/testing_catalog.go
View File

@ -34,7 +34,7 @@ func TestRegisterRequestProxy(t testing.T) *RegisterRequest {
func TestNodeServiceProxy(t testing.T) *NodeService { func TestNodeServiceProxy(t testing.T) *NodeService {
return &NodeService{ return &NodeService{
Kind: ServiceKindConnectProxy, Kind: ServiceKindConnectProxy,
Service: ConnectProxyServiceName, Service: "connect-proxy",
Address: "127.0.0.2", Address: "127.0.0.2",
Port: 2222, Port: 2222,
ProxyDestination: "web", ProxyDestination: "web",