Add test prefix to multi_project setting (#1960)

tvernum · web-flow · commit ffe5d6124c4f · 2025-02-25T09:51:29.000+11:00
This changes the `multi_project.enabled` setting to
`test.multi_project.enabled`
diff --git a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsMultiProjectIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsMultiProjectIT.java
@@ -36,7 +36,7 @@ public class ClusterStatsMultiProjectIT extends MultiProjectRestTestCase {
         .nodes(1)
         .distribution(DistributionType.INTEG_TEST)
         .module("test-multi-project")
-        .setting("multi_project.enabled", "true")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.enabled", "true")
         .user("admin", PASSWORD)
         .build();
diff --git a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/action/admin/indices/IndexMultiProjectCRUDIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/action/admin/indices/IndexMultiProjectCRUDIT.java
@@ -48,7 +48,7 @@ private static ElasticsearchCluster createCluster() {
             .nodes(NODE_NUM)
             .distribution(DistributionType.INTEG_TEST) // TODO multi-project: make this test suite work under the default distrib
             .module("test-multi-project")
-            .setting("multi_project.enabled", "true")
+            .setting("test.multi_project.enabled", "true")
             .setting("xpack.security.enabled", "false") // TODO multi-project: make this test suite work with Security enabled
             .setting("xpack.ml.enabled", "false"); // TODO multi-project: make this test suite work with ML enabled
         return clusterBuilder.build();
diff --git a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/action/index/IndexDocumentMultiProjectIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/action/index/IndexDocumentMultiProjectIT.java
@@ -44,7 +44,7 @@ private static ElasticsearchCluster createCluster() {
             .nodes(NODE_NUM)
             .distribution(DistributionType.INTEG_TEST) // TODO multi-project: make this test suite work under the default distrib
             .module("test-multi-project")
-            .setting("multi_project.enabled", "true")
+            .setting("test.multi_project.enabled", "true")
             .setting("xpack.security.enabled", "false") // TODO multi-project: make this test suite work with Security enabled
             .setting("xpack.ml.enabled", "false"); // TODO multi-project: make this test suite work with ML enabled
         return clusterBuilder.build();
diff --git a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/MultiProjectClusterStateActionIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/MultiProjectClusterStateActionIT.java
@@ -26,7 +26,7 @@ public class MultiProjectClusterStateActionIT extends MultiProjectRestTestCase {
     @ClassRule
     public static ElasticsearchCluster CLUSTER = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
-        .setting("multi_project.enabled", "true")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.http.ssl.enabled", "false")
         .setting("xpack.security.enabled", "false")
         .build();
diff --git a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/MultiProjectRestartIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/MultiProjectRestartIT.java
@@ -24,7 +24,7 @@ public class MultiProjectRestartIT extends MultiProjectRestTestCase {
     @ClassRule
     public static ElasticsearchCluster CLUSTER = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
-        .setting("multi_project.enabled", "true")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.http.ssl.enabled", "false")
         .setting("xpack.security.enabled", "false")
         .build();
diff --git a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/action/DeleteProjectActionIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/action/DeleteProjectActionIT.java
@@ -20,7 +20,7 @@ public class DeleteProjectActionIT extends ESRestTestCase {
     @ClassRule
     public static ElasticsearchCluster CLUSTER = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
-        .setting("multi_project.enabled", "true")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.enabled", "false")
         .build();
 
diff --git a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java
@@ -42,7 +42,7 @@ public class SecurityRolesMultiProjectIT extends MultiProjectRestTestCase {
         .nodes(1)
         .distribution(DistributionType.DEFAULT)
         .module("test-multi-project")
-        .setting("multi_project.enabled", "true")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.enabled", "true")
         .user("admin", PASSWORD)
         .rolesFile(rolesFile)
diff --git a/test/external-modules/multi-project/src/main/java/org/elasticsearch/multiproject/TestOnlyMultiProjectPlugin.java b/test/external-modules/multi-project/src/main/java/org/elasticsearch/multiproject/TestOnlyMultiProjectPlugin.java
@@ -44,7 +44,7 @@
 public class TestOnlyMultiProjectPlugin extends Plugin implements ActionPlugin {
 
     public static final Setting<Boolean> MULTI_PROJECT_ENABLED = Setting.boolSetting(
-        "multi_project.enabled",
+        "test.multi_project.enabled",
         false,
         Setting.Property.NodeScope
     );
diff --git a/test/external-modules/multi-project/src/test/java/org/elasticsearch/multiproject/TestOnlyMultiProjectResolverFactoryTests.java b/test/external-modules/multi-project/src/test/java/org/elasticsearch/multiproject/TestOnlyMultiProjectResolverFactoryTests.java
@@ -23,7 +23,7 @@
 public class TestOnlyMultiProjectResolverFactoryTests extends ESTestCase {
 
     public void testMultiProjectEnabled() {
-        final Settings settings = Settings.builder().put("multi_project.enabled", true).build();
+        final Settings settings = Settings.builder().put("test.multi_project.enabled", true).build();
         var plugin = new TestOnlyMultiProjectPlugin(settings);
         var pluginServices = mock(Plugin.PluginServices.class);
         when(pluginServices.threadPool()).thenReturn(mock(ThreadPool.class));
@@ -33,7 +33,7 @@ public void testMultiProjectEnabled() {
     }
 
     public void testMultiProjectDisabled() {
-        final Settings settings = randomBoolean() ? Settings.EMPTY : Settings.builder().put("multi_project.enabled", false).build();
+        final Settings settings = randomBoolean() ? Settings.EMPTY : Settings.builder().put("test.multi_project.enabled", false).build();
         var plugin = new TestOnlyMultiProjectPlugin(settings);
         var pluginServices = mock(Plugin.PluginServices.class);
         when(pluginServices.threadPool()).thenReturn(mock(ThreadPool.class));
diff --git a/x-pack/plugin/security/qa/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtMultiProjectIT.java b/x-pack/plugin/security/qa/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtMultiProjectIT.java
@@ -50,7 +50,7 @@ public class JwtMultiProjectIT extends ESRestTestCase {
         .nodes(1)
         .distribution(DistributionType.DEFAULT)
         .module("test-multi-project")
-        .setting("multi_project.enabled", "true")
+        .setting("test.multi_project.enabled", "true")
         .configFile("jwkset.json", Resource.fromClasspath("jwk/jwkset.json"))
         .setting("xpack.ml.enabled", "false")
         .setting("xpack.license.self_generated.type", "trial")
diff --git a/x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/CoreWithMultipleProjectsClientYamlTestSuiteIT.java b/x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/CoreWithMultipleProjectsClientYamlTestSuiteIT.java
@@ -37,7 +37,7 @@ public class CoreWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProje
         .module("test-multi-project")
         .module("lang-mustache")
         .module("parent-join")
-        .setting("multi_project.enabled", "true")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.enabled", "true")
         .setting("xpack.watcher.enabled", "false")
         .setting("xpack.ml.enabled", "false")
diff --git a/x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java b/x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/src/yamlRestTest/java/org/elasticsearch/multiproject/test/XpackWithMultipleProjectsClientYamlTestSuiteIT.java
@@ -26,7 +26,7 @@ public class XpackWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProj
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
         .name("yamlRestTest")
-        .setting("multi_project.enabled", "true")
+        .setting("test.multi_project.enabled", "true")
         .setting("xpack.ml.enabled", "true")
         .setting("xpack.security.enabled", "true")
         .setting("xpack.watcher.enabled", "false")
diff --git a/x-pack/qa/smoke-test-plugins/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml b/x-pack/qa/smoke-test-plugins/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml
@@ -10,7 +10,5 @@
     - do:
         nodes.info: {}
 
-    - is_false: nodes.$master.settings.multi_project.enabled
-
     - length: { nodes.$master.plugins: @expected.plugins.count@ }
     # TODO: check that every plugin is installed
