filter feature on connector

michelin · Jul 31, 2024 · 8e6f00c · 8e6f00c
1 parent 5670cf3
commit 8e6f00c
Show file tree

Hide file tree

Showing 6 changed files with 386 additions and 320 deletions.
diff --git a/src/main/java/com/michelin/ns4kafka/controller/ConnectorController.java b/src/main/java/com/michelin/ns4kafka/controller/ConnectorController.java
@@ -47,14 +47,15 @@ public class ConnectorController extends NamespacedResourceController {
     ResourceQuotaService resourceQuotaService;
 
     /**
-     * List connectors by namespace.
+     * List connectors by namespace, filtered by name parameter.
      *
      * @param namespace The namespace
+     * @param name The name parameter
      * @return A list of connectors
      */
     @Get
-    public List<Connector> list(String namespace) {
-        return connectorService.findAllForNamespace(getNamespace(namespace));
+    public List<Connector> list(String namespace, @QueryValue(defaultValue = "*") String name) {
+        return connectorService.findAllForNamespace(getNamespace(namespace), name);
     }
 
     /**

diff --git a/src/main/java/com/michelin/ns4kafka/service/AclService.java b/src/main/java/com/michelin/ns4kafka/service/AclService.java
@@ -374,4 +374,4 @@ public boolean isAnyAclOfResource(List<AccessControlEntry> acls, String resource
                 case LITERAL -> resourceName.equals(acl.getSpec().getResource());
             });
     }
-}
+}
diff --git a/src/main/java/com/michelin/ns4kafka/service/ConnectorService.java b/src/main/java/com/michelin/ns4kafka/service/ConnectorService.java
@@ -13,6 +13,7 @@
 import com.michelin.ns4kafka.service.client.connect.entities.ConnectorSpecs;
 import com.michelin.ns4kafka.service.executor.ConnectorAsyncExecutor;
 import com.michelin.ns4kafka.util.FormatErrorUtils;
+import com.michelin.ns4kafka.util.RegexUtils;
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.http.HttpResponse;
@@ -57,23 +58,29 @@ public class ConnectorService {
      * @return A list of connectors
      */
     public List<Connector> findAllForNamespace(Namespace namespace) {
-        List<AccessControlEntry> acls = aclService.findAllGrantedToNamespace(namespace);
+        List<AccessControlEntry> acls = aclService
+            .findResourceOwnerGrantedToNamespace(namespace, AccessControlEntry.ResourceType.CONNECT);
         return connectorRepository.findAllForCluster(namespace.getMetadata().getCluster())
             .stream()
-            .filter(connector -> acls.stream().anyMatch(accessControlEntry -> {
-                if (accessControlEntry.getSpec().getPermission() != AccessControlEntry.Permission.OWNER) {
-                    return false;
-                }
-                if (accessControlEntry.getSpec().getResourceType() == AccessControlEntry.ResourceType.CONNECT) {
-                    return switch (accessControlEntry.getSpec().getResourcePatternType()) {
-                        case PREFIXED -> connector.getMetadata().getName()
-                            .startsWith(accessControlEntry.getSpec().getResource());
-                        case LITERAL ->
-                            connector.getMetadata().getName().equals(accessControlEntry.getSpec().getResource());
-                    };
-                }
-                return false;
-            }))
+            .filter(connector -> aclService.isAnyAclOfResource(acls, connector.getMetadata().getName()))
+            .toList();
+    }
+
+    /**
+     * Find all connectors by given namespace, filtered by name parameter.
+     *
+     * @param namespace The namespace
+     * @param name The name filter
+     * @return A list of connectors
+     */
+    public List<Connector> findAllForNamespace(Namespace namespace, String name) {
+        List<AccessControlEntry> acls = aclService
+            .findResourceOwnerGrantedToNamespace(namespace, AccessControlEntry.ResourceType.CONNECT);
+        List<String> nameFilterPatterns = RegexUtils.wildcardStringsToRegexPatterns(List.of(name));
+        return connectorRepository.findAllForCluster(namespace.getMetadata().getCluster())
+            .stream()
+            .filter(connector -> aclService.isAnyAclOfResource(acls, connector.getMetadata().getName())
+                && RegexUtils.filterByPattern(connector.getMetadata().getName(), nameFilterPatterns))
             .toList();
     }
 

diff --git a/src/test/java/com/michelin/ns4kafka/controller/ConnectorControllerTest.java b/src/test/java/com/michelin/ns4kafka/controller/ConnectorControllerTest.java
@@ -68,13 +68,10 @@ void listEmptyConnectors() {
                 .build())
             .build();
 
-        when(namespaceService.findByName("test"))
-            .thenReturn(Optional.of(ns));
-        when(connectorService.findAllForNamespace(ns))
-            .thenReturn(List.of());
+        when(namespaceService.findByName("test")).thenReturn(Optional.of(ns));
+        when(connectorService.findAllForNamespace(ns, "*")).thenReturn(List.of());
 
-        List<Connector> actual = connectorController.list("test");
-        assertTrue(actual.isEmpty());
+        assertTrue(connectorController.list("test", "*").isEmpty());
     }
 
     @Test
@@ -86,15 +83,30 @@ void listMultipleConnectors() {
                 .build())
             .build();
 
-        when(namespaceService.findByName("test"))
-            .thenReturn(Optional.of(ns));
-        when(connectorService.findAllForNamespace(ns))
-            .thenReturn(List.of(
-                Connector.builder().metadata(Metadata.builder().name("connect1").build()).build(),
-                Connector.builder().metadata(Metadata.builder().name("connect2").build()).build()));
+        Connector connector1 = Connector.builder().metadata(Metadata.builder().name("connect1").build()).build();
+        Connector connector2 = Connector.builder().metadata(Metadata.builder().name("connect2").build()).build();
+
+        when(namespaceService.findByName("test")).thenReturn(Optional.of(ns));
+        when(connectorService.findAllForNamespace(ns, "*")).thenReturn(List.of(connector1, connector2));
+
+        assertEquals(List.of(connector1, connector2), connectorController.list("test", "*"));
+    }
+
+    @Test
+    void listConnectorWithNameParameter() {
+        Namespace ns = Namespace.builder()
+            .metadata(Metadata.builder()
+                .name("test")
+                .cluster("local")
+                .build())
+            .build();
+
+        Connector connector = Connector.builder().metadata(Metadata.builder().name("connect1").build()).build();
+
+        when(namespaceService.findByName("test")).thenReturn(Optional.of(ns));
+        when(connectorService.findAllForNamespace(ns, "connect1")).thenReturn(List.of(connector));
 
-        List<Connector> actual = connectorController.list("test");
-        assertEquals(2, actual.size());
+        assertEquals(List.of(connector), connectorController.list("test", "connect1"));
     }
 
     @Test

diff --git a/src/test/java/com/michelin/ns4kafka/service/AclServiceTest.java b/src/test/java/com/michelin/ns4kafka/service/AclServiceTest.java
@@ -1017,24 +1017,24 @@ void isPrefixedAclOfResource() {
     @Test
     void isLiteralAclOfResource() {
         AccessControlEntry acl1 = AccessControlEntry.builder()
-                .spec(AccessControlEntry.AccessControlEntrySpec.builder()
-                        .resourceType(AccessControlEntry.ResourceType.TOPIC)
-                        .resourcePatternType(AccessControlEntry.ResourcePatternType.LITERAL)
-                        .permission(AccessControlEntry.Permission.OWNER)
-                        .resource("abc.topic1")
-                        .grantedTo("namespace")
-                        .build())
-                .build();
+            .spec(AccessControlEntry.AccessControlEntrySpec.builder()
+                .resourceType(AccessControlEntry.ResourceType.TOPIC)
+                .resourcePatternType(AccessControlEntry.ResourcePatternType.LITERAL)
+                .permission(AccessControlEntry.Permission.OWNER)
+                .resource("abc.topic1")
+                .grantedTo("namespace")
+                .build())
+            .build();
 
         AccessControlEntry acl2 = AccessControlEntry.builder()
-                .spec(AccessControlEntry.AccessControlEntrySpec.builder()
-                        .resourceType(AccessControlEntry.ResourceType.CONNECT)
-                        .resourcePatternType(AccessControlEntry.ResourcePatternType.LITERAL)
-                        .permission(AccessControlEntry.Permission.OWNER)
-                        .resource("abc-topic1")
-                        .grantedTo("namespace")
-                        .build())
-                .build();
+            .spec(AccessControlEntry.AccessControlEntrySpec.builder()
+                .resourceType(AccessControlEntry.ResourceType.CONNECT)
+                .resourcePatternType(AccessControlEntry.ResourcePatternType.LITERAL)
+                .permission(AccessControlEntry.Permission.OWNER)
+                .resource("abc-topic1")
+                .grantedTo("namespace")
+                .build())
+            .build();
         List<AccessControlEntry> acls = List.of(acl1, acl2);
 
         assertFalse(aclService.isAnyAclOfResource(acls, "xyz.topic1"));
-Original file line number
+Diff line change
@@ Expand Up @@
                     case LITERAL -> resourceName.equals(acl.getSpec().getResource());
                 });
         }
-    }
+    }