minor fixes

provectus · Jul 24, 2023 · 4f27a39 · 4f27a39
1 parent 79ba831
commit 4f27a39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/GraphsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/GraphsController.java
@@ -64,12 +64,14 @@ public Mono<ResponseEntity<PrometheusApiQueryResponseDTO>> getGraphData(String c
   @Override
   public Mono<ResponseEntity<GraphDescriptionsDTO>> getGraphsList(String clusterName,
                                                                   ServerWebExchange exchange) {
+    var context = AccessContext.builder()
+        .cluster(clusterName)
+        .operationName("getGraphsList")
+        .build();
+
     var graphs = graphsService.getGraphs(getCluster(clusterName));
-    return Mono.just(
-        ResponseEntity.ok(
-            new GraphDescriptionsDTO().graphs(graphs.map(this::map).toList())
-        )
-    );
+    return accessControlService.validateAccess(context).then(
+        Mono.just(ResponseEntity.ok(new GraphDescriptionsDTO().graphs(graphs.map(this::map).toList()))));
   }
 
   private GraphDescriptionDTO map(GraphDescription graph) {

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/sink/MetricsSink.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/sink/MetricsSink.java
@@ -42,7 +42,7 @@ static MetricsSink create(ClustersProperties.Cluster cluster) {
     return compoundSink(sinks);
   }
 
-  static MetricsSink compoundSink(List<MetricsSink> sinks) {
+  private static MetricsSink compoundSink(List<MetricsSink> sinks) {
     return metricsStream -> {
       var materialized = metricsStream.toList();
       return Flux.fromIterable(sinks)