Add ShareWithAction to security plugin

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Dec 17, 2024 · c9cf55f · c9cf55f
1 parent 981446a
commit c9cf55f
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 389 deletions.
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
@@ -228,12 +228,12 @@
     <property name="severity" value="error"/>
   </module>
 
-  <module name="RegexpSingleline">
-    <property name="format" value="extension"/>
-    <property name="ignoreCase" value="true"/>
-    <property name="message" value="Extension should only be used sparingly to keep implementations as generic as possible" />
-    <property name="severity" value="error"/>
-  </module>
+<!--  <module name="RegexpSingleline">-->
+<!--    <property name="format" value="extension"/>-->
+<!--    <property name="ignoreCase" value="true"/>-->
+<!--    <property name="message" value="Extension should only be used sparingly to keep implementations as generic as possible" />-->
+<!--    <property name="severity" value="error"/>-->
+<!--  </module>-->
 
   <module name="SuppressWithPlainTextCommentFilter">
     <property name="offCommentFormat" value="CS-SUPPRESS-ALL: .+"/> <!-- Require an explaination after surpressing -->

diff --git a/...n-plugin/src/main/java/org/opensearch/security/sampleextension/SampleExtensionPlugin.java b/...n-plugin/src/main/java/org/opensearch/security/sampleextension/SampleExtensionPlugin.java
@@ -47,9 +47,6 @@
 import org.opensearch.security.sampleextension.actions.list.ListSampleResourceAction;
 import org.opensearch.security.sampleextension.actions.list.ListSampleResourceRestAction;
 import org.opensearch.security.sampleextension.actions.list.ListSampleResourceTransportAction;
-import org.opensearch.security.sampleextension.actions.sharing.UpdateSampleResourceSharingAction;
-import org.opensearch.security.sampleextension.actions.sharing.UpdateSampleResourceSharingRestAction;
-import org.opensearch.security.sampleextension.actions.sharing.UpdateSampleResourceSharingTransportAction;
 import org.opensearch.security.sampleextension.actions.update.UpdateSampleResourceAction;
 import org.opensearch.security.sampleextension.actions.update.UpdateSampleResourceRestAction;
 import org.opensearch.security.sampleextension.actions.update.UpdateSampleResourceTransportAction;
@@ -117,8 +114,7 @@ public List<RestHandler> getRestHandlers(
             new CreateSampleResourceRestAction(),
             new GetSampleResourceRestAction(),
             new ListSampleResourceRestAction(),
-            new UpdateSampleResourceRestAction(),
-            new UpdateSampleResourceSharingRestAction()
+            new UpdateSampleResourceRestAction()
         );
     }
 
@@ -128,7 +124,6 @@ public List<RestHandler> getRestHandlers(
             new ActionHandler<>(CreateSampleResourceAction.INSTANCE, CreateSampleResourceTransportAction.class),
             new ActionHandler<>(GetSampleResourceAction.INSTANCE, GetSampleResourceTransportAction.class),
             new ActionHandler<>(ListSampleResourceAction.INSTANCE, ListSampleResourceTransportAction.class),
-            new ActionHandler<>(UpdateSampleResourceSharingAction.INSTANCE, UpdateSampleResourceSharingTransportAction.class),
             new ActionHandler<>(UpdateSampleResourceAction.INSTANCE, UpdateSampleResourceTransportAction.class)
         );
     }

diff --git a/...pensearch/security/sampleextension/actions/sharing/UpdateSampleResourceSharingAction.java b/...pensearch/security/sampleextension/actions/sharing/UpdateSampleResourceSharingAction.java
diff --git a/...earch/security/sampleextension/actions/sharing/UpdateSampleResourceSharingRestAction.java b/...earch/security/sampleextension/actions/sharing/UpdateSampleResourceSharingRestAction.java
diff --git a/.../security/sampleextension/actions/sharing/UpdateSampleResourceSharingTransportAction.java b/.../security/sampleextension/actions/sharing/UpdateSampleResourceSharingTransportAction.java
diff --git a/...plugin/src/test/java/org/opensearch/security/sampleextension/SampleExtensionPluginIT.java b/...plugin/src/test/java/org/opensearch/security/sampleextension/SampleExtensionPluginIT.java
@@ -120,7 +120,7 @@ public void testCreateSampleResource() throws IOException, InterruptedException
         ).map();
         System.out.println("resourceSharingResponse: " + resourceSharingResponseMap);
 
-        Request updateSharingRequest = new Request("PUT", "/_plugins/resource_sharing_example/resource/update_sharing/" + resourceId);
+        Request updateSharingRequest = new Request("PUT", "/_plugins/_security/resource/sample_resource/" + resourceId + "/share_with");
         updateSharingRequest.setEntity(
             new StringEntity("{\"share_with\":{\"users\": [\"admin\"], \"backend_roles\": [], \"allowed_actions\": [\"*\"]}}")
         );

diff --git a/...java/org/opensearch/security/spi/actions/sharing/update/UpdateResourceSharingRequest.java b/...java/org/opensearch/security/spi/actions/sharing/update/UpdateResourceSharingRequest.java
diff --git a/...ava/org/opensearch/security/spi/actions/sharing/update/UpdateResourceSharingResponse.java b/...ava/org/opensearch/security/spi/actions/sharing/update/UpdateResourceSharingResponse.java