Substitute ALL-UNNAMED for module name in non-modular plugins

Author: prdoyle

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

@@ -18,6 +18,7 @@
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Function;
 
@@ -49,20 +50,22 @@ PolicyManager.PolicyScope getScope(Class<?> callerClass) {
 
     public static Function<Class<?>, PolicyManager.PolicyScope> createScopeResolver(
         TestBuildInfo serverBuildInfo,
-        List<TestBuildInfo> pluginsBuildInfo
+        List<TestBuildInfo> pluginsBuildInfo,
+        Set<String> modularPlugins
     ) {
-
         Map<String, PolicyManager.PolicyScope> scopeMap = new TreeMap<>(); // Sorted to make it easier to read during debugging
         for (var pluginBuildInfo : pluginsBuildInfo) {
+            boolean isModular = modularPlugins.contains(pluginBuildInfo.component());
             for (var location : pluginBuildInfo.locations()) {
                 var codeSource = TestScopeResolver.class.getClassLoader().getResource(location.representativeClass());
                 if (codeSource == null) {
                     throw new IllegalArgumentException("Cannot locate class [" + location.representativeClass() + "]");
                 }
                 try {
+                    String module = isModular ? location.module() : ALL_UNNAMED;
                     scopeMap.put(
                         getCodeSource(codeSource, location.representativeClass()),
-                        PolicyManager.PolicyScope.plugin(pluginBuildInfo.component(), location.module())
+                        PolicyManager.PolicyScope.plugin(pluginBuildInfo.component(), module)
                     );
                 } catch (MalformedURLException e) {
                     throw new IllegalArgumentException("Cannot locate class [" + location.representativeClass() + "]", e);

test/framework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementBootstrap.java

@@ -40,6 +40,7 @@
 
 import static java.util.stream.Collectors.toCollection;
 import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
 import static org.elasticsearch.entitlement.runtime.policy.PathLookup.BaseDir.CONFIG;
 import static org.elasticsearch.entitlement.runtime.policy.PathLookup.BaseDir.TEMP;
 
@@ -92,10 +93,14 @@ public static void reset() {
     private static TestPolicyManager createPolicyManager(Path tempDir, Path configDir) throws IOException {
         var pluginsTestBuildInfo = TestBuildInfoParser.parseAllPluginTestBuildInfo();
         var serverTestBuildInfo = TestBuildInfoParser.parseServerTestBuildInfo();
-        var scopeResolver = TestScopeResolver.createScopeResolver(serverTestBuildInfo, pluginsTestBuildInfo);
         List<String> pluginNames = pluginsTestBuildInfo.stream().map(TestBuildInfo::component).toList();
 
         var pluginDescriptors = parsePluginsDescriptors(pluginNames);
+        Set<String> modularPlugins = pluginDescriptors.stream()
+            .filter(PluginDescriptor::isModular)
+            .map(PluginDescriptor::getName)
+            .collect(toSet());
+        var scopeResolver = TestScopeResolver.createScopeResolver(serverTestBuildInfo, pluginsTestBuildInfo, modularPlugins);
         var pluginsData = pluginDescriptors.stream()
             .map(descriptor -> new TestPluginData(descriptor.getName(), descriptor.isModular(), false))
             .toList();

test/framework/src/test/java/org/elasticsearch/bootstrap/TestScopeResolverTests.java

@@ -13,6 +13,7 @@
 import org.elasticsearch.test.ESTestCase;
 
 import java.util.List;
+import java.util.Set;
 
 import static org.hamcrest.Matchers.is;
 
@@ -23,7 +24,7 @@ public void testScopeResolverServerClass() {
             "server",
             List.of(new TestBuildInfoLocation("org/elasticsearch/Build.class", "org.elasticsearch.server"))
         );
-        var resolver = TestScopeResolver.createScopeResolver(testBuildInfo, List.of());
+        var resolver = TestScopeResolver.createScopeResolver(testBuildInfo, List.of(), Set.of());
 
         var scope = resolver.apply(Plugin.class);
         assertThat(scope.componentName(), is("(server)"));
@@ -39,7 +40,7 @@ public void testScopeResolverInternalClass() {
             "test-component",
             List.of(new TestBuildInfoLocation("org/elasticsearch/bootstrap/TestBuildInfoParserTests.class", "test-module-name"))
         );
-        var resolver = TestScopeResolver.createScopeResolver(testBuildInfo, List.of(testOwnBuildInfo));
+        var resolver = TestScopeResolver.createScopeResolver(testBuildInfo, List.of(testOwnBuildInfo), Set.of("test-component"));
 
         var scope = resolver.apply(this.getClass());
         assertThat(scope.componentName(), is("test-component"));