Tag dependency

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt

@@ -330,11 +330,12 @@ class RouteSpecificationFactory(
         }
         val servicesNames = group.proxySettings.outgoing.getServiceDependencies().map { it.service }.toSet()
         val definedTagsRoutes = globalSnapshot
-            .getTagsForDependency(group.proxySettings.outgoing) { servicesName, tagDependency ->
+            .getTagsForDependency(group.proxySettings.outgoing)
+            .map {
             RouteSpecification(
-                clusterName = servicesName,
-                routeDomains = listOf(servicesName) + getServiceWithCustomDomain(servicesName),
-                settings = tagDependency.settings
+                clusterName = it.first,
+                routeDomains = listOf(it.first) + getServiceWithCustomDomain(it.first),
+                settings = it.second.settings
             )
         }.distinctBy { it.clusterName }
 

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/GlobalSnapshot.kt

@@ -6,22 +6,24 @@ import io.envoyproxy.envoy.config.endpoint.v3.ClusterLoadAssignment
 import pl.allegro.tech.servicemesh.envoycontrol.groups.Outgoing
 import pl.allegro.tech.servicemesh.envoycontrol.groups.TagDependency
 
+typealias ClusterName = String
+
 data class GlobalSnapshot(
-    val clusters: Map<String, Cluster>,
-    val allServicesNames: Set<String>,
-    val endpoints: Map<String, ClusterLoadAssignment>,
-    val clusterConfigurations: Map<String, ClusterConfiguration>,
-    val securedClusters: Map<String, Cluster>,
-    val tags: Map<String, Set<String>>
+    val clusters: Map<ClusterName, Cluster>,
+    val allServicesNames: Set<ClusterName>,
+    val endpoints: Map<ClusterName, ClusterLoadAssignment>,
+    val clusterConfigurations: Map<ClusterName, ClusterConfiguration>,
+    val securedClusters: Map<ClusterName, Cluster>,
+    val tags: Map<ClusterName, Set<String>>
 ) {
-    fun <T> getTagsForDependency(
-        outgoing: Outgoing,
-        mapper: (String, TagDependency) -> T): List<T> {
+    fun getTagsForDependency(
+        outgoing: Outgoing
+    ): List<Pair<ClusterName, TagDependency>> {
         val serviceDependencies = outgoing.getServiceDependencies().map { it.service }.toSet()
         return outgoing.getTagDependencies().flatMap { tagDependency ->
             tags.filterKeys { !serviceDependencies.contains(it) }
                 .filterValues { it.contains(tagDependency.tag) }
-                .map { mapper(it.key, tagDependency) }
+                .map { it.key to tagDependency }
         }
     }
 }
@@ -31,9 +33,9 @@ fun globalSnapshot(
     clusters: Iterable<Cluster> = emptyList(),
     endpoints: Iterable<ClusterLoadAssignment> = emptyList(),
     properties: OutgoingPermissionsProperties = OutgoingPermissionsProperties(),
-    clusterConfigurations: Map<String, ClusterConfiguration> = emptyMap(),
+    clusterConfigurations: Map<ClusterName, ClusterConfiguration> = emptyMap(),
     securedClusters: List<Cluster> = emptyList(),
-    tags: Map<String, Set<String>>
+    tags: Map<ClusterName, Set<String>>
 ): GlobalSnapshot {
     val clusters = SnapshotResources.create<Cluster>(clusters, "").resources()
     val securedClusters = SnapshotResources.create<Cluster>(securedClusters, "").resources()

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt

@@ -195,9 +195,10 @@ class EnvoyClustersFactory(
             .associateBy({ it.service }, { it.settings })
 
         val serviceFromTagSettings = globalSnapshot
-            .getTagsForDependency(group.proxySettings.outgoing) { serviceName, tagDependency ->
-            serviceName to tagDependency.settings
-        }.reversed().associateBy({ it.first }, { it.second })
+            .getTagsForDependency(group.proxySettings.outgoing)
+            .map { it.first to it.second.settings }
+            .distinctBy { it.first }
+            .associateBy({ it.first }, { it.second })
 
         val clustersForGroup = when (group) {
             is ServicesGroup -> serviceSettings.mapNotNull {

envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactoryTest.kt

@@ -16,8 +16,12 @@ class EnvoySnapshotFactoryTest {
     fun `should return all tags when prefix is empty`() {
         // given
         val tagPrefix = ""
-        val serviceTags = mapOf("abc" to setOf("uws", "poc"), "xyz" to setOf("uj"), "qwerty" to setOf())
-        val state: MultiClusterState = MultiClusterState(listOf(
+        val serviceTags = mapOf(
+            serviceWithTags("abc", "uws", "poc"),
+            serviceWithTags("xyz", "uj"),
+            serviceWithTags("qwerty")
+        )
+        val state = MultiClusterState(listOf(
             ClusterState(serviceState(serviceTags), Locality.LOCAL, "cluster")
         ))
 
@@ -31,8 +35,12 @@ class EnvoySnapshotFactoryTest {
     @Test
     fun `should return all tags with prefix`() {
         val tagPrefix = "tag:"
-        val serviceTags = mapOf("abc" to setOf("tag:uws", "poc"), "xyz" to setOf("uj"), "qwerty" to setOf())
-        val state: MultiClusterState = MultiClusterState(listOf(
+        val serviceTags = mapOf(
+            serviceWithTags("abc", "tag:uws", "poc"),
+            serviceWithTags("xyz", "uj"),
+            serviceWithTags("qwerty")
+        )
+        val state = MultiClusterState(listOf(
             ClusterState(serviceState(serviceTags), Locality.LOCAL, "cluster")
         ))
 
@@ -41,18 +49,24 @@ class EnvoySnapshotFactoryTest {
 
         // then
         assertThat(tags).isEqualTo(mapOf(
-            "abc" to setOf("tag:uws"),
-            "xyz" to emptySet(),
-            "qwerty" to emptySet()
+            serviceWithTags("abc", "tag:uws"),
+            serviceWithTags("xyz"),
+            serviceWithTags("qwerty")
         ))
     }
 
     @Test
     fun `should merge multiple Cluster State`() {
         // given
         val tagPrefix = ""
-        val serviceTagsCluster1 = mapOf("abc" to setOf("uws", "poc"), "xyz" to setOf("uj"), "qwerty" to setOf())
-        val serviceTagsCluster2 = mapOf("abc" to setOf("lkj"), "xyz" to setOf(), "qwerty" to setOf("ban"))
+        val serviceTagsCluster1 = mapOf(
+            serviceWithTags("abc", "uws", "poc"),
+            serviceWithTags("xyz", "uj"),
+            serviceWithTags("qwerty"))
+        val serviceTagsCluster2 = mapOf(
+            serviceWithTags("abc", "lkj"),
+            serviceWithTags("xyz"),
+            serviceWithTags("qwerty", "ban"))
         val state = MultiClusterState(listOf(
             ClusterState(serviceState(serviceTagsCluster1), Locality.LOCAL, "cluster"),
             ClusterState(serviceState(serviceTagsCluster2), Locality.LOCAL, "cluster2")
@@ -63,9 +77,9 @@ class EnvoySnapshotFactoryTest {
 
         // then
         assertThat(tags).isEqualTo(mapOf(
-            "abc" to setOf("uws", "poc", "lkj"),
-            "xyz" to setOf("uj"),
-            "qwerty" to setOf("ban")
+            serviceWithTags("abc", "uws", "poc", "lkj"),
+            serviceWithTags("xyz", "uj"),
+            serviceWithTags("qwerty", "ban")
         ))
     }
 
@@ -76,3 +90,7 @@ class EnvoySnapshotFactoryTest {
         return ServicesState(servicesInstances)
     }
 }
+
+private fun serviceWithTags(serviceName: String, vararg tags: String): Pair<String, Set<String>> {
+    return serviceName to tags.toSet()
+}

envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClusterFactoryTest.kt

@@ -76,7 +76,10 @@ class EnvoyClusterFactoryTest {
         val globalSnapshot = buildGlobalSnapshot(
             services = services,
             properties = properties,
-            tags = mapOf("service-A" to setOf("tag"), "service-C" to setOf("tag"))
+            tags = mapOf(
+                serviceWithTags("service-A", "tag"),
+                serviceWithTags("service-C", "tag")
+            )
         )
 
         // when
@@ -111,7 +114,11 @@ class EnvoyClusterFactoryTest {
         val globalSnapshot = buildGlobalSnapshot(
             services = services,
             properties = properties,
-            tags = mapOf("service-A" to setOf("tag-1"), "service-C" to setOf("tag-1", "tag-2"), "service-B" to setOf("tag-2"))
+            tags = mapOf(
+                serviceWithTags("service-A","tag-1"),
+                serviceWithTags("service-C","tag-1", "tag-2"),
+                serviceWithTags("service-B","tag-2")
+            )
         )
 
         // when
@@ -152,7 +159,10 @@ class EnvoyClusterFactoryTest {
         val globalSnapshot = buildGlobalSnapshot(
             services = services,
             properties = properties,
-            tags = mapOf("service-A" to setOf("tag"), "service-C" to setOf("tag"))
+            tags = mapOf(
+                serviceWithTags("service-A", "tag"),
+                serviceWithTags("service-C", "tag")
+            )
         )
 
         // when
@@ -239,7 +249,7 @@ class EnvoyClusterFactoryTest {
         val globalSnapshot = buildGlobalSnapshot(
             services = services,
             properties = properties,
-            tags = mapOf("service-A" to setOf("tag")))
+            tags = mapOf(serviceWithTags("service-A", "tag")))
 
         // when
         val clustersForGroup = factory.getClustersForGroup(group, globalSnapshot)
@@ -279,3 +289,7 @@ private fun ObjectAssert<Cluster>.hasIdleTimeout(idleTimeout: Long): ObjectAsser
         .isEqualTo(idleTimeout)
     return this
 }
+
+private fun serviceWithTags(serviceName: String, vararg tags: String): Pair<String, Set<String>> {
+    return serviceName to tags.toSet()
+}

envoy-control-core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/EnvoyListenersFactoryTest.kt

@@ -84,7 +84,7 @@ class EnvoyListenersFactoryTest {
             endpoints = emptyMap(),
             clusterConfigurations = emptyMap(),
             securedClusters = emptyMap(),
-            tags = mapOf("service-B" to setOf("tag"))
+            tags = mapOf(serviceWithTags("service-B", "tag"))
         )
 
         // when
@@ -96,3 +96,7 @@ class EnvoyListenersFactoryTest {
             .contains("0.0.0.0:80")
     }
 }
+
+private fun serviceWithTags(serviceName: String, vararg tags: String): Pair<String, Set<String>> {
+    return serviceName to tags.toSet()
+}