fix tests for new validation

Author: zambrinf

api/src/test/java/io/kafbat/ui/service/rbac/MockedRbacUtils.java

@@ -8,6 +8,7 @@
 import io.kafbat.ui.model.rbac.Permission;
 import io.kafbat.ui.model.rbac.Resource;
 import io.kafbat.ui.model.rbac.Role;
+import io.kafbat.ui.model.rbac.Subject;
 import io.kafbat.ui.model.rbac.permission.ConnectAction;
 import io.kafbat.ui.model.rbac.permission.ConsumerGroupAction;
 import io.kafbat.ui.model.rbac.permission.SchemaAction;
@@ -36,6 +37,11 @@ public static Role getAdminRole() {
     Role role = new Role();
     role.setName(ADMIN_ROLE);
     role.setClusters(List.of(DEV_CLUSTER, PROD_CLUSTER));
+    Subject sub = new Subject();
+    sub.setType("group");
+    sub.setProvider("ldap");
+    sub.setValue("kafbat.group");
+    role.setSubjects(List.of(sub));
     Permission applicationConfigPerm = new Permission();
     applicationConfigPerm.setResource(Resource.APPLICATIONCONFIG.name());
     applicationConfigPerm.setActions(List.of("all"));
@@ -56,7 +62,11 @@ public static Role getDevRole() {
     Role role = new Role();
     role.setName(DEV_ROLE);
     role.setClusters(List.of(DEV_CLUSTER));
-
+    Subject sub = new Subject();
+    sub.setType("group");
+    sub.setProvider("ldap");
+    sub.setValue("kafbat.group");
+    role.setSubjects(List.of(sub));
     Permission topicViewPermission = new Permission();
     topicViewPermission.setResource(Resource.TOPIC.name());
     topicViewPermission.setActions(List.of(TopicAction.VIEW.name()));

api/src/test/java/io/kafbat/ui/service/rbac/RbacClusterMistakenTest.java

@@ -10,6 +10,7 @@
 import io.kafbat.ui.model.rbac.Permission;
 import io.kafbat.ui.model.rbac.Resource;
 import io.kafbat.ui.model.rbac.Role;
+import io.kafbat.ui.model.rbac.Subject;
 import io.kafbat.ui.model.rbac.permission.AclAction;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
@@ -174,7 +175,11 @@ private Role getAdminRole() {
     Role role = new Role();
     role.setName(ADMIN_ROLE_NAME);
     role.setClusters(List.of(DEV_CLUSTER_ADM, TST_CLUSTER_ADM, UAT_CLUSTER_ADM));
-
+    Subject sub = new Subject();
+    sub.setType("group");
+    sub.setProvider("ldap");
+    sub.setValue("kafbat.group");
+    role.setSubjects(List.of(sub));
     Permission permission = new Permission();
     permission.setResource(Resource.ACL.name());
     permission.setActions(List.of(AclAction.VIEW.name()));
@@ -191,7 +196,11 @@ private Role getDevRole() {
     Role role = new Role();
     role.setName(LAB_ROLE_NAME);
     role.setClusters(List.of(LAB_CLUSTER_ALL));
-
+    Subject sub = new Subject();
+    sub.setType("group");
+    sub.setProvider("ldap");
+    sub.setValue("kafbat.group");
+    role.setSubjects(List.of(sub));
     Permission permission = new Permission();
     permission.setResource(Resource.ACL.name());
     permission.setActions(List.of(AclAction.VIEW.name(), AclAction.EDIT.name()));

api/src/test/java/io/kafbat/ui/service/rbac/RbacEditTopicTest.java

@@ -10,6 +10,7 @@
 import io.kafbat.ui.model.rbac.Permission;
 import io.kafbat.ui.model.rbac.Resource;
 import io.kafbat.ui.model.rbac.Role;
+import io.kafbat.ui.model.rbac.Subject;
 import io.kafbat.ui.model.rbac.permission.TopicAction;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
@@ -109,7 +110,11 @@ public static Role getEditTopicTestRole() {
     Role role = new Role();
     role.setName(ROLE_NAME);
     role.setClusters(List.of(CLUSTER_NAME));
-
+    Subject sub = new Subject();
+    sub.setType("group");
+    sub.setProvider("ldap");
+    sub.setValue("kafbat.group");
+    role.setSubjects(List.of(sub));
     Permission topicPermissionTestPrefix = new Permission();
     topicPermissionTestPrefix.setResource(Resource.TOPIC.name());
     topicPermissionTestPrefix.setActions(List.of(

api/src/test/java/io/kafbat/ui/service/rbac/RbacTopicCreationTest.java

@@ -1,6 +1,5 @@
 package io.kafbat.ui.service.rbac;
 
-import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -11,6 +10,7 @@
 import io.kafbat.ui.model.rbac.Permission;
 import io.kafbat.ui.model.rbac.Resource;
 import io.kafbat.ui.model.rbac.Role;
+import io.kafbat.ui.model.rbac.Subject;
 import io.kafbat.ui.model.rbac.permission.TopicAction;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
@@ -117,7 +117,11 @@ public static Role getRole() {
     Role role = new Role();
     role.setName(ROLE_NAME);
     role.setClusters(List.of(CLUSTER_NAME));
-
+    Subject sub = new Subject();
+    sub.setType("group");
+    sub.setProvider("ldap");
+    sub.setValue("kafbat.group");
+    role.setSubjects(List.of(sub));
     Permission testTopicsPermission = new Permission();
     testTopicsPermission.setResource(Resource.TOPIC.name());
     testTopicsPermission.setActions(List.of(