Moved to aliases

Author: germanosin

api/src/main/java/io/kafbat/ui/model/rbac/Resource.java

@@ -12,8 +12,13 @@
 import io.kafbat.ui.model.rbac.permission.SchemaAction;
 import io.kafbat.ui.model.rbac.permission.TopicAction;
 import jakarta.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.apache.commons.lang3.EnumUtils;
 
@@ -29,7 +34,7 @@ public enum Resource {
 
   SCHEMA(SchemaAction.values()),
 
-  CONNECT(ConnectAction.values()),
+  CONNECT(ConnectAction.values(), ConnectAction.ALIASES),
 
   KSQL(KsqlAction.values()),
 
@@ -39,18 +44,27 @@ public enum Resource {
 
   CLIENT_QUOTAS(ClientQuotaAction.values());
 
-  private static final Map<PermissibleAction, PermissibleAction> DEPRECATED_ACTIONS = Map.of(
-      ConnectAction.RESTART, ConnectAction.OPERATE
-  );
 
-  private final List<PermissibleAction> actions;
+  private final Map<String, PermissibleAction> actions;
+  private final Map<String, PermissibleAction> aliases;
+
+  Resource(PermissibleAction[] actions, Map<String, PermissibleAction> aliases) {
+    this.actions = Arrays.stream(actions)
+        .collect(
+            Collectors.toMap(
+                a -> a.name().toLowerCase(),
+                a -> a
+            )
+        );
+    this.aliases = aliases;
+  }
 
   Resource(PermissibleAction[] actions) {
-    this.actions = List.of(actions);
+    this(actions, Map.of());
   }
 
   public List<PermissibleAction> allActions() {
-    return actions;
+    return new ArrayList<>(actions.values());
   }
 
   @Nullable
@@ -59,18 +73,14 @@ public static Resource fromString(String name) {
   }
 
   public List<PermissibleAction> parseActionsWithDependantsUnnest(List<String> actionsToParse) {
-    return actionsToParse.stream()
-        .map(toParse -> actions.stream()
-            .filter(a -> toParse.equalsIgnoreCase(a.name()))
-            .findFirst()
-            .map(a -> DEPRECATED_ACTIONS.getOrDefault(a, a))
+    return actionsToParse.stream().map(toParse ->
+        Optional.ofNullable(actions.get(toParse.toLowerCase()))
+            .or(() -> Optional.ofNullable(aliases.get(toParse.toLowerCase())))
             .orElseThrow(() -> new IllegalArgumentException(
                 "'%s' actions not applicable for resource %s".formatted(toParse, name())))
-        )
-        // unnesting all dependant actions
-        .flatMap(a -> Stream.concat(Stream.of(a), a.unnestAllDependants()))
-        .distinct()
-        .toList();
+    ).flatMap(a ->
+            Stream.concat(Stream.of(a), a.unnestAllDependants())
+    ).distinct().toList();
   }
 
 }

api/src/main/java/io/kafbat/ui/model/rbac/permission/ConnectAction.java

@@ -1,5 +1,6 @@
 package io.kafbat.ui.model.rbac.permission;
 
+import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
@@ -12,7 +13,6 @@ public enum ConnectAction implements PermissibleAction {
   OPERATE(VIEW),
   DELETE(VIEW),
   RESET_OFFSETS(VIEW),
-  RESTART(VIEW), // DEPREACTED
   ;
 
   private final ConnectAction[] dependantActions;
@@ -23,6 +23,8 @@ public enum ConnectAction implements PermissibleAction {
 
   public static final Set<ConnectAction> ALTER_ACTIONS = Set.of(CREATE, EDIT, DELETE, OPERATE, RESET_OFFSETS);
 
+  public static final Map<String, PermissibleAction> ALIASES = Map.of("restart", OPERATE);
+
   @Nullable
   public static ConnectAction fromString(String name) {
     return EnumUtils.getEnum(ConnectAction.class, name);

api/src/test/java/io/kafbat/ui/model/rbac/AccessContextTest.java

@@ -100,23 +100,29 @@ void deniesAccessForResourceWithoutNameIfUserHasAllNeededPermissions() {
     }
 
     @Test
-    void shouldNotContainDeprecatedActions() {
+    void shouldMapActionAliases() {
       SingleResourceAccess sra =
           new SingleResourceAccess(Resource.CONNECT, List.of(ConnectAction.OPERATE));
 
       var allowed = sra.isAccessible(
           List.of(
-              permission(Resource.CONNECT, null, ConnectAction.RESTART)
+              permission(Resource.CONNECT, null, List.of("restart"))
           )
       );
 
       assertThat(allowed).isTrue();
     }
 
     private Permission permission(Resource res, @Nullable String namePattern, PermissibleAction... actions) {
+      return permission(
+          res, namePattern, Stream.of(actions).map(PermissibleAction::name).toList()
+      );
+    }
+
+    private Permission permission(Resource res, @Nullable String namePattern, List<String> actions) {
       Permission p = new Permission();
       p.setResource(res.name());
-      p.setActions(Stream.of(actions).map(PermissibleAction::name).toList());
+      p.setActions(actions);
       p.setValue(namePattern);
       p.validate();
       p.transform();

api/src/test/java/io/kafbat/ui/model/rbac/PermissionTest.java

@@ -34,7 +34,7 @@ void transformSetsFullActionsListIfAllActionPassed() {
     p.transform();
 
     assertThat(p.getParsedActions())
-        .isEqualTo(List.of(TopicAction.values()));
+        .containsExactlyInAnyOrder(TopicAction.values());
   }
 
   @Test