BE: RBAC: Wizard: Fix enums mapping (#278)

Co-authored-by: iliax <[email protected]>
kafbat · May 26, 2024 · 22a5053 · 22a5053
1 parent a774ab9
commit 22a5053
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/api/src/main/java/io/kafbat/ui/controller/ApplicationConfigController.java b/api/src/main/java/io/kafbat/ui/controller/ApplicationConfigController.java
@@ -5,6 +5,7 @@
 
 import io.kafbat.ui.api.ApplicationConfigApi;
 import io.kafbat.ui.config.ClustersProperties;
+import io.kafbat.ui.model.ActionDTO;
 import io.kafbat.ui.model.ApplicationConfigDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesDTO;
 import io.kafbat.ui.model.ApplicationConfigValidationDTO;
@@ -18,6 +19,7 @@
 import io.kafbat.ui.util.ApplicationRestarter;
 import io.kafbat.ui.util.DynamicConfigOperations;
 import java.util.Map;
+import java.util.Optional;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -46,6 +48,12 @@ interface PropertiesMapper {
     DynamicConfigOperations.PropertiesStructure fromDto(ApplicationConfigPropertiesDTO dto);
 
     ApplicationConfigPropertiesDTO toDto(DynamicConfigOperations.PropertiesStructure propertiesStructure);
+
+    default ActionDTO stringToActionDto(String str) {
+      return Optional.ofNullable(str)
+          .map(s -> Enum.valueOf(ActionDTO.class, s.toUpperCase()))
+          .orElseThrow();
+    }
   }
 
   private final DynamicConfigOperations dynamicConfigOperations;
@@ -75,7 +83,7 @@ public Mono<ResponseEntity<ApplicationConfigDTO>> getCurrentConfig(ServerWebExch
   @Override
   public Mono<ResponseEntity<Void>> restartWithConfig(Mono<RestartRequestDTO> restartRequestDto,
                                                       ServerWebExchange exchange) {
-    var context =  AccessContext.builder()
+    var context = AccessContext.builder()
         .applicationConfigActions(EDIT)
         .operationName("restartWithConfig")
         .build();

diff --git a/api/src/main/java/io/kafbat/ui/model/rbac/Permission.java b/api/src/main/java/io/kafbat/ui/model/rbac/Permission.java
@@ -3,6 +3,7 @@
 import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
 
 import com.google.common.base.Preconditions;
+import io.kafbat.ui.model.ActionDTO;
 import io.kafbat.ui.model.rbac.permission.PermissibleAction;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -50,7 +51,7 @@ public void transform() {
     if (value != null) {
       this.compiledValuePattern = Pattern.compile(value);
     }
-    if (actions.stream().anyMatch("ALL"::equalsIgnoreCase)) {
+    if (actions.stream().anyMatch(ActionDTO.ALL.name()::equalsIgnoreCase)) {
       this.parsedActions = resource.allActions();
     } else {
       this.parsedActions = resource.parseActionsWithDependantsUnnest(actions);

diff --git a/contract/src/main/resources/swagger/kafbat-ui-api.yaml b/contract/src/main/resources/swagger/kafbat-ui-api.yaml
@@ -3821,6 +3821,7 @@ components:
     Action:
       type: string
       enum:
+        - ALL
         - VIEW
         - EDIT
         - CREATE