Skip to content

Rename ResourceActionGroupsHelper to ResourceAccessLevelHelper #6039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cwperks wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

Rename ResourceActionGroupsHelper to ResourceAccessLevelHelper #6039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions ...resources/ResourceActionGroupsHelper.java → .../resources/ResourceAccessLevelHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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");
Expand Down
Loading