opendev/gerrit
Code Issues Proposed changes

SetAccess: Simplify error message for unknown capabilities

Browse Source 
The existing message was only suitable for the case where a user
accidentally tries to set a permission as global capability, but not for
trying to set unknown or invalid global capabilities.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ifa71aeb834202cb605208814fd067df99ba76bf2
This commit is contained in:
Edwin Kempin
2020-03-16 09:28:27 +01:00
parent 6558276bc5
commit c79203ab51
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/com/google/gerrit/server/restapi/project/SetAccessUtil.java
View File

@@ -154,8 +154,7 @@ public class SetAccessUtil {
// Check all permissions for soundness // Check all permissions for soundness
for (Permission p : section.getPermissions()) { for (Permission p : section.getPermissions()) {
if (!isCapability(p.getName())) { if (!isCapability(p.getName())) {
throw new BadRequestException( throw new BadRequestException("Unknown global capability: " + p.getName());
"Cannot add non-global capability " + p.getName() + " to global capabilities");
} }
} }
} }

8
javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
View File

@@ -470,10 +470,7 @@ public class AccessIT extends AbstractDaemonTest {
assertThrows( assertThrows(
BadRequestException.class, BadRequestException.class,
() -> gApi.projects().name(allProjects.get()).access(accessInput)); () -> gApi.projects().name(allProjects.get()).access(accessInput));
assertThat(ex) assertThat(ex).hasMessageThat().isEqualTo("Unknown global capability: " + Permission.PUSH);
.hasMessageThat()
.isEqualTo(
"Cannot add non-global capability " + Permission.PUSH + " to global capabilities");
} }
@Test @Test
@@ -493,8 +490,7 @@ public class AccessIT extends AbstractDaemonTest {
() -> gApi.projects().name(allProjects.get()).access(accessInput)); () -> gApi.projects().name(allProjects.get()).access(accessInput));
assertThat(ex) assertThat(ex)
.hasMessageThat() .hasMessageThat()
.isEqualTo( .isEqualTo("Unknown global capability: Invalid Global Capability");
"Cannot add non-global capability Invalid Global Capability to global capabilities");
} }
@Test @Test