cr

allegro · Dec 29, 2022 · 554147a · 554147a
1 parent 42be322
commit 554147a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/...src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt b/...src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt
@@ -333,9 +333,9 @@ class RouteSpecificationFactory(
             .getTagsForDependency(group.proxySettings.outgoing)
             .map {
             RouteSpecification(
-                clusterName = it.first,
-                routeDomains = listOf(it.first) + getServiceWithCustomDomain(it.first),
-                settings = it.second.settings
+                clusterName = it.clusterName,
+                routeDomains = listOf(it.clusterName) + getServiceWithCustomDomain(it.clusterName),
+                settings = it.settings
             )
         }.distinctBy { it.clusterName }
 

diff --git a/...-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/GlobalSnapshot.kt b/...-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/GlobalSnapshot.kt
@@ -3,8 +3,8 @@ package pl.allegro.tech.servicemesh.envoycontrol.snapshot
 import io.envoyproxy.controlplane.cache.SnapshotResources
 import io.envoyproxy.envoy.config.cluster.v3.Cluster
 import io.envoyproxy.envoy.config.endpoint.v3.ClusterLoadAssignment
+import pl.allegro.tech.servicemesh.envoycontrol.groups.DependencySettings
 import pl.allegro.tech.servicemesh.envoycontrol.groups.Outgoing
-import pl.allegro.tech.servicemesh.envoycontrol.groups.TagDependency
 
 typealias ClusterName = String
 
@@ -18,16 +18,21 @@ data class GlobalSnapshot(
 ) {
     fun getTagsForDependency(
         outgoing: Outgoing
-    ): List<Pair<ClusterName, TagDependency>> {
+    ): List<TagDependencySettings> {
         val serviceDependencies = outgoing.getServiceDependencies().map { it.service }.toSet()
         return outgoing.getTagDependencies().flatMap { tagDependency ->
             tags.filterKeys { !serviceDependencies.contains(it) }
                 .filterValues { it.contains(tagDependency.tag) }
-                .map { it.key to tagDependency }
+                .map { TagDependencySettings(it.key, tagDependency.settings) }
         }
     }
 }
 
+data class TagDependencySettings(
+    val clusterName: ClusterName,
+    val settings: DependencySettings
+)
+
 @Suppress("LongParameterList")
 fun globalSnapshot(
     clusters: Iterable<Cluster> = emptyList(),

diff --git a/.../allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt b/.../allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt
@@ -191,14 +191,14 @@ class EnvoyClustersFactory(
             globalSnapshot.clusters
         }
 
-        val serviceSettings = group.proxySettings.outgoing.getServiceDependencies()
-            .associateBy({ it.service }, { it.settings })
+        val serviceSettings =
+            group.proxySettings.outgoing.getServiceDependencies()
+                .associate { it.service to it.settings }
 
         val serviceFromTagSettings = globalSnapshot
             .getTagsForDependency(group.proxySettings.outgoing)
-            .map { it.first to it.second.settings }
-            .distinctBy { it.first }
-            .associateBy({ it.first }, { it.second })
+            .distinctBy { it.clusterName }
+            .associate { it.clusterName to it.settings }
 
         val clustersForGroup = when (group) {
             is ServicesGroup -> serviceSettings.mapNotNull {