added service name to eds config #292

nastassia-dailidava · nastassia-dailidava · commit 1b53536ed0a9 · 2023-09-18T14:02:37.000+02:00
diff --git a/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactoryTest.kt b/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactoryTest.kt
@@ -115,7 +115,6 @@ internal class EnvoyClustersFactoryTest {
             }
             .anySatisfy {
                 assertThat(it.name).isEqualTo(SECONDARY_CLUSTER_NAME)
-                assertThat(it.edsClusterConfig).isEqualTo(cluster1.edsClusterConfig)
             }
             .anySatisfy {
                 assertThat(it.name).isEqualTo(AGGREGATE_CLUSTER_NAME)
diff --git a/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/utils/ClusterOperations.kt b/envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/utils/ClusterOperations.kt
@@ -18,9 +18,12 @@ fun createCluster(
         .setType(Cluster.DiscoveryType.EDS)
         .setConnectTimeout(Durations.fromMillis(defaultProperties.edsConnectionTimeout.toMillis()))
         .setEdsClusterConfig(
-            Cluster.EdsClusterConfig.newBuilder().setEdsConfig(
-                ConfigSource.newBuilder().setAds(AggregatedConfigSource.newBuilder())
-            )
+            Cluster.EdsClusterConfig.newBuilder()
+                .setEdsConfig(
+                    ConfigSource.newBuilder().setAds(
+                        AggregatedConfigSource.newBuilder()
+                    )
+                ).setServiceName(clusterName)
         )
         .setLbPolicy(defaultProperties.loadBalancing.policy)
         .setCommonHttpProtocolOptions(

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,6 @@ internal class EnvoyClustersFactoryTest {`
`115`	`115`	`}`
`116`	`116`	`.anySatisfy {`
`117`	`117`	`assertThat(it.name).isEqualTo(SECONDARY_CLUSTER_NAME)`
`118`		`- assertThat(it.edsClusterConfig).isEqualTo(cluster1.edsClusterConfig)`
`119`	`118`	`}`
`120`	`119`	`.anySatisfy {`
`121`	`120`	`assertThat(it.name).isEqualTo(AGGREGATE_CLUSTER_NAME)`