SONAR-21244 Allow deletion of local groups when instance is managed.

2 files changed, 21 insertions, 0 deletions

diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/common/management/ManagedInstanceChecker.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/common/management/ManagedInstanceChecker.java
index fa2f70c6539..dad6f4ac6d2 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/common/management/ManagedInstanceChecker.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/common/management/ManagedInstanceChecker.java
@@ -49,6 +49,10 @@ public class ManagedInstanceChecker {
     BadRequestException.checkRequest(!managedInstanceService.isUserManaged(dbSession, userUuid), INSTANCE_EXCEPTION_MESSAGE);
   }
 
+  public void throwIfGroupIsManaged(DbSession dbSession, String groupUuid) {
+    BadRequestException.checkRequest(!managedInstanceService.isGroupManaged(dbSession, groupUuid), INSTANCE_EXCEPTION_MESSAGE);
+  }
+
   public void throwIfUserAndProjectAreManaged(DbSession dbSession, String userUuid, String projectUuid) {
     boolean isUserManaged = managedInstanceService.isUserManaged(dbSession, userUuid);
     boolean isProjectManaged = managedProjectService.isProjectManaged(dbSession, projectUuid);
diff --git a/server/sonar-webserver-common/src/test/java/com/sonar/server/common/management/ManagedInstanceCheckerTest.java b/server/sonar-webserver-common/src/test/java/com/sonar/server/common/management/ManagedInstanceCheckerTest.java
index f96a624f860..83b3c732707 100644
--- a/server/sonar-webserver-common/src/test/java/com/sonar/server/common/management/ManagedInstanceCheckerTest.java
+++ b/server/sonar-webserver-common/src/test/java/com/sonar/server/common/management/ManagedInstanceCheckerTest.java
@@ -104,6 +104,23 @@ public class ManagedInstanceCheckerTest {
   }
 
   @Test
+  public void throwIfGroupIsManaged_whenGroupIsManaged_shouldThrow() {
+    GroupDto groupDto = mockManagedGroup();
+
+    String groupUuid = groupDto.getUuid();
+    assertThatThrownBy(() -> managedInstanceChecker.throwIfGroupIsManaged(dbSession, groupUuid))
+      .isInstanceOf(BadRequestException.class)
+      .hasMessage(INSTANCE_EXCEPTION_MESSAGE);
+  }
+
+  @Test
+  public void throwIfGroupIsManaged_whenGroupIsNotManaged_shouldNotThrow() {
+    GroupDto groupDto = mockNotManagedGroup();
+
+    assertThatNoException().isThrownBy(() -> managedInstanceChecker.throwIfGroupIsManaged(dbSession, groupDto.getUuid()));
+  }
+
+  @Test
   public void throwIfUserAndProjectAreManaged_whenUserAndProjectAreManaged_shouldThrow() {
     ProjectDto projectDto = mockManagedProject();
     UserDto userDto = mockManagedUser();