Fix some more tests

nielsbauman · nielsbauman · commit 96168907fd81 · 2025-05-01T17:07:18.000+02:00
diff --git a/test/external-modules/multi-project/build.gradle b/test/external-modules/multi-project/build.gradle
@@ -20,4 +20,5 @@ tasks.withType(StandaloneRestIntegTestTask).configureEach {
 
 tasks.named("javaRestTest").configure {
   enabled = buildParams.snapshotBuild
+  systemProperty "tests.multi_project.enabled", true
 }
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
@@ -35,8 +35,6 @@ public class ClusterStatsMultiProjectIT extends MultiProjectRestTestCase {
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .nodes(1)
         .distribution(DistributionType.INTEG_TEST)
-        .module("test-multi-project")
-        .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
@@ -19,7 +19,6 @@
 import org.elasticsearch.multiproject.MultiProjectRestTestCase;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.local.LocalClusterSpecBuilder;
-import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.elasticsearch.xcontent.ObjectPath;
 import org.elasticsearch.xcontent.json.JsonXContent;
 import org.junit.ClassRule;
@@ -46,9 +45,6 @@ public class IndexMultiProjectCRUDIT extends MultiProjectRestTestCase {
     private static ElasticsearchCluster createCluster() {
         LocalClusterSpecBuilder<ElasticsearchCluster> clusterBuilder = ElasticsearchCluster.local()
             .nodes(NODE_NUM)
-            .distribution(DistributionType.INTEG_TEST) // TODO multi-project: make this test suite work under the default distrib
-            .module("test-multi-project")
-            .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
@@ -17,7 +17,6 @@
 import org.elasticsearch.multiproject.MultiProjectRestTestCase;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.local.LocalClusterSpecBuilder;
-import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.rules.TestName;
@@ -42,9 +41,6 @@ public class IndexDocumentMultiProjectIT extends MultiProjectRestTestCase {
     private static ElasticsearchCluster createCluster() {
         LocalClusterSpecBuilder<ElasticsearchCluster> clusterBuilder = ElasticsearchCluster.local()
             .nodes(NODE_NUM)
-            .distribution(DistributionType.INTEG_TEST) // TODO multi-project: make this test suite work under the default distrib
-            .module("test-multi-project")
-            .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,6 @@ public class MultiProjectClusterStateActionIT extends MultiProjectRestTestCase {
     @ClassRule
     public static ElasticsearchCluster CLUSTER = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
-        .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/MultiProjectRestTestCase.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/MultiProjectRestTestCase.java
@@ -11,77 +11,32 @@
 
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.Response;
-import org.elasticsearch.client.ResponseException;
-import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.test.rest.ESRestTestCase;
-import org.elasticsearch.xcontent.ObjectPath;
 import org.junit.After;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 public abstract class MultiProjectRestTestCase extends ESRestTestCase {
-    protected static Request setRequestProjectId(Request request, String projectId) {
-        RequestOptions.Builder options = request.getOptions().toBuilder();
-        options.removeHeader(Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER);
-        options.addHeader(Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER, projectId);
-        request.setOptions(options);
-        return request;
-    }
-
-    protected static void clearRequestProjectId(Request request) {
-        RequestOptions options = request.getOptions();
-        if (options.containsHeader(Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER)) {
-            request.setOptions(options.toBuilder().removeHeader(Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER).build());
-        }
-    }
-
-    protected void createProject(String projectId) throws IOException {
-        Request request = new Request("PUT", "/_project/" + projectId);
-        try {
-            Response response = adminClient().performRequest(request);
-            assertOK(response);
-            logger.info("Created project {} : {}", projectId, response.getStatusLine());
-        } catch (ResponseException e) {
-            logger.error("Failed to create project: {}", projectId);
-            throw e;
-        }
-    }
-
-    protected void deleteProject(String projectId) throws IOException {
-        final Request request = new Request("DELETE", "/_project/" + projectId);
-        try {
-            final Response response = adminClient().performRequest(request);
-            logger.info("Deleted project {} : {}", projectId, response.getStatusLine());
-        } catch (ResponseException e) {
-            logger.error("Failed to delete project: {}", projectId);
-            throw e;
-        }
-    }
 
-    protected Set<String> listProjects() throws IOException {
-        final Request request = new Request("GET", "/_cluster/state/metadata?multi_project");
-        final Response response = adminClient().performRequest(request);
-        final List<Map<String, ?>> projects = ObjectPath.eval("metadata.projects", entityAsMap(response));
-        return projects.stream().map(m -> String.valueOf(m.get("id"))).collect(Collectors.toSet());
+    @Override
+    protected boolean shouldConfigureProjects() {
+        return false;
     }
 
     @After
     public void removeNonDefaultProjects() throws IOException {
         if (preserveClusterUponCompletion() == false) {
-            final Set<String> projects = listProjects();
-            logger.info("Removing non-default projects from {}", projects);
-            for (String projectId : projects) {
-                if (projectId.equals(Metadata.DEFAULT_PROJECT_ID.id()) == false) {
-                    deleteProject(projectId);
-                }
-            }
+            cleanUpProjects();
         }
     }
 
+    protected static Request setRequestProjectId(Request request, String projectId) {
+        RequestOptions.Builder options = request.getOptions().toBuilder();
+        options.removeHeader(Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER);
+        options.addHeader(Task.X_ELASTIC_PROJECT_ID_HTTP_HEADER, projectId);
+        request.setOptions(options);
+        return request;
+    }
+
 }
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,6 @@ public class MultiProjectRestartIT extends MultiProjectRestTestCase {
     @ClassRule
     public static ElasticsearchCluster CLUSTER = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
-        .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/ProjectCrudActionIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/multiproject/action/ProjectCrudActionIT.java
@@ -12,9 +12,9 @@
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
+import org.elasticsearch.multiproject.MultiProjectRestTestCase;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.local.distribution.DistributionType;
-import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.test.rest.ObjectPath;
 import org.junit.ClassRule;
 
@@ -31,12 +31,11 @@
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.not;
 
-public class ProjectCrudActionIT extends ESRestTestCase {
+public class ProjectCrudActionIT extends MultiProjectRestTestCase {
 
     @ClassRule
     public static ElasticsearchCluster CLUSTER = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
-        .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
@@ -41,8 +41,6 @@ public class SecurityRolesMultiProjectIT extends MultiProjectRestTestCase {
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .nodes(1)
         .distribution(DistributionType.DEFAULT)
-        .module("test-multi-project")
-        .setting("test.multi_project.enabled", "true")
         .setting("xpack.security.enabled", "true")
         .user("admin", PASSWORD)
         .rolesFile(rolesFile)
diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
@@ -369,7 +369,7 @@ public static void initializeProjectIds() {
         // The active project-id is slightly longer, and has a fixed prefix so that it's easier to pick in error messages etc.
         activeProject = "active00" + randomAlphaOfLength(8).toLowerCase(Locale.ROOT);
         extraProjects = randomSet(1, 3, () -> randomAlphaOfLength(12).toLowerCase(Locale.ROOT));
-        multiProjectEnabled = Boolean.parseBoolean(System.getProperty("test.multi_project.enabled"));
+        multiProjectEnabled = Boolean.parseBoolean(System.getProperty("tests.multi_project.enabled"));
     }
 
     @Before
diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/MultiProjectEnabledClusterConfigProvider.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/MultiProjectEnabledClusterConfigProvider.java
@@ -14,7 +14,7 @@ public class MultiProjectEnabledClusterConfigProvider implements LocalClusterCon
     @Override
     public void apply(LocalClusterSpecBuilder<?> builder) {
         if (isMultiProjectEnabled()) {
-            builder.setting("test.multi_project.enabled", "true");
+            builder.setting("test.multi_project.enabled", "true").module("test-multi-project");
         }
     }
 
diff --git a/x-pack/plugin/security/qa/multi-project/build.gradle b/x-pack/plugin/security/qa/multi-project/build.gradle
@@ -6,9 +6,9 @@ dependencies {
 
 tasks.named('javaRestTest') {
   usesDefaultDistribution("to be triaged")
-  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
+//  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
 }
 
 tasks.withType(Test).configureEach {
-  it.systemProperty "test.multi_project.enabled", true
+  it.systemProperty "tests.multi_project.enabled", true
 }
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,6 @@ public class JwtMultiProjectIT extends ESRestTestCase {
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .nodes(1)
         .distribution(DistributionType.DEFAULT)
-        .module("test-multi-project")
         .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/build.gradle b/x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/build.gradle
@@ -17,7 +17,6 @@ dependencies {
   clusterModules project(xpackModule('ilm'))
   clusterModules project(xpackModule('mapper-constant-keyword'))
   clusterModules project(xpackModule('wildcard'))
-  clusterModules project(':test:external-modules:test-multi-project')
   restTestConfig project(path: ':modules:data-streams', configuration: "basicRestSpecs")
   restTestConfig project(path: ':modules:ingest-common', configuration: "basicRestSpecs")
   restTestConfig project(path: ':modules:reindex', configuration: "basicRestSpecs")
@@ -82,5 +81,5 @@ tasks.named("yamlRestTest").configure {
     blacklist += [];
   }
   systemProperty 'tests.rest.blacklist', blacklist.join(',')
-  systemProperty "test.multi_project.enabled", true
+  systemProperty "tests.multi_project.enabled", true
 }
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
@@ -34,7 +34,6 @@ public class CoreWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProje
         .module("analysis-common")
         .module("health-shards-availability")
         .module("data-streams")
-        .module("test-multi-project")
         .module("lang-mustache")
         .module("parent-join")
         .setting("xpack.security.enabled", "true")
diff --git a/x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/build.gradle b/x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/build.gradle
@@ -165,5 +165,5 @@ tasks.named("yamlRestTest").configure {
     blacklist += [];
   }
   systemProperty 'tests.rest.blacklist', blacklist.join(',')
-  systemProperty "test.multi_project.enabled", true
+  systemProperty "tests.multi_project.enabled", true
 }

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,5 @@ tasks.withType(StandaloneRestIntegTestTask).configureEach {`
`20`	`20`
`21`	`21`	`tasks.named("javaRestTest").configure {`
`22`	`22`	`enabled = buildParams.snapshotBuild`
	`23`	`+ systemProperty "tests.multi_project.enabled", true`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ public static void initializeProjectIds() {`
`369`	`369`	`// The active project-id is slightly longer, and has a fixed prefix so that it's easier to pick in error messages etc.`
`370`	`370`	`activeProject = "active00" + randomAlphaOfLength(8).toLowerCase(Locale.ROOT);`
`371`	`371`	`extraProjects = randomSet(1, 3, () -> randomAlphaOfLength(12).toLowerCase(Locale.ROOT));`
`372`		`- multiProjectEnabled = Boolean.parseBoolean(System.getProperty("test.multi_project.enabled"));`
	`372`	`+ multiProjectEnabled = Boolean.parseBoolean(System.getProperty("tests.multi_project.enabled"));`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`@Before`