Browse Source

SONAR-21119 Add Gitlab BBT for user provisioning

tags/10.4.0.87286
Antoine Vigneau 5 months ago
parent
commit
b2cd0f3ff5

+ 13
- 3
.cirrus.yml View File

@@ -626,12 +626,22 @@ qa_gitlab_provisioning_task:
<<: *GITLAB_PROVISIONING_TASK_TEMPLATE
<<: *JAR_CACHE_TEMPLATE
<<: *GRADLE_CACHE_TEMPLATE
env:
QA_CATEGORY: GITLAB_PROVISIONING
matrix:
- name: qa_gitlab_provisioning_latest
env:
- GITLAB_VERSION: latest
- name: qa_gitlab_provisioning_oldest
env:
- GITLAB_VERSION: 15.6.2-ce.0
eks_container:
<<: *CONTAINER_TEMPLATE
cpu: 4
cpu: 2.4
memory: 7Gb
env:
QA_CATEGORY: GITLAB_PROVISIONING
use_in_memory_disk: true
additional_containers:
- <<: *GITLAB_CONTAINER_TEMPLATE
script:
- ./private/cirrus/cirrus-qa.sh h2
<<: *DEFAULT_ARTIFACTS_TEMPLATE

+ 4
- 0
server/sonar-db-dao/src/main/java/org/sonar/db/alm/setting/ProjectAlmSettingDao.java View File

@@ -19,6 +19,7 @@
*/
package org.sonar.db.alm.setting;

import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Optional;
@@ -108,6 +109,9 @@ public class ProjectAlmSettingDao implements Dao {
}

public List<ProjectAlmSettingDto> selectByProjectUuidsAndAlm(DbSession dbSession, Set<String> projectUuids, ALM alm) {
if (projectUuids.isEmpty()) {
return Collections.emptyList();
}
return getMapper(dbSession).selectByProjectUuidsAndAlm(projectUuids, alm.getId().toLowerCase(Locale.ROOT));
}


+ 10
- 0
sonar-ws/src/main/java/org/sonarqube/ws/client/users/SearchRequest.java View File

@@ -34,6 +34,7 @@ public class SearchRequest {
private String ps;
private String q;
private Boolean deactivated;
private Boolean managed;

/**
* Example value: "42"
@@ -78,4 +79,13 @@ public class SearchRequest {
this.deactivated = deactivated;
return this;
}

public Boolean getManaged() {
return managed;
}

public SearchRequest setManaged(Boolean managed) {
this.managed = managed;
return this;
}
}

+ 2
- 1
sonar-ws/src/main/java/org/sonarqube/ws/client/users/UsersService.java View File

@@ -149,7 +149,8 @@ public class UsersService extends BaseService {
.setParam("p", request.getP())
.setParam("ps", request.getPs())
.setParam("q", request.getQ())
.setParam("deactivated", request.getDeactivated()),
.setParam("deactivated", request.getDeactivated())
.setParam("managed", request.getManaged()),
SearchWsResponse.parser());
}


+ 4
- 0
sonar-ws/src/testFixtures/java/org/sonarqube/ws/tester/UserTester.java View File

@@ -172,6 +172,10 @@ public class UserTester {
return queryForUser(name, t -> t.getName().equals(name));
}

public List<Users.SearchWsResponse.User> getAllManagedUsers() {
return service().search(new SearchRequest().setManaged(true)).getUsersList();
}

public void changePassword(String login, String previousPassword, String newPassword) {
service().changePassword(new ChangePasswordRequest().setLogin(login).setPreviousPassword(previousPassword).setPassword(newPassword));
}

Loading…
Cancel
Save