From 1abb570d5fbabbf3df873dccf5eb16e2d5519f11 Mon Sep 17 00:00:00 2001
From: Nastassia Dailidava
 <133115055+nastassia-dailidava@users.noreply.github.com>
Date: Tue, 10 Oct 2023 11:55:20 +0200
Subject: [PATCH] #292 Traffic splitting - Updated param name (#399)

* #292 Traffic splitting - Updated param name
---
 CHANGELOG.md                                                | 6 ++++++
 .../servicemesh/envoycontrol/snapshot/SnapshotProperties.kt | 4 ++--
 .../snapshot/resource/clusters/EnvoyClustersFactory.kt      | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70baf6fd0..060f0a016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
 Lists all changes with user impact.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [0.20.2]
+
+### Changed
+- Updated property names:  secondaryClusterPostfix is changed to secondaryClusterSuffix, 
+- aggregateClusterPostfix is changed to aggregateClusterSuffix
+
 ## [0.20.1]
 
 ### Changed
diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotProperties.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotProperties.kt
index f30895f24..9590a1801 100644
--- a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotProperties.kt
+++ b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/SnapshotProperties.kt
@@ -158,8 +158,8 @@ class CanaryProperties {
 class TrafficSplittingProperties {
     var zoneName = ""
     var serviceByWeightsProperties: Map<String, ZoneWeights> = mapOf()
-    var secondaryClusterPostfix = "secondary"
-    var aggregateClusterPostfix = "aggregate"
+    var secondaryClusterSuffix = "secondary"
+    var aggregateClusterSuffix = "aggregate"
 }
 
 class ZoneWeights {
diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt
index 6b0d210e3..60e46e1d5 100644
--- a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt
+++ b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt
@@ -82,12 +82,12 @@ class EnvoyClustersFactory(
 
         @JvmStatic
         fun getSecondaryClusterName(serviceName: String, snapshotProperties: SnapshotProperties): String {
-            return "$serviceName-${snapshotProperties.loadBalancing.trafficSplitting.secondaryClusterPostfix}"
+            return "$serviceName-${snapshotProperties.loadBalancing.trafficSplitting.secondaryClusterSuffix}"
         }
 
         @JvmStatic
         fun getAggregateClusterName(serviceName: String, snapshotProperties: SnapshotProperties): String {
-            return "$serviceName-${snapshotProperties.loadBalancing.trafficSplitting.aggregateClusterPostfix}"
+            return "$serviceName-${snapshotProperties.loadBalancing.trafficSplitting.aggregateClusterSuffix}"
         }
     }