update actions

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
opensearch-project · Jun 14, 2023 · 777ba97 · 777ba97
1 parent f0ff432
commit 777ba97
Show file tree

Hide file tree

Showing 268 changed files with 415 additions and 1,158 deletions.
diff --git a/...ainless/src/main/java/org/opensearch/painless/action/PainlessContextClassBindingInfo.java b/...ainless/src/main/java/org/opensearch/painless/action/PainlessContextClassBindingInfo.java
@@ -156,13 +156,13 @@ public String toString() {
         return "PainlessContextClassBindingInfo{"
             + "declaring='"
             + declaring
-            + '\''
+            + '\
             + ", name='"
             + name
-            + '\''
+            + '\
             + ", rtn='"
             + rtn
-            + '\''
+            + '\
             + ", readOnly="
             + readOnly
             + ", parameters="

diff --git a/.../lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextClassInfo.java b/.../lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextClassInfo.java
@@ -213,7 +213,7 @@ public String toString() {
         return "PainlessContextClassInfo{"
             + "name='"
             + name
-            + '\''
+            + '\
             + ", imported="
             + imported
             + ", constructors="

diff --git a/...painless/src/main/java/org/opensearch/painless/action/PainlessContextConstructorInfo.java b/...painless/src/main/java/org/opensearch/painless/action/PainlessContextConstructorInfo.java
@@ -125,7 +125,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "PainlessContextConstructorInfo{" + "declaring='" + declaring + '\'' + ", parameters=" + parameters + '}';
+        return "PainlessContextConstructorInfo{" + "declaring='" + declaring + '\ + ", parameters=" + parameters + '}';
     }
 
     public String getDeclaring() {

diff --git a/.../lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextFieldInfo.java b/.../lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextFieldInfo.java
@@ -128,7 +128,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "PainlessContextFieldInfo{" + "declaring='" + declaring + '\'' + ", name='" + name + '\'' + ", type='" + type + '\'' + '}';
+        return "PainlessContextFieldInfo{" + "declaring='" + declaring + '\ + ", name='" + name + '\ + ", type='" + type + '\ + '}';
     }
 
     public String getDeclaring() {

diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInfo.java
@@ -226,7 +226,7 @@ public String toString() {
         return "PainlessContextInfo{"
             + "name='"
             + name
-            + '\''
+            + '\
             + ", classes="
             + classes
             + ", importedMethods="

diff --git a/...less/src/main/java/org/opensearch/painless/action/PainlessContextInstanceBindingInfo.java b/...less/src/main/java/org/opensearch/painless/action/PainlessContextInstanceBindingInfo.java
@@ -148,13 +148,13 @@ public String toString() {
         return "PainlessContextInstanceBindingInfo{"
             + "declaring='"
             + declaring
-            + '\''
+            + '\
             + ", name='"
             + name
-            + '\''
+            + '\
             + ", rtn='"
             + rtn
-            + '\''
+            + '\
             + ", parameters="
             + parameters
             + '}';

diff --git a/...lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextMethodInfo.java b/...lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextMethodInfo.java
@@ -147,13 +147,13 @@ public String toString() {
         return "PainlessContextMethodInfo{"
             + "declaring='"
             + declaring
-            + '\''
+            + '\
             + ", name='"
             + name
-            + '\''
+            + '\
             + ", rtn='"
             + rtn
-            + '\''
+            + '\
             + ", parameters="
             + parameters
             + '}';

diff --git a/...les/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java b/...les/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java
@@ -251,7 +251,7 @@ public String toString() {
                 return "ContextSetup{"
                     + ", index='"
                     + index
-                    + '\''
+                    + '\
                     + ", document="
                     + document
                     + ", query="

diff --git a/plugins/identity-shiro/src/test/java/org/opensearch/identity/shiro/ShiroSubjectTests.java b/plugins/identity-shiro/src/test/java/org/opensearch/identity/shiro/ShiroSubjectTests.java
@@ -81,15 +81,15 @@ public void testGetPrincipal_otherType() {
 
     public void testSetAndGetScopesShouldPass() {
 
-        List<Scope> testScopes = List.of(ActionScope.INDEX_READ);
+        List<Scope> testScopes = List.of(ActionScope.READ);
         // Set scopes for a subject
         subject.setScopes(testScopes);
         assertEquals(subject.getScopes(), testScopes);
 
-        List<Scope> testScopes2 = List.of(ActionScope.INDEX_SEARCH);
+        List<Scope> testScopes2 = List.of(ActionScope.ALL);
         subject.setScopes(testScopes2);
         assertEquals(subject.getScopes(), testScopes2);
-        assertFalse(subject.getScopes().contains(ActionScope.INDEX_READ)); // Verify that setScopes overwrites completely
+        assertFalse(subject.getScopes().contains(ActionScope.READ)); // Verify that setScopes overwrites completely
     }
 
     public void testSetScopeGetActionAreaName() {
@@ -98,14 +98,14 @@ public void testSetScopeGetActionAreaName() {
         assertEquals(ActionScope.ALL.getArea(), ScopeEnums.ScopeArea.ALL);
         assertEquals(ActionScope.ALL.getNamespace(), ScopeEnums.ScopeNamespace.ACTION);
 
-        assertEquals(ActionScope.INDEX_READ.getAction(), "READ");
-        assertEquals(ActionScope.INDEX_READ.getArea(), ScopeEnums.ScopeArea.INDEX);
-        assertEquals(ActionScope.INDEX_READ.getNamespace(), ScopeEnums.ScopeNamespace.ACTION);
+        assertEquals(ActionScope.READ.getAction(), "READ");
+        assertEquals(ActionScope.READ.getArea(), ScopeEnums.ScopeArea.INDEX);
+        assertEquals(ActionScope.READ.getNamespace(), ScopeEnums.ScopeNamespace.ACTION);
     }
 
     public void testIsAllowedShouldPass() {
 
-        List<Scope> testScopes = List.of(ActionScope.INDEX_READ);
+        List<Scope> testScopes = List.of(ActionScope.READ);
         // Set scopes for a subject
         subject.setScopes(testScopes);
         assertEquals(subject.getScopes(), testScopes);
@@ -118,7 +118,7 @@ public void testIsAllowedShouldPass() {
 
     public void testIsAllowedShouldFail() {
 
-        List<Scope> testScopes = List.of(ActionScope.INDEX_READ);
+        List<Scope> testScopes = List.of(ActionScope.READ);
         // Set scopes for a subject
         subject.setScopes(testScopes);
         assertEquals(subject.getScopes(), testScopes);

diff --git a/server/src/main/java/org/opensearch/action/ActionScope.java b/server/src/main/java/org/opensearch/action/ActionScope.java
@@ -18,12 +18,7 @@
  */
 public enum ActionScope implements Scope {
     ALL(ScopeArea.ALL, "ALL"),
-    CLUSTER_READ(ScopeArea.CLUSTER, "READ"),
-    CLUSTER_ALL(ScopeArea.ALL, "ALL"),
-    INDEX_READ(ScopeArea.INDEX, "READ"),
-    INDEX_READWRITE(ScopeArea.INDEX, "READWRITE"),
-    INDEX_SEARCH(ScopeArea.INDEX, "SEARCH"),
-    INDEX_ALL(ScopeArea.INDEX, "ALL");
+    READ(ScopeArea.ALL, "READ");
 
     public final ScopeArea area;
     public final String action;

diff --git a/server/src/main/java/org/opensearch/action/ActionType.java b/server/src/main/java/org/opensearch/action/ActionType.java
@@ -90,7 +90,8 @@ public int hashCode() {
         return name.hashCode();
     }
 
-    public List<Scope> allowedScopes() {
+    public List<Scope>
+    allowedScopes() {
         return Collections.emptyList();
     }
 }
diff --git a/...n/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java b/...n/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java
@@ -51,8 +51,5 @@ private ClusterAllocationExplainAction() {
         super(NAME, ClusterAllocationExplainResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...va/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsAction.java b/...va/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsAction.java
@@ -48,9 +48,4 @@ public final class AddVotingConfigExclusionsAction extends ActionType<AddVotingC
     private AddVotingConfigExclusionsAction() {
         super(NAME, AddVotingConfigExclusionsResponse::new);
     }
-
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
 }
diff --git a/.../org/opensearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsAction.java b/.../org/opensearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsAction.java
@@ -49,8 +49,5 @@ private ClearVotingConfigExclusionsAction() {
         super(NAME, ClearVotingConfigExclusionsResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...rch/action/admin/cluster/decommission/awareness/delete/DeleteDecommissionStateAction.java b/...rch/action/admin/cluster/decommission/awareness/delete/DeleteDecommissionStateAction.java
@@ -26,8 +26,5 @@ private DeleteDecommissionStateAction() {
         super(NAME, DeleteDecommissionStateResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...pensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionStateAction.java b/...pensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionStateAction.java
@@ -27,8 +27,5 @@ private GetDecommissionStateAction() {
         super(NAME, GetDecommissionStateResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...va/org/opensearch/action/admin/cluster/decommission/awareness/put/DecommissionAction.java b/...va/org/opensearch/action/admin/cluster/decommission/awareness/put/DecommissionAction.java
@@ -26,8 +26,5 @@ private DecommissionAction() {
         super(NAME, DecommissionResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthAction.java
@@ -51,8 +51,5 @@ private ClusterHealthAction() {
         super(NAME, ClusterHealthResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/.../main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java b/.../main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java
@@ -51,8 +51,5 @@ private NodesHotThreadsAction() {
         super(NAME, NodesHotThreadsResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodesInfoAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodesInfoAction.java
@@ -51,8 +51,5 @@ private NodesInfoAction() {
         super(NAME, NodesInfoResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsAction.java b/...java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsAction.java
@@ -51,8 +51,5 @@ private NodesReloadSecureSettingsAction() {
         super(NAME, NodesReloadSecureSettingsResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodesStatsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodesStatsAction.java
@@ -51,8 +51,5 @@ private NodesStatsAction() {
         super(NAME, NodesStatsResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...rc/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java b/...rc/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java
@@ -51,8 +51,5 @@ private CancelTasksAction() {
         super(NAME, CancelTasksResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskAction.java
@@ -52,8 +52,5 @@ private GetTaskAction() {
         super(NAME, GetTaskResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...er/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/ListTasksAction.java b/...er/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/ListTasksAction.java
@@ -51,9 +51,6 @@ private ListTasksAction() {
         super(NAME, ListTasksResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageAction.java
@@ -51,8 +51,5 @@ protected NodesUsageAction() {
         super(NAME, NodesUsageResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoAction.java
@@ -51,8 +51,5 @@ public RemoteInfoAction() {
         super(NAME, RemoteInfoResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...ava/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreAction.java b/...ava/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreAction.java
@@ -27,8 +27,5 @@ private RestoreRemoteStoreAction() {
         super(NAME, RestoreRemoteStoreResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...in/java/org/opensearch/action/admin/cluster/remotestore/stats/RemoteStoreStatsAction.java b/...in/java/org/opensearch/action/admin/cluster/remotestore/stats/RemoteStoreStatsAction.java
@@ -27,8 +27,5 @@ private RemoteStoreStatsAction() {
         super(NAME, RemoteStoreStatsResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...ava/org/opensearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryAction.java b/...ava/org/opensearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryAction.java
@@ -50,8 +50,5 @@ private CleanupRepositoryAction() {
         super(NAME, CleanupRepositoryResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/.../java/org/opensearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java b/.../java/org/opensearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java
@@ -52,9 +52,6 @@ private DeleteRepositoryAction() {
         super(NAME, AcknowledgedResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 
 }
diff --git a/...main/java/org/opensearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java b/...main/java/org/opensearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java
@@ -51,8 +51,5 @@ private GetRepositoriesAction() {
         super(NAME, GetRepositoriesResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_Read, ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }
diff --git a/...c/main/java/org/opensearch/action/admin/cluster/repositories/put/PutRepositoryAction.java b/...c/main/java/org/opensearch/action/admin/cluster/repositories/put/PutRepositoryAction.java
@@ -52,9 +52,6 @@ private PutRepositoryAction() {
         super(NAME, AcknowledgedResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 
 }
diff --git a/.../java/org/opensearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java b/.../java/org/opensearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java
@@ -51,8 +51,5 @@ private VerifyRepositoryAction() {
         super(NAME, VerifyRepositoryResponse::new);
     }
 
-    @Override
-    public List<Scope> allowedScopes() {
-        return List.of(ActionScope.Cluster_ALL, ActionScope.ALL);
-    }
+
 }