resolve conflicts

Author: Ferdudas97

CHANGELOG.md

@@ -9,6 +9,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [0.19.19]
 
+### Changed
+- Added support for Delta XDS
+
+## [0.19.19]
+
 ### Changed
 - Add default access log filter configuration
 
@@ -31,8 +36,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Added flags for lua filters
-- Added support for Delta XDS
-
+- 
 ## [0.19.14]
 
 ### Changed

build.gradle

@@ -47,7 +47,7 @@ allprojects {
 
     project.ext.versions = [
             kotlin            : '1.6.10',
-            java_controlplane : '0.1.33-delta-xds-non-breaking-slonka-hash-bytes-SNAPSHOT',
+            java_controlplane : '0.1.35',
             spring_boot       : '2.3.4.RELEASE',
             grpc              : '1.21.0',
             jaxb              : '2.3.1',

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

@@ -29,7 +29,6 @@ import pl.allegro.tech.servicemesh.envoycontrol.snapshot.EnvoySnapshotFactory
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.GlobalSnapshot
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.SnapshotProperties
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.SnapshotsVersions
-import pl.allegro.tech.servicemesh.envoycontrol.snapshot.globalSnapshot
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.outgoingTimeoutPolicy
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.clusters.EnvoyClustersFactory
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.endpoints.EnvoyEndpointsFactory
@@ -274,14 +273,10 @@ class EnvoySnapshotFactoryTest {
     }
 
     private fun GlobalSnapshot.withEndpoint(clusterName: String): GlobalSnapshot = copy(
-        endpoints = SnapshotResources.create(
-            listOf(
-                ClusterLoadAssignment.newBuilder()
+        endpoints = SnapshotResources.create<ClusterLoadAssignment>(listOf(ClusterLoadAssignment.newBuilder()
                     .setClusterName(clusterName)
                     .build()
-            ), "v1"
-        )
-    )
+        ), "v1").resources())
 
     private fun createServicesGroup(
         mode: CommunicationMode = CommunicationMode.XDS,
@@ -375,11 +370,11 @@ class EnvoySnapshotFactoryTest {
 
     private fun createGlobalSnapshot(vararg clusters: Cluster): GlobalSnapshot {
         return GlobalSnapshot(
-            SnapshotResources.create(clusters.toList(), "pl/allegro/tech/servicemesh/envoycontrol/v3"),
+            SnapshotResources.create<Cluster>(clusters.toList(), "pl/allegro/tech/servicemesh/envoycontrol/v3").resources(),
             clusters.map { it.name }.toSet(),
-            SnapshotResources.create(emptyList(), "v1"),
+            SnapshotResources.create<ClusterLoadAssignment>(emptyList<ClusterLoadAssignment>(), "v1").resources(),
             emptyMap(),
-            SnapshotResources.create(clusters.toList(), "v3")
+            SnapshotResources.create<Cluster>(clusters.toList(), "v3").resources()
         )
     }
 

envoy-control-runner/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/debug/SnapshotDebugService.kt

@@ -75,8 +75,7 @@ class SnapshotDebugService(
             logger.warn("Global snapshot is missing")
             throw GlobalSnapshotNotFoundException("Global snapshot is missing")
         }
-        val endpoints = globalSnapshot.endpoints
-            .resources()[service]
+        val endpoints = globalSnapshot.endpoints[service]
         if (endpoints == null) {
             logger.warn("Can not find $service in global snapshot")
             throw GlobalSnapshotNotFoundException("Service $service not found in global snapshot")