diff --git a/agent/agent_endpoint_test.go b/agent/agent_endpoint_test.go index 05e8b6ca3..167a23377 100644 --- a/agent/agent_endpoint_test.go +++ b/agent/agent_endpoint_test.go @@ -78,8 +78,8 @@ func TestAgent_Services_ConnectProxy(t *testing.T) { srv1 := &structs.NodeService{ Kind: structs.ServiceKindConnectProxy, - ID: structs.ConnectProxyServiceName, - Service: structs.ConnectProxyServiceName, + ID: "db-proxy", + Service: "db-proxy", Port: 5000, ProxyDestination: "db", } @@ -90,7 +90,7 @@ func TestAgent_Services_ConnectProxy(t *testing.T) { assert.Nil(err) val := obj.(map[string]*structs.NodeService) assert.Len(val, 1) - actual := val[structs.ConnectProxyServiceName] + actual := val["db-proxy"] assert.Equal(structs.ServiceKindConnectProxy, actual.Kind) assert.Equal("db", actual.ProxyDestination) } diff --git a/agent/structs/catalog.go b/agent/structs/catalog.go index 3f68f43a1..b118b9935 100644 --- a/agent/structs/catalog.go +++ b/agent/structs/catalog.go @@ -18,7 +18,4 @@ const ( // Consul server node in the catalog. ConsulServiceID = "consul" ConsulServiceName = "consul" - - // ConnectProxyServiceName is the name of the proxy services. - ConnectProxyServiceName = "connect-proxy" ) diff --git a/agent/structs/testing_catalog.go b/agent/structs/testing_catalog.go index d61266ad5..1394b7081 100644 --- a/agent/structs/testing_catalog.go +++ b/agent/structs/testing_catalog.go @@ -34,7 +34,7 @@ func TestRegisterRequestProxy(t testing.T) *RegisterRequest { func TestNodeServiceProxy(t testing.T) *NodeService { return &NodeService{ Kind: ServiceKindConnectProxy, - Service: ConnectProxyServiceName, + Service: "connect-proxy", Address: "127.0.0.2", Port: 2222, ProxyDestination: "web",