envoy/eds: fix cluster name to mesh service parsing

Change db538a1 introduced a regression where the cluster name is not correctly parsed to retrieve the mesh service. This causes EDS to error and endpoints to not be programmed. Signed-off-by: Shashank Ram <[email protected]>
openservicemesh · Jun 24, 2021 · 38ad742 · 38ad742
1 parent 660aef4
commit 38ad742
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/envoy/eds/response.go b/pkg/envoy/eds/response.go
@@ -89,8 +89,8 @@ func generateEDSConfig(meshCatalog catalog.MeshCataloger, proxy *envoy.Proxy) ([
 
 func clusterToMeshSvc(cluster string) (service.MeshService, error) {
 	chunks := strings.Split(cluster, namespacedNameDelimiter)
-	if len(chunks) != 2 {
-		return service.MeshService{}, errors.Errorf("Invalid cluster name. Expected: <namespace>/<name>, Got: %s", cluster)
+	if len(chunks) != 3 {
+		return service.MeshService{}, errors.Errorf("Invalid cluster name. Expected: <namespace>/<name>/<cluster>, Got: %s", cluster)
 	}
 	return service.MeshService{
 		Namespace:     chunks[0],

diff --git a/pkg/envoy/eds/response_test.go b/pkg/envoy/eds/response_test.go
@@ -67,7 +67,7 @@ func TestEndpointConfiguration(t *testing.T) {
 	assert.NotNil(proxy)
 
 	request := &xds_discovery.DiscoveryRequest{
-		ResourceNames: []string{"default/bookstore-v1"},
+		ResourceNames: []string{"default/bookstore-v1/local"},
 	}
 	resources, err := NewResponse(meshCatalog, proxy, request, mockConfigurator, nil, nil)
 	assert.Nil(err)
@@ -97,7 +97,7 @@ func TestClusterToMeshSvc(t *testing.T) {
 	}{
 		{
 			name:    "valid cluster name",
-			cluster: "foo/bar",
+			cluster: "foo/bar/local",
 			expectedMeshSvc: service.MeshService{
 				Namespace:     "foo",
 				Name:          "bar",
@@ -113,7 +113,7 @@ func TestClusterToMeshSvc(t *testing.T) {
 		},
 		{
 			name:            "invalid cluster name",
-			cluster:         "foo/bar/baz",
+			cluster:         "foo/barbaz",
 			expectedMeshSvc: service.MeshService{},
 			expectError:     true,
 		},