Merge branch 'entitlements/shared_data_path_fix' into entitlements/fixInternalClusterTest

mosche · mosche · commit ea06394f8688 · 2025-07-23T13:20:40.000+02:00
diff --git a/libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/HardcodedEntitlements.java b/libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/HardcodedEntitlements.java
@@ -123,6 +123,7 @@ private static List<Scope> createServerEntitlements(Path pidFile) {
                     new FilesEntitlement(
                         List.of(
                             FilesEntitlement.FileData.ofBaseDirPath(CONFIG, READ),
+                            FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ),
                             FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE)
                         )
                     )
@@ -131,6 +132,7 @@ private static List<Scope> createServerEntitlements(Path pidFile) {
             new Scope(
                 "org.apache.lucene.misc",
                 List.of(
+                    new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ_WRITE))),
                     new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE))),
                     new ReadStoreAttributesEntitlement()
                 )
@@ -146,6 +148,7 @@ private static List<Scope> createServerEntitlements(Path pidFile) {
                 "org.elasticsearch.nativeaccess",
                 List.of(
                     new LoadNativeLibrariesEntitlement(),
+                    new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ_WRITE))),
                     new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE)))
                 )
             )

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ private static List<Scope> createServerEntitlements(Path pidFile) {`
`123`	`123`	`new FilesEntitlement(`
`124`	`124`	`List.of(`
`125`	`125`	`FilesEntitlement.FileData.ofBaseDirPath(CONFIG, READ),`
	`126`	`+ FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ),`
`126`	`127`	`FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE)`
`127`	`128`	`)`
`128`	`129`	`)`
`@@ -131,6 +132,7 @@ private static List<Scope> createServerEntitlements(Path pidFile) {`
`131`	`132`	`new Scope(`
`132`	`133`	`"org.apache.lucene.misc",`
`133`	`134`	`List.of(`
	`135`	`+ new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ_WRITE))),`
`134`	`136`	`new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE))),`
`135`	`137`	`new ReadStoreAttributesEntitlement()`
`136`	`138`	`)`
`@@ -146,6 +148,7 @@ private static List<Scope> createServerEntitlements(Path pidFile) {`
`146`	`148`	`"org.elasticsearch.nativeaccess",`
`147`	`149`	`List.of(`
`148`	`150`	`new LoadNativeLibrariesEntitlement(),`
	`151`	`+ new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ_WRITE))),`
`149`	`152`	`new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE)))`
`150`	`153`	`)`
`151`	`154`	`)`