Fix conflicts

Signed-off-by: Craig Perkins <[email protected]>

Author: cwperks

sample-resource-plugin/src/integrationTest/java/org/opensearch/sample/resource/TestUtils.java

@@ -96,8 +96,6 @@ public final class TestUtils {
     public static final String SAMPLE_RESOURCE_GROUP_DELETE_ENDPOINT = SAMPLE_RESOURCE_PLUGIN_PREFIX + "/group/delete";
     public static final String SAMPLE_RESOURCE_GROUP_SEARCH_ENDPOINT = SAMPLE_RESOURCE_PLUGIN_PREFIX + "/group/search";
 
-    public static final String SAMPLE_ADD_RESOURCE_TO_GROUP_ENDPOINT = SAMPLE_RESOURCE_PLUGIN_PREFIX + "/group/add";
-
     public static final String RESOURCE_SHARING_MIGRATION_ENDPOINT = "_plugins/_security/api/resources/migrate";
     public static final String SECURITY_SHARE_ENDPOINT = "_plugins/_security/api/resource/share";
     public static final String SECURITY_TYPES_ENDPOINT = "_plugins/_security/api/resource/types";
@@ -355,7 +353,7 @@ public String createSampleResourceAs(TestSecurityConfig.User user, Header... hea
 
         public String createSampleResourceWithGroupAs(TestSecurityConfig.User user, String groupId, Header... headers) {
             try (TestRestClient client = cluster.getRestClient(user)) {
-                String sample = "{\"group_id\":\"" + groupId + "\", \"name\":\"sample\"}";
+                String sample = "{\"group_id\":\"" + groupId + "\", \"name\":\"sample\",\"resource_type\":\"" + RESOURCE_TYPE + "\"}";
                 TestRestClient.HttpResponse resp = client.putJson(SAMPLE_RESOURCE_CREATE_ENDPOINT, sample, headers);
                 resp.assertStatusCode(HttpStatus.SC_OK);
                 return resp.getTextFromJsonBody("/message").split(":")[1].trim();

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

@@ -360,8 +360,9 @@ public OpenSearchSecurityPlugin(final Settings settings, final Path configPath)
 
         // dynamic settings
         transportPassiveAuthSetting = new TransportPassiveAuthSetting(settings);
-        resourceSharingEnabledSetting = new ResourceSharingFeatureFlagSetting(settings, resourcePluginInfo);
-        resourceSharingProtectedResourceTypesSetting = new ResourceSharingProtectedResourcesSetting(settings, resourcePluginInfo);
+        resourceSharingEnabledSetting = new ResourceSharingFeatureFlagSetting(settings, resourcePluginInfo); // not filtered
+        resourceSharingProtectedResourceTypesSetting = new ResourceSharingProtectedResourcesSetting(settings, resourcePluginInfo); // not
+                                                                                                                                   // filtered
         resourcePluginInfo.setProtectedTypesSetting(resourceSharingProtectedResourceTypesSetting);
 
         if (disabled) {

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

@@ -72,11 +72,10 @@ public void postIndex(ShardId shardId, Engine.Index index, Engine.IndexResult re
             return;
         }
 
-        String resourceType = resourcePluginInfo.getResourceTypeForIndexOp(resourceIndex, index);
-        ResourceProvider provider = resourcePluginInfo.getResourceProvider(resourceType);
-
         log.debug("postIndex called on {}", resourceIndex);
 
+        String resourceType = resourcePluginInfo.getResourceTypeForIndexOp(resourceIndex, index);
+
         String resourceId = index.id();
         ResourceProvider provider = resourcePluginInfo.getResourceProvider(resourceType);
         if (provider == null) {
@@ -130,6 +129,7 @@ public void postIndex(ShardId shardId, Engine.Index index, Engine.IndexResult re
                     .parentId(ResourcePluginInfo.extractFieldFromIndexOp(provider.parentIdField(), index));
             }
             ResourceSharing sharingInfo = builder.build();
+            // User.getRequestedTenant() is null if multi-tenancy is disabled
 
             this.resourceSharingIndexHandler.indexResourceSharing(resourceIndex, sharingInfo, listener);
 

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

@@ -103,7 +103,6 @@ public void updateProtectedTypes(List<String> protectedTypes) {
             typeToProvider.clear();
 
             if (protectedTypes == null || protectedTypes.isEmpty()) {
-                // No protected types -> leave maps empty
                 return;
             }