Merge branch 'main' into issues/300-regex-for-rbac

Author: Haarolean

.github/workflows/branch-deploy.yml

@@ -62,7 +62,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

.github/workflows/build-public-image.yml

@@ -61,7 +61,7 @@ jobs:
           registry-type: 'public'
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

.github/workflows/cve_checks.yml

@@ -53,7 +53,7 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Build docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

.github/workflows/docker_build.yml

@@ -60,7 +60,7 @@ jobs:
 
       - name: Build docker image
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

.github/workflows/e2e-run.yml

@@ -28,7 +28,7 @@ jobs:
           ref: ${{ inputs.sha }}
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'zulu'
@@ -76,7 +76,7 @@ jobs:
           ref: ${{ inputs.sha }}
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'zulu'

.github/workflows/separate_env_public_create.yml

@@ -62,7 +62,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: api

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

@@ -14,10 +14,10 @@ public class Role {
   List<Permission> permissions;
 
   public void validate() {
-    checkArgument(!clusters.isEmpty(), "Role clusters cannot be empty");
-    checkArgument(!subjects.isEmpty(), "Role subjects cannot be empty");
-    permissions.forEach(Permission::transform);
+    checkArgument(clusters != null && !clusters.isEmpty(), "Role clusters cannot be empty");
+    checkArgument(subjects != null && !subjects.isEmpty(), "Role subjects cannot be empty");
     permissions.forEach(Permission::validate);
+    permissions.forEach(Permission::transform);
     subjects.forEach(Subject::validate);
   }
 

build.gradle

@@ -28,16 +28,14 @@ subprojects {
 
 boolean resolveBooleanProperty(String propertyName, boolean defaultValue = false) {
     def propertyValueStr = findProperty(propertyName)
-    return propertyValueStr == null ? defaultValue : propertyValueStr.toBoolean();
+    return propertyValueStr == null ? defaultValue : propertyValueStr.toBoolean()
 }
 
 ext {
     release = resolveBooleanProperty("release")
     includeFrontend = resolveBooleanProperty("include-frontend", release)
     buildDockerImages = resolveBooleanProperty("build-docker-images", release)
     runE2e = resolveBooleanProperty("run-e2e")
-    e2eHeadlessOff = resolveBooleanProperty("e2e-headless-off")
-    e2eSelenoidOff = resolveBooleanProperty("e2e-selenoid-off")
 }
 
 sonar {

e2e-tests/README.md

@@ -40,7 +40,7 @@ docker-compose -f documentation/compose/e2e-tests.yaml up -d
 2. To run test suite select its name (options: `regression`, `sanity`, `smoke`) and put it instead %s into command below
 
 ```
-./mvnw -Dsurefire.suiteXmlFiles='src/test/resources/%s.xml' -f 'e2e-tests' test -Pprod
+./gradlew :e2e-tests:test -Prun-e2e=true -Psuite_name=%s
 ```
 
 ### Reporting

e2e-tests/build.gradle

@@ -52,8 +52,6 @@ test {
             suiteXmlFiles = [suitePath.toFile()]
         }
 
-        systemProperty "headless", e2eHeadlessOff
-        systemProperty "selenoid", e2eSelenoidOff
         systemProperty "allure.results.directory",
                 project.layout.buildDirectory.dir("allure-results").get().getAsFile().getAbsolutePath()
     }