Move synonym analyzer REST tests to synonyms API

carlosdelest · Jul 12, 2023 · b13a99a · b13a99a
1 parent 9f501a2
commit b13a99a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/modules/analysis-common/build.gradle b/modules/analysis-common/build.gradle
@@ -19,7 +19,7 @@ esplugin {
 
 restResources {
   restApi {
-    include '_common', 'indices', 'index', 'cluster', 'search', 'nodes', 'bulk', 'termvectors', 'explain', 'count', 'synonyms.put', 'synonyms.delete', 'synonym_rule.put'
+    include '_common', 'indices', 'index', 'cluster', 'search', 'nodes', 'bulk', 'termvectors', 'explain', 'count'
   }
 }
 

diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle
@@ -37,6 +37,7 @@ dependencies {
   clusterModules project(":modules:mapper-extras")
   clusterModules project(":modules:rest-root")
   clusterModules project(":modules:reindex")
+  clusterModules project(':modules:analysis-common')
 }
 
 testClusters.configureEach {

diff --git a/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java b/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java
@@ -30,6 +30,7 @@ public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
         .module("mapper-extras")
         .module("rest-root")
         .module("reindex")
+        .module("analysis-common")
         .feature(FeatureFlag.TIME_SERIES_MODE)
         .feature(FeatureFlag.DATA_STREAM_LIFECYCLE_ENABLED)
         .feature(FeatureFlag.SYNONYMS_ENABLED)

diff --git a/...nalysis-common/70_synonyms_from_index.yml → .../test/synonyms/80_synonyms_from_index.yml b/...nalysis-common/70_synonyms_from_index.yml → .../test/synonyms/80_synonyms_from_index.yml
diff --git a/...mmon/80_synonyms_reloading_for_synset.yml → ...nyms/90_synonyms_reloading_for_synset.yml b/...mmon/80_synonyms_reloading_for_synset.yml → ...nyms/90_synonyms_reloading_for_synset.yml
diff --git a/...k/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/user/InternalUsers.java b/...k/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/user/InternalUsers.java
@@ -178,7 +178,12 @@ public class InternalUsers {
             UsernamesField.SYNONYMS_ROLE_NAME,
             null,
             new RoleDescriptor.IndicesPrivileges[] {
-                RoleDescriptor.IndicesPrivileges.builder().indices(".synonyms*").privileges("all").allowRestrictedIndices(true).build() },
+                RoleDescriptor.IndicesPrivileges.builder()
+                    .indices(".synonyms*").privileges("all").allowRestrictedIndices(true).build()
+                // Need manage privilege to be able to reload index analyzers for all indices
+//                RoleDescriptor.IndicesPrivileges.builder()
+//                    .indices("*").privileges("manage").build(),
+            },
             null,
             null,
             null,