SONAR-22807 Provisioning of permissions uses custom mapping

3 files changed, 15 insertions, 5 deletions

diff --git a/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/version/v107/PopulateGitlabDevopsPermissionsMappingIT.java b/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/version/v107/PopulateGitlabDevopsPermissionsMappingIT.java
index 90342d1a9a4..b090514a351 100644
--- a/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/version/v107/PopulateGitlabDevopsPermissionsMappingIT.java
+++ b/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/version/v107/PopulateGitlabDevopsPermissionsMappingIT.java
@@ -23,7 +23,6 @@ import java.sql.SQLException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.sonar.api.testfixtures.log.LogTesterJUnit5;
-import org.sonar.core.util.UuidFactoryFast;
 import org.sonar.core.util.UuidFactoryImpl;
 import org.sonar.db.MigrationDbTester;
 
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/gitlab/provisioning/permissions/AddGitlabPermissionMappingRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/gitlab/provisioning/permissions/AddOrModifyGitlabPermissionMappingRequest.java
index 655bba02172..8b76299522c 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/gitlab/provisioning/permissions/AddGitlabPermissionMappingRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/gitlab/provisioning/permissions/AddOrModifyGitlabPermissionMappingRequest.java
@@ -21,6 +21,6 @@ package org.sonarqube.ws.client.gitlab.provisioning.permissions;
 
 import org.sonarqube.ws.client.github.provisioning.permissions.SonarqubePermissions;
 
-public record AddGitlabPermissionMappingRequest(String gitlabRole, SonarqubePermissions permissions) {
+public record AddOrModifyGitlabPermissionMappingRequest(String gitlabRole, SonarqubePermissions permissions) {
 
 }
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/gitlab/provisioning/permissions/GitlabPermissionService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/gitlab/provisioning/permissions/GitlabPermissionService.java
index bad74534d58..9fda4266957 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/gitlab/provisioning/permissions/GitlabPermissionService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/gitlab/provisioning/permissions/GitlabPermissionService.java
@@ -20,11 +20,14 @@
 package org.sonarqube.ws.client.gitlab.provisioning.permissions;
 
 import com.google.gson.Gson;
+import java.util.Locale;
 import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.client.BaseService;
+import org.sonarqube.ws.client.PatchRequest;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsConnector;
 import org.sonarqube.ws.client.WsResponse;
+import org.sonarqube.ws.client.github.provisioning.permissions.SonarqubePermissions;
 
 public class GitlabPermissionService extends BaseService {
 
@@ -32,14 +35,22 @@ public class GitlabPermissionService extends BaseService {
     super(wsConnector, "api/v2");
   }
 
-  public void addPermissionMapping(AddGitlabPermissionMappingRequest addLabPermissionMappingRequest) {
+  public void addPermissionMapping(AddOrModifyGitlabPermissionMappingRequest addLabPermissionMappingRequest) {
     callEndpointToAddPermissionMapping(addLabPermissionMappingRequest).close();
   }
 
-  private WsResponse callEndpointToAddPermissionMapping(AddGitlabPermissionMappingRequest addGitlabPermissionMappingRequest) {
+  private WsResponse callEndpointToAddPermissionMapping(AddOrModifyGitlabPermissionMappingRequest addOrModifyGitlabPermissionMappingRequest) {
     return call(
       new PostRequest(path("dop-translation/gitlab-permission-mappings"))
-        .setBody(new Gson().toJson(addGitlabPermissionMappingRequest))
+        .setBody(new Gson().toJson(addOrModifyGitlabPermissionMappingRequest))
         .setMediaType(MediaTypes.JSON));
   }
+
+  public void modifyPermissionMapping(String role, SonarqubePermissions permissions) {
+    call(
+      new PatchRequest(path("dop-translation/gitlab-permission-mappings/" + role.toLowerCase(Locale.getDefault())))
+        .setBody(new Gson().toJson(new AddOrModifyGitlabPermissionMappingRequest(role, permissions)))
+        .setContentType("application/merge-patch+json")
+        .setMediaType(MediaTypes.JSON)).close();
+  }
 }