From 6eb7a856da46b36897fe9a22a1671a466ca61ce5 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 26 Mar 2026 10:48:03 -0400 Subject: [PATCH] Rename ResourceActionGroupsHelper to ResourceAccessLevelHelper Signed-off-by: Craig Perkins --- .../org/opensearch/security/OpenSearchSecurityPlugin.java | 4 ++-- ...onGroupsHelper.java => ResourceAccessLevelHelper.java} | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/org/opensearch/security/resources/{ResourceActionGroupsHelper.java => ResourceAccessLevelHelper.java} (95%) diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java index f91a26c40f..e2a35a62bf 100644 --- a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java +++ b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java @@ -181,7 +181,7 @@ import org.opensearch.security.resolver.IndexResolverReplacer; import org.opensearch.security.resources.ResourceAccessControlClient; import org.opensearch.security.resources.ResourceAccessHandler; -import org.opensearch.security.resources.ResourceActionGroupsHelper; +import org.opensearch.security.resources.ResourceAccessLevelHelper; import org.opensearch.security.resources.ResourceIndexListener; import org.opensearch.security.resources.ResourcePluginInfo; import org.opensearch.security.resources.ResourceSharingIndexHandler; @@ -2491,7 +2491,7 @@ public void loadExtensions(ExtensionLoader loader) { resourcePluginInfo.setResourceSharingExtensions(exts); // load action-groups in memory - ResourceActionGroupsHelper.loadActionGroupsConfig(resourcePluginInfo); + ResourceAccessLevelHelper.loadAccessLevelConfig(resourcePluginInfo); } public static class GuiceHolder implements LifecycleComponent { diff --git a/src/main/java/org/opensearch/security/resources/ResourceActionGroupsHelper.java b/src/main/java/org/opensearch/security/resources/ResourceAccessLevelHelper.java similarity index 95% rename from src/main/java/org/opensearch/security/resources/ResourceActionGroupsHelper.java rename to src/main/java/org/opensearch/security/resources/ResourceAccessLevelHelper.java index 00f141f95e..02c09ff87c 100644 --- a/src/main/java/org/opensearch/security/resources/ResourceActionGroupsHelper.java +++ b/src/main/java/org/opensearch/security/resources/ResourceAccessLevelHelper.java @@ -24,8 +24,8 @@ /** * Helper class to load `resource-access-levels.yml` file for all resource sharing extensions. */ -public class ResourceActionGroupsHelper { - public static final Logger log = LogManager.getLogger(ResourceActionGroupsHelper.class); +public class ResourceAccessLevelHelper { + public static final Logger log = LogManager.getLogger(ResourceAccessLevelHelper.class); /** * Loads action-groups config from the {@code resource-access-levels.yml} file from each resource sharing extension @@ -36,10 +36,10 @@ public class ResourceActionGroupsHelper { * sample-resource: * sample_read_only: * allowed_actions: - * - "cluster:admin/sample-resource-plugin/get" + * - "sampleresource:get" */ @SuppressWarnings("unchecked") - public static void loadActionGroupsConfig(ResourcePluginInfo resourcePluginInfo) { + public static void loadAccessLevelConfig(ResourcePluginInfo resourcePluginInfo) { var exts = resourcePluginInfo.getResourceSharingExtensions(); for (var ext : exts) { URL url = ext.getClass().getClassLoader().getResource("resource-access-levels.yml");