updated to reflect changes to #127486

Author: ldematte

test/framework/src/main/java/org/elasticsearch/bootstrap/TestBuildInfoParser.java

@@ -25,8 +25,8 @@
 
 class TestBuildInfoParser {
 
-    private static final String NAME_KEY = "name";
-    private static final String LOCATIONS_KEY = "locations";
+    private static final String PLUGIN_TEST_BUILD_INFO_RESOURCES = "META-INF/plugin-test-build-info.json";
+    private static final String SERVER_TEST_BUILD_INFO_RESOURCE = "META-INF/server-test-build-info.json";
 
     private static final ObjectParser<Builder, Void> PARSER = new ObjectParser<>("test_build_info", Builder::new);
     private static final ObjectParser<Location, Void> LOCATION_PARSER = new ObjectParser<>("location", Location::new);
@@ -72,12 +72,10 @@ static TestBuildInfo fromXContent(final XContentParser parser) throws IOExceptio
         return PARSER.parse(parser, null).build();
     }
 
-    // TODO: possibly move it to whoever is calling/using this
-    // TODO: server test build info
     static List<TestBuildInfo> parseAllPluginTestBuildInfo() throws IOException {
         var xContent = XContentFactory.xContent(XContentType.JSON);
         List<TestBuildInfo> pluginsTestBuildInfos = new ArrayList<>();
-        var resources = TestBuildInfoParser.class.getClassLoader().getResources("/META-INF/es-plugins/");
+        var resources = TestBuildInfoParser.class.getClassLoader().getResources(PLUGIN_TEST_BUILD_INFO_RESOURCES);
         URL resource;
         while ((resource = resources.nextElement()) != null) {
             try (var stream = getStream(resource); var parser = xContent.createParser(XContentParserConfiguration.EMPTY, stream)) {
@@ -87,6 +85,18 @@ static List<TestBuildInfo> parseAllPluginTestBuildInfo() throws IOException {
         return pluginsTestBuildInfos;
     }
 
+    static TestBuildInfo parseServerTestBuildInfo() throws IOException {
+        var xContent = XContentFactory.xContent(XContentType.JSON);
+        var resource = TestBuildInfoParser.class.getClassLoader().getResource(SERVER_TEST_BUILD_INFO_RESOURCE);
+        // No test-build-info for server: this might be a non-gradle build. Proceed without TestBuildInfo
+        if (resource == null) {
+            return null;
+        }
+        try (var stream = getStream(resource); var parser = xContent.createParser(XContentParserConfiguration.EMPTY, stream)) {
+            return fromXContent(parser);
+        }
+    }
+
     @SuppressForbidden(reason = "URLs from class loader")
     private static InputStream getStream(URL resource) throws IOException {
         return resource.openStream();

test/framework/src/main/java/org/elasticsearch/bootstrap/TestScopeResolver.java

@@ -11,6 +11,8 @@
 
 import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.entitlement.runtime.policy.PolicyManager;
+import org.elasticsearch.logging.LogManager;
+import org.elasticsearch.logging.Logger;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -20,9 +22,20 @@
 import java.util.function.Function;
 
 record TestScopeResolver(Map<String, PolicyManager.PolicyScope> scopeMap) {
+
+    private static final Logger logger = LogManager.getLogger(TestScopeResolver.class);
+
     PolicyManager.PolicyScope getScope(Class<?> callerClass) {
-        var callerCodeSource = callerClass.getProtectionDomain().getCodeSource().getLocation().toString();
-        return scopeMap.getOrDefault(callerCodeSource, PolicyManager.PolicyScope.unknown(callerCodeSource));
+        var callerCodeSource = callerClass.getProtectionDomain().getCodeSource();
+        assert callerCodeSource != null;
+
+        var location = callerCodeSource.getLocation().toString();
+        var scope = scopeMap.get(location);
+        if (scope == null) {
+            logger.warn("Cannot identify a scope for class [{}], location [{}]", callerClass.getName(), location);
+            return PolicyManager.PolicyScope.unknown(location);
+        }
+        return scope;
     }
 
     static Function<Class<?>, PolicyManager.PolicyScope> createScopeResolver(