remove System.getProperty

allegro · Jul 1, 2022 · 6320a37 · 6320a37
1 parent d836f03
commit 6320a37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/ControlPlane.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/ControlPlane.kt
@@ -43,7 +43,6 @@ import reactor.core.Disposable
 import reactor.core.publisher.Flux
 import reactor.core.scheduler.Schedulers
 import java.time.Clock
-import java.util.UUID
 import java.util.concurrent.BlockingQueue
 import java.util.concurrent.Executor
 import java.util.concurrent.ExecutorService
@@ -226,8 +225,7 @@ class ControlPlane private constructor(
                 groupChangeWatcher,
                 executorGroup,
                 cachedProtoResourcesSerializer,
-                System.getProperty(properties.envoy.controlPlaneIdentifierEnv) ?: UUID.randomUUID().toString()
-
+                properties.envoy.controlPlaneIdentifier
             )
         }
 

diff --git a/...l-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlProperties.kt b/...l-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlProperties.kt
@@ -5,6 +5,7 @@ package pl.allegro.tech.servicemesh.envoycontrol
 import pl.allegro.tech.servicemesh.envoycontrol.server.ServerProperties
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.SnapshotProperties
 import pl.allegro.tech.servicemesh.envoycontrol.synchronization.SyncProperties
+import java.util.UUID
 
 class EnvoyControlProperties {
     var server = ServerProperties()
@@ -15,7 +16,7 @@ class EnvoyControlProperties {
 
 class EnvoyProperties {
     var snapshot = SnapshotProperties()
-    var controlPlaneIdentifierEnv = "HOST"
+    var controlPlaneIdentifier = UUID.randomUUID().toString()
 }
 
 class ServiceFilters {