tests

rjernst · Mar 6, 2025 · 381dc70 · 381dc70
1 parent 6c4e402
commit 381dc70
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/...ntitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTree.java b/...ntitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTree.java
@@ -69,14 +69,15 @@ static List<ExclusivePath> buildExclusivePathList(List<ExclusiveFileEntitlement>
                             throw new IllegalArgumentException(
                                 "Path ["
                                     + normalizedPath
-                                    + "] is exclusive to "
-                                    + efe.componentName()
-                                    + "/"
-                                    + efe.moduleName()
-                                    + " and "
+                                    + "] is already exclusive to ["
                                     + exclusivePath.componentName()
-                                    + "/"
+                                    + "]"
                                     + exclusivePath.moduleNames
+                                    + ", cannot add exclusive access for ["
+                                    + efe.componentName()
+                                    + "]["
+                                    + efe.moduleName
+                                    + "]"
                             );
                         }
                         exclusivePath.moduleNames.add(efe.moduleName());

diff --git a/...ement/src/test/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTreeTests.java b/...ement/src/test/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTreeTests.java
@@ -411,24 +411,12 @@ public void testDuplicateExclusivePaths() {
             new ExclusivePath(original.componentName(), Set.of("module2"), originalExclusivePath.path()),
             new ExclusivePath(original.componentName(), Set.of(original.moduleName()), normalizePath(path("/c/d")))
         );
-        assertEquals(
-            "Distinct elements should not be combined",
-            distinctPaths,
+        var iae = expectThrows(IllegalArgumentException.class,
+            () ->
             buildExclusivePathList(distinctEntitlements, TEST_PATH_LOOKUP)
         );
-
-        // Do merge things we should
-
-        List<ExclusiveFileEntitlement> interleavedEntitlements = new ArrayList<>();
-        distinctEntitlements.forEach(e -> {
-            interleavedEntitlements.add(e);
-            interleavedEntitlements.add(original);
-        });
-        assertEquals(
-            "Identical elements should be combined wherever they are in the list",
-            distinctPaths,
-            buildExclusivePathList(interleavedEntitlements, TEST_PATH_LOOKUP)
-        );
+        assertThat(iae.getMessage(),
+            equalTo("Path [/a/b] is already exclusive to [component1][module1], cannot add exclusive access for [component2][module1]"));
 
         var equivalentEntitlements = List.of(original, differentMode, differentPlatform);
         var equivalentPaths = List.of(originalExclusivePath);

diff --git a/...lement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java b/...lement/src/test/java/org/elasticsearch/entitlement/runtime/policy/PolicyManagerTests.java
@@ -38,7 +38,7 @@
 import static org.elasticsearch.entitlement.runtime.policy.PolicyManager.ALL_UNNAMED;
 import static org.elasticsearch.entitlement.runtime.policy.PolicyManager.SERVER_COMPONENT_NAME;
 import static org.hamcrest.Matchers.aMapWithSize;
-import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.sameInstance;
 
@@ -458,7 +458,8 @@ public void testFilesEntitlementsWithExclusive() {
                 Set.of()
             )
         );
-        assertThat(iae.getMessage(), containsString("Path [/base/test] is exclusive to plugin2/test.module2 and plugin1/[test.module1]"));
+        assertThat(iae.getMessage(), equalTo("Path [/base/test] is already exclusive to [plugin1][test.module1]," +
+            " cannot add exclusive access for [plugin2][test.module2]"));
 
         iae = expectThrows(
             IllegalArgumentException.class,