From 8920c2a540480a9c3c552020bcea2695e67a142f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 18 Feb 2019 10:17:35 +0100 Subject: [PATCH] Remove health check permission until implemented --- .../main/resources/META-INF/scm/repository-permissions.xml | 7 ------- scm-webapp/src/main/resources/locales/en/plugins.json | 4 ---- .../scm/security/RepositoryPermissionProviderTest.java | 1 + 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml b/scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml index 4646482fe7..986aa5cf2d 100644 --- a/scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml +++ b/scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml @@ -7,7 +7,6 @@ push permissionRead permissionWrite - healthCheck * @@ -26,12 +25,6 @@ push - - HEALTH - - healthCheck - - OWNER diff --git a/scm-webapp/src/main/resources/locales/en/plugins.json b/scm-webapp/src/main/resources/locales/en/plugins.json index 67f26115dc..a0472f18a2 100644 --- a/scm-webapp/src/main/resources/locales/en/plugins.json +++ b/scm-webapp/src/main/resources/locales/en/plugins.json @@ -68,10 +68,6 @@ "displayName": "modify permissions", "description": "May modify the permissions of the repository" }, - "healthCheck": { - "displayName": "health check", - "description": "May run the health check for the repository" - }, "*": { "displayName": "overall", "description": "May change everything for the repository (includes all other permissions)" diff --git a/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionProviderTest.java b/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionProviderTest.java index b5998084f8..9a7277ddb5 100644 --- a/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionProviderTest.java +++ b/scm-webapp/src/test/java/sonia/scm/security/RepositoryPermissionProviderTest.java @@ -27,6 +27,7 @@ class RepositoryPermissionProviderTest { repositoryPermissionProvider = new RepositoryPermissionProvider(pluginLoader); allVerbsFromRepositoryClass = Arrays.stream(RepositoryPermissions.class.getDeclaredFields()) .filter(field -> field.getName().startsWith("ACTION_")) + .filter(field -> !field.getName().equals("ACTION_HEALTHCHECK")) .map(this::getString) .filter(verb -> !"create".equals(verb)) .toArray(String[]::new);