add groups endpoint

allegro · Aug 4, 2023 · b4d7cf4 · b4d7cf4
1 parent 08f5a33
commit b4d7cf4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 Lists all changes with user impact.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [0.19.36]
+
+### Changed
+- Added debug endpoint, which returns current groups
+
 ## [0.19.35]
 
 ### Changed

diff --git a/...kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/debug/SnapshotDebugController.kt b/...kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/debug/SnapshotDebugController.kt
@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.ResponseBody
 import org.springframework.web.bind.annotation.RestController
+import pl.allegro.tech.servicemesh.envoycontrol.groups.Group
 import io.envoyproxy.envoy.config.core.v3.Node as NodeV3
 import io.envoyproxy.envoy.extensions.filters.http.rbac.v3.RBAC as RBACFilter
 
@@ -57,6 +58,15 @@ class SnapshotDebugController(val debugService: SnapshotDebugService) {
         )
     }
 
+    @GetMapping("/groups")
+    fun globalSnapshot(@RequestParam(required = false) discoveryServiceName: String?)
+        : ResponseEntity<Collection<Group>> {
+        return ResponseEntity(
+            debugService.groups(discoveryServiceName),
+            HttpStatus.OK
+        )
+    }
+
     @GetMapping("/snapshot-global")
     fun globalSnapshot(@RequestParam(defaultValue = "false") xds: Boolean): ResponseEntity<SnapshotDebugInfo> {
         return ResponseEntity(

diff --git a/...in/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/debug/SnapshotDebugService.kt b/...in/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/debug/SnapshotDebugService.kt
@@ -10,7 +10,9 @@ import pl.allegro.tech.servicemesh.envoycontrol.ControlPlane
 import pl.allegro.tech.servicemesh.envoycontrol.groups.Group
 import pl.allegro.tech.servicemesh.envoycontrol.logger
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.GlobalSnapshot
+import pl.allegro.tech.servicemesh.envoycontrol.snapshot.IpFromServiceDiscovery
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.SnapshotUpdater
+import kotlin.concurrent.fixedRateTimer
 
 @Component
 class SnapshotDebugService(
@@ -30,6 +32,14 @@ class SnapshotDebugService(
         }
     }
 
+    fun groups(discoveryServiceName: String?): Collection<Group> {
+        return if (discoveryServiceName != null) {
+            cache.groups().filter { it.discoveryServiceName  == discoveryServiceName}
+        } else {
+            cache.groups()
+        }
+    }
+
     fun globalSnapshot(xds: Boolean): SnapshotDebugInfo {
         val globalSnapshot = snapshotUpdater.getGlobalSnapshot()
         if (xds) {