Removes singleton pattern from ResourcePluginInfo

Signed-off-by: Darshit Chanpura <[email protected]>

Author: DarshitChanpura

src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java

@@ -58,6 +58,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -300,6 +301,7 @@ public final class OpenSearchSecurityPlugin extends OpenSearchSecuritySSLPlugin
     private volatile PasswordHasher passwordHasher;
     private volatile DlsFlsBaseContext dlsFlsBaseContext;
     private ResourceSharingIndexManagementRepository resourceSharingIndexManagementRepository;
+    private static final ResourcePluginInfo resourcePluginInfo = new ResourcePluginInfo();
 
     public static boolean isActionTraceEnabled() {
 
@@ -771,7 +773,7 @@ public void onIndexModule(IndexModule indexModule) {
             if (settings.getAsBoolean(
                 ConfigConstants.OPENSEARCH_RESOURCE_SHARING_ENABLED,
                 ConfigConstants.OPENSEARCH_RESOURCE_SHARING_ENABLED_DEFAULT
-            ) && ResourcePluginInfo.getInstance().getResourceIndices().contains(indexModule.getIndex().getName())) {
+            ) && resourcePluginInfo.getResourceIndices().contains(indexModule.getIndex().getName())) {
                 indexModule.addIndexOperationListener(resourceIndexListener);
                 log.info("Security plugin started listening to operations on resource-index {}", indexModule.getIndex().getName());
             }
@@ -1182,7 +1184,8 @@ public Collection<Object> createComponents(
 
         final var resourceSharingIndex = ResourceSharingConstants.OPENSEARCH_RESOURCE_SHARING_INDEX;
         ResourceSharingIndexHandler rsIndexHandler = new ResourceSharingIndexHandler(resourceSharingIndex, localClient, threadPool);
-        ResourceAccessHandler resourceAccessHandler = new ResourceAccessHandler(threadPool, rsIndexHandler, adminDns);
+
+        ResourceAccessHandler resourceAccessHandler = new ResourceAccessHandler(threadPool, rsIndexHandler, adminDns, resourcePluginInfo);
         // Resource Sharing index is enabled by default
         boolean isResourceSharingEnabled = settings.getAsBoolean(
             ConfigConstants.OPENSEARCH_RESOURCE_SHARING_ENABLED,
@@ -2320,12 +2323,17 @@ public void loadExtensions(ExtensiblePlugin.ExtensionLoader loader) {
                 resourceProviders.put(resourceIndexName, resourceProvider);
                 log.info("Loaded resource sharing extension: {}, index: {}", resourceType, resourceIndexName);
             }
-            ResourcePluginInfo.getInstance().setResourceIndices(resourceIndices);
-            ResourcePluginInfo.getInstance().setResourceProviders(resourceProviders);
+            resourcePluginInfo.setResourceIndices(resourceIndices);
+            resourcePluginInfo.setResourceProviders(resourceProviders);
         }
     }
     // CS-ENFORCE-SINGLE
 
+    @VisibleForTesting
+    public static ResourcePluginInfo getResourcePluginInfo() {
+        return resourcePluginInfo;
+    }
+
     public static class GuiceHolder implements LifecycleComponent {
 
         private static RepositoriesService repositoriesService;

src/main/java/org/opensearch/security/resources/ResourceAccessHandler.java

@@ -49,15 +49,18 @@ public class ResourceAccessHandler {
     private final ThreadContext threadContext;
     private final ResourceSharingIndexHandler resourceSharingIndexHandler;
     private final AdminDNs adminDNs;
+    private final ResourcePluginInfo resourcePluginInfo;
 
     public ResourceAccessHandler(
         final ThreadPool threadPool,
         final ResourceSharingIndexHandler resourceSharingIndexHandler,
-        AdminDNs adminDns
+        AdminDNs adminDns,
+        ResourcePluginInfo resourcePluginInfo
     ) {
         this.threadContext = threadPool.getThreadContext();
         this.resourceSharingIndexHandler = resourceSharingIndexHandler;
         this.adminDNs = adminDns;
+        this.resourcePluginInfo = resourcePluginInfo;
     }
 
     /**
@@ -161,8 +164,7 @@ public <T extends ShareableResource> void getAccessibleResourcesForCurrentUser(S
         try {
             validateArguments(resourceIndex);
 
-            ShareableResourceParser<T> parser = (ShareableResourceParser<T>) ResourcePluginInfo.getInstance()
-                .getResourceProviders()
+            ShareableResourceParser<T> parser = (ShareableResourceParser<T>) resourcePluginInfo.getResourceProviders()
                 .get(resourceIndex)
                 .shareableResourceParser();
 

src/main/java/org/opensearch/security/resources/ResourcePluginInfo.java

@@ -28,15 +28,6 @@ public class ResourcePluginInfo {
     private final Map<String, ResourceProvider> resourceProviderMap = new HashMap<>();
     private final Set<String> resourceIndices = new HashSet<>();
 
-    private ResourcePluginInfo() {}
-
-    public static ResourcePluginInfo getInstance() {
-        if (INSTANCE == null) {
-            INSTANCE = new ResourcePluginInfo();
-        }
-        return INSTANCE;
-    }
-
     public void setResourceProviders(Map<String, ResourceProvider> providerMap) {
         resourceProviderMap.clear();
         resourceProviderMap.putAll(providerMap);