fix linters

allegro · Sep 24, 2024 · 5ce64a3 · 5ce64a3
1 parent b0c1051
commit 5ce64a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/...n/kotlin/pl/allegro/tech/servicemesh/envoycontrol/infrastructure/SynchronizationConfig.kt b/...n/kotlin/pl/allegro/tech/servicemesh/envoycontrol/infrastructure/SynchronizationConfig.kt
@@ -61,22 +61,18 @@ class SynchronizationConfig {
 
     @Bean
     fun remoteClusters(
-        consulDatacenterReader: ConsulDatacenterReader,
-        properties: EnvoyControlProperties
-    ): RemoteClusters =
-        RemoteClusters(
-            consulDatacenterReader.knownDatacenters()
-                - consulDatacenterReader.localDatacenter()
-                - properties.sync.blackListedRemoteClusters
-        )
+        consulDatacenterReader: ConsulDatacenterReader, properties: EnvoyControlProperties
+    ): RemoteClusters = RemoteClusters(
+        consulDatacenterReader.knownDatacenters() -
+            consulDatacenterReader.localDatacenter() -
+            properties.sync.blackListedRemoteClusters
+    )
 
     @Bean
     fun instanceFetcher(
-        consulProperties: ConsulProperties,
-        envoyControlProperties: EnvoyControlProperties
+        consulProperties: ConsulProperties, envoyControlProperties: EnvoyControlProperties
     ) = SimpleConsulInstanceFetcher(
-        ConsulClient(consulProperties.host, consulProperties.port),
-        envoyControlProperties.sync.envoyControlAppName
+        ConsulClient(consulProperties.host, consulProperties.port), envoyControlProperties.sync.envoyControlAppName
     )
 }
 

diff --git a/...c/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlSynchronizationTest.kt b/...c/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlSynchronizationTest.kt
@@ -86,7 +86,6 @@ internal class EnvoyControlSynchronizationTest {
         waitServiceOkAndFrom("echo", serviceLocal)
     }
 
-
     @Test
     fun `should not synchronize blacklisted remote clusters`() {
 
@@ -99,8 +98,6 @@ internal class EnvoyControlSynchronizationTest {
 
         // when: instances from dc3 are absent
         envoy.waitForClusterEndpointNotHealthy("echo", serviceRemote3.container().ipAddress())
-
-
     }
     @Test
     fun `latency between service registration in local dc and being able to access it via envoy should be less than 0,5s + stateSampleDuration`() {
@@ -151,12 +148,6 @@ internal class EnvoyControlSynchronizationTest {
         }
     }
 
-    private fun waitServiceUnhealthy(name: String, echoServiceExtension: EchoServiceExtension) {
-        untilAsserted {
-            envoy.waitForClusterEndpointNotHealthy(name, echoServiceExtension.container().ipAddress())
-        }
-    }
-
     fun registerServiceInLocalDc(name: String, target: EchoServiceExtension): String {
         return consulClusters.serverFirst.operations.registerService(target, name = name)
     }