Clean up naming for clarity

allegro · Aug 12, 2024 · 2539a94 · 2539a94
1 parent 486cdb6
commit 2539a94
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [0.20.20]
 ### Changed
-- Added service-id property to node metadata
+- Added service_id property to filter metadata
 
 ## [0.20.19]
 ### Changed

diff --git a/.../src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/MetadataNodeGroupTest.kt b/.../src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/MetadataNodeGroupTest.kt
@@ -163,14 +163,15 @@ class MetadataNodeGroupTest {
     @Test
     fun `should set serviceId to group if present`() {
         // given
+        val expectedServiceId = 777
         val nodeGroup = MetadataNodeGroup(createSnapshotProperties(outgoingPermissions = true))
-        val node = nodeV3(serviceId = 777)
+        val node = nodeV3(serviceId = expectedServiceId)
 
         // when
         val group = nodeGroup.hash(node)
 
         // then
-        assertThat(group.serviceId).isEqualTo(777)
+        assertThat(group.serviceId).isEqualTo(expectedServiceId)
     }
 
     @Test

diff --git a/...tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/LuaFilterFactoryTest.kt b/...tech/servicemesh/envoycontrol/snapshot/resource/listeners/filters/LuaFilterFactoryTest.kt
@@ -17,7 +17,7 @@ internal class LuaFilterFactoryTest {
     val properties = SnapshotProperties().also { it.incomingPermissions = IncomingPermissionsProperties() }
 
     @Test
-    fun `should create metadata with service name and discovery service name and service-id`() {
+    fun `should create metadata with service name and discovery service name`() {
         // given
         val expectedServiceName = "service-1"
         val expectedDiscoveryServiceName = "consul-service-1"
@@ -46,15 +46,14 @@ internal class LuaFilterFactoryTest {
     }
 
     @Test
-    fun `should create metadata with serviceId`() {
+    fun `should create filter metadata with serviceId`() {
         // given
         val expectedServiceId = 777
-
-        val group: Group = ServicesGroup(communicationMode = CommunicationMode.XDS, serviceId = expectedServiceId)
-        val factory = LuaFilterFactory(properties)
+        val group = ServicesGroup(communicationMode = CommunicationMode.XDS, serviceId = expectedServiceId)
+        val luaFilterFactory = LuaFilterFactory(properties)
 
         // when
-        val metadata = factory.ingressScriptsMetadata(group, currentZone = "dc1")
+        val metadata = luaFilterFactory.ingressScriptsMetadata(group, currentZone = "dc1")
 
         val actualServiceId = metadata
             .getFilterMetadataOrThrow("envoy.filters.http.lua")
@@ -66,13 +65,13 @@ internal class LuaFilterFactoryTest {
     }
 
     @Test
-    fun `should create metadata with empty serviceId`() {
+    fun `should create filter metadata with empty serviceId`() {
         // given
-        val group: Group = ServicesGroup(communicationMode = CommunicationMode.XDS)
-        val factory = LuaFilterFactory(properties)
+        val group = ServicesGroup(communicationMode = CommunicationMode.XDS)
+        val luaFilterFactory = LuaFilterFactory(properties)
 
         // when
-        val metadata = factory.ingressScriptsMetadata(group, currentZone = "dc1")
+        val metadata = luaFilterFactory.ingressScriptsMetadata(group, currentZone = "dc1")
 
         val actualServiceId = metadata
             .getFilterMetadataOrThrow("envoy.filters.http.lua")