More fixes

Author: nielsbauman

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -1622,7 +1622,7 @@ protected Settings restAdminSettings() {
      * Returns the REST client used for cleaning up the cluster.
      */
     protected Settings cleanupClientSettings() {
-        if (multiProjectEnabled == false) {
+        if (multiProjectEnabled == false || shouldConfigureProjects() == false) {
             return restAdminSettings();
         }
         return addProjectIdToSettings(restAdminSettings());
@@ -2726,8 +2726,17 @@ protected static void assertResultMap(
         assertMap(result, mapMatcher.entry("columns", columnMatcher).entry("values", valuesMatcher));
     }
 
+    /**
+     * Whether the test framework should configure an active projects and some extra projects. This is true by default (when multi-project
+     * is enabled). Subclasses can override this method to avoid configuring projects - e.g. when they configure projects themselves.
+     */
+    protected boolean shouldConfigureProjects() {
+        assert multiProjectEnabled;
+        return true;
+    }
+
     private void configureProjects() throws IOException {
-        if (projectsConfigured || multiProjectEnabled == false) {
+        if (projectsConfigured || multiProjectEnabled == false || shouldConfigureProjects() == false) {
             return;
         }
         projectsConfigured = true;
@@ -2747,7 +2756,7 @@ private void configureProjects() throws IOException {
 
     @After
     public final void assertEmptyProjects() throws Exception {
-        if (multiProjectEnabled == false) {
+        if (projectsConfigured == false) {
             return;
         }
         assertEmptyProject(Metadata.DEFAULT_PROJECT_ID.id());
@@ -2756,10 +2765,6 @@ public final void assertEmptyProjects() throws Exception {
         }
     }
 
-    public static String activeProject() {
-        return activeProject;
-    }
-
     protected void createProject(String project) throws IOException {
         assert multiProjectEnabled;
         final Request request = new Request("PUT", "/_project/" + project);
@@ -2796,16 +2801,18 @@ private Collection<String> getProjectIds(RestClient client) throws IOException {
     }
 
     protected void cleanUpProjects() throws IOException {
+        assert multiProjectEnabled;
         final var projectIds = getProjectIds(adminClient());
         for (String projectId : projectIds) {
-            if (projectId.equals(ProjectId.DEFAULT.id()) || projectId.equals(activeProject) || extraProjects.contains(projectId)) {
+            if (projectId.equals(ProjectId.DEFAULT.id())) {
                 continue;
             }
             deleteProject(projectId);
         }
     }
 
     private void deleteProject(String project) throws IOException {
+        assert multiProjectEnabled;
         final Request request = new Request("DELETE", "/_project/" + project);
         cleanupClient().performRequest(request);
     }

x-pack/plugin/security/qa/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/jwt/JwtMultiProjectIT.java

@@ -82,6 +82,11 @@ protected Settings restClientSettings() {
         return builder.build();
     }
 
+    @Override
+    protected boolean shouldConfigureProjects() {
+        return false;
+    }
+
     @After
     public void cleanup() throws IOException {
         cleanUpProjects();