Deprecated Connect.RESTART in favour of OPERATE

Author: germanosin

api/src/main/java/io/kafbat/ui/controller/KafkaConnectController.java

@@ -191,11 +191,7 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
                                                          ConnectorActionDTO action,
                                                          ServerWebExchange exchange) {
     ConnectAction[] connectActions;
-    if (RESTART_ACTIONS.contains(action)) {
-      connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.RESTART};
-    } else {
-      connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.EDIT};
-    }
+    connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.OPERATE};
 
     var context = AccessContext.builder()
         .cluster(clusterName)
@@ -237,7 +233,7 @@ public Mono<ResponseEntity<Void>> restartConnectorTask(String clusterName, Strin
 
     var context = AccessContext.builder()
         .cluster(clusterName)
-        .connectActions(connectName, ConnectAction.VIEW, ConnectAction.RESTART)
+        .connectActions(connectName, ConnectAction.VIEW, ConnectAction.OPERATE)
         .operationName("restartConnectorTask")
         .operationParams(Map.of(CONNECTOR_NAME, connectorName))
         .build();

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

@@ -13,6 +13,7 @@
 import io.kafbat.ui.model.rbac.permission.TopicAction;
 import jakarta.annotation.Nullable;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Stream;
 import org.apache.commons.lang3.EnumUtils;
 
@@ -38,6 +39,10 @@ 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;
 
   Resource(PermissibleAction[] actions) {
@@ -58,6 +63,7 @@ public List<PermissibleAction> parseActionsWithDependantsUnnest(List<String> act
         .map(toParse -> actions.stream()
             .filter(a -> toParse.equalsIgnoreCase(a.name()))
             .findFirst()
+            .map(a -> DEPRECATED_ACTIONS.getOrDefault(a, a))
             .orElseThrow(() -> new IllegalArgumentException(
                 "'%s' actions not applicable for resource %s".formatted(toParse, name())))
         )

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

@@ -9,10 +9,10 @@ public enum ConnectAction implements PermissibleAction {
   VIEW,
   EDIT(VIEW),
   CREATE(VIEW),
-  RESTART(VIEW),
+  OPERATE(VIEW),
   DELETE(VIEW),
-  RESET_OFFSETS(VIEW)
-
+  RESET_OFFSETS(VIEW),
+  RESTART(VIEW), // DEPREACTED
   ;
 
   private final ConnectAction[] dependantActions;
@@ -21,7 +21,7 @@ public enum ConnectAction implements PermissibleAction {
     this.dependantActions = dependantActions;
   }
 
-  public static final Set<ConnectAction> ALTER_ACTIONS = Set.of(CREATE, EDIT, DELETE, RESTART, RESET_OFFSETS);
+  public static final Set<ConnectAction> ALTER_ACTIONS = Set.of(CREATE, EDIT, DELETE, OPERATE, RESET_OFFSETS);
 
   @Nullable
   public static ConnectAction fromString(String name) {

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

@@ -9,6 +9,7 @@
 import io.kafbat.ui.model.rbac.AccessContext.ResourceAccess;
 import io.kafbat.ui.model.rbac.AccessContext.SingleResourceAccess;
 import io.kafbat.ui.model.rbac.permission.ClusterConfigAction;
+import io.kafbat.ui.model.rbac.permission.ConnectAction;
 import io.kafbat.ui.model.rbac.permission.PermissibleAction;
 import io.kafbat.ui.model.rbac.permission.TopicAction;
 import jakarta.annotation.Nullable;
@@ -98,6 +99,20 @@ void deniesAccessForResourceWithoutNameIfUserHasAllNeededPermissions() {
       assertThat(allowed).isFalse();
     }
 
+    @Test
+    void shouldNotContainDeprecatedActions() {
+      SingleResourceAccess sra =
+          new SingleResourceAccess(Resource.CONNECT, List.of(ConnectAction.OPERATE));
+
+      var allowed = sra.isAccessible(
+          List.of(
+              permission(Resource.CONNECT, null, ConnectAction.RESTART)
+          )
+      );
+
+      assertThat(allowed).isTrue();
+    }
+
     private Permission permission(Resource res, @Nullable String namePattern, PermissibleAction... actions) {
       Permission p = new Permission();
       p.setResource(res.name());

contract/src/main/resources/swagger/kafbat-ui-api.yaml

@@ -3947,6 +3947,7 @@ components:
         - MESSAGES_READ
         - MESSAGES_PRODUCE
         - MESSAGES_DELETE
+        - OPERATE
         - RESTART
 
     ResourceType:

frontend/src/components/Connect/Details/Actions/Actions.tsx

@@ -91,7 +91,7 @@ const Actions: React.FC = () => {
             onClick={pauseConnectorHandler}
             permission={{
               resource: ResourceType.CONNECT,
-              action: Action.EDIT,
+              action: Action.OPERATE,
               value: routerProps.connectName,
             }}
           >
@@ -103,7 +103,7 @@ const Actions: React.FC = () => {
             onClick={stopConnectorHandler}
             permission={{
               resource: ResourceType.CONNECT,
-              action: Action.EDIT,
+              action: Action.OPERATE,
               value: routerProps.connectName,
             }}
           >
@@ -116,7 +116,7 @@ const Actions: React.FC = () => {
             onClick={resumeConnectorHandler}
             permission={{
               resource: ResourceType.CONNECT,
-              action: Action.EDIT,
+              action: Action.OPERATE,
               value: routerProps.connectName,
             }}
           >
@@ -127,7 +127,7 @@ const Actions: React.FC = () => {
           onClick={restartConnectorHandler}
           permission={{
             resource: ResourceType.CONNECT,
-            action: Action.RESTART,
+            action: Action.OPERATE,
             value: routerProps.connectName,
           }}
         >
@@ -137,7 +137,7 @@ const Actions: React.FC = () => {
           onClick={restartAllTasksHandler}
           permission={{
             resource: ResourceType.CONNECT,
-            action: Action.RESTART,
+            action: Action.OPERATE,
             value: routerProps.connectName,
           }}
         >
@@ -147,7 +147,7 @@ const Actions: React.FC = () => {
           onClick={restartFailedTasksHandler}
           permission={{
             resource: ResourceType.CONNECT,
-            action: Action.RESTART,
+            action: Action.OPERATE,
             value: routerProps.connectName,
           }}
         >

frontend/src/components/Connect/Details/Tasks/ActionsCellTasks.tsx

@@ -25,7 +25,7 @@ const ActionsCellTasks: React.FC<CellContext<Task, unknown>> = ({ row }) => {
         confirm="Are you sure you want to restart the task?"
         permission={{
           resource: ResourceType.CONNECT,
-          action: Action.RESTART,
+          action: Action.OPERATE,
           value: routerProps.connectName,
         }}
       >

frontend/src/components/Connect/List/ActionsCell.tsx

@@ -126,7 +126,7 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
         disabled={isMutating}
         permission={{
           resource: ResourceType.CONNECT,
-          action: Action.RESTART,
+          action: Action.OPERATE,
           value: connect,
         }}
       >
@@ -137,7 +137,7 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
         disabled={isMutating}
         permission={{
           resource: ResourceType.CONNECT,
-          action: Action.RESTART,
+          action: Action.OPERATE,
           value: connect,
         }}
       >
@@ -148,7 +148,7 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
         disabled={isMutating}
         permission={{
           resource: ResourceType.CONNECT,
-          action: Action.RESTART,
+          action: Action.OPERATE,
           value: connect,
         }}
       >