Fixes after rebase with main

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

Author: DarshitChanpura

CHANGELOG.md

@@ -7,8 +7,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Features
 ### Added
-- [Resource Sharing] Adds a Resource Access Evaluator for standalone Resource access authorization ([#5408](https://github.com/opensearch-project/security/pull/5408))
-
 * Introduced new experimental versioned security configuration management feature ([#5357] (https://github.com/opensearch-project/security/pull/5357))
 * [Resource Sharing] Adds migrate API to move resource-sharing info to security plugin ([#5389](https://github.com/opensearch-project/security/pull/5389))
 * Introduces support for the Argon2 Password Hashing Algorithm ([#5441] (https://github.com/opensearch-project/security/pull/5441))
@@ -29,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 * Handle subject in nested claim for JWT auth backends ([#5467](https://github.com/opensearch-project/security/pull/5467))
 * Moved OpenSAML jars to a Shadow Jar configuration to facilitate its use in FIPS enabled environments ([#5400](https://github.com/opensearch-project/security/pull/5404))
 * [Resource Sharing] Adds a Resource Access Evaluator for standalone Resource access authorization ([#5408](https://github.com/opensearch-project/security/pull/5408))
+* [Resource Sharing] Adds a Share API to fetch and update sharing information ([#5459](https://github.com/opensearch-project/security/pull/5459))
 
 ### Bug Fixes
 

sample-resource-plugin/src/main/java/org/opensearch/sample/resource/actions/rest/revoke/RevokeResourceAccessRequest.java

@@ -19,8 +19,6 @@
 
 import static org.opensearch.sample.utils.Constants.RESOURCE_INDEX_NAME;
 
-import static org.opensearch.sample.utils.Constants.RESOURCE_INDEX_NAME;
-
 /**
  * Request object for revoking access to a sample resource
  */

sample-resource-plugin/src/main/java/org/opensearch/sample/resource/actions/rest/share/ShareResourceRequest.java

@@ -19,8 +19,6 @@
 
 import static org.opensearch.sample.utils.Constants.RESOURCE_INDEX_NAME;
 
-import static org.opensearch.sample.utils.Constants.RESOURCE_INDEX_NAME;
-
 /**
  * Request object for sharing sample resource transport action
  */

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

@@ -1171,9 +1171,7 @@ public Collection<Object> createComponents(
             settings,
             privilegesInterceptor,
             cih,
-            irr,
-            resourcePluginInfo.getResourceIndices(),
-            rsIndexHandler
+            irr
         );
 
         dlsFlsBaseContext = new DlsFlsBaseContext(evaluator, threadPool.getThreadContext(), adminDns);

src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java

@@ -26,7 +26,6 @@
 
 package org.opensearch.security.privileges;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

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

@@ -39,6 +39,7 @@
 import org.opensearch.security.support.ConfigConstants;
 import org.opensearch.security.support.WildcardMatcher;
 import org.opensearch.security.user.User;
+import org.opensearch.threadpool.ThreadPool;
 
 import reactor.util.annotation.NonNull;
 
@@ -59,12 +60,12 @@ public class ResourceAccessHandler {
 
     @Inject
     public ResourceAccessHandler(
-        final ThreadContext threadContext,
+        final ThreadPool threadPool,
         final ResourceSharingIndexHandler resourceSharingIndexHandler,
         AdminDNs adminDns,
         PrivilegesEvaluator evaluator
     ) {
-        this.threadContext = threadContext;
+        this.threadContext = threadPool.getThreadContext();
         this.resourceSharingIndexHandler = resourceSharingIndexHandler;
         this.adminDNs = adminDns;
         this.privilegesEvaluator = evaluator;