Skip to content

Commit 36fa717

Browse files
committed
Merge branch 'entitlements/shared_data_path_fix' into entitlements/fixInternalClusterTest
2 parents ea06394 + b85aff5 commit 36fa717

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/HardcodedEntitlements.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,12 @@ private static List<Scope> createServerEntitlements(Path pidFile) {
132132
new Scope(
133133
"org.apache.lucene.misc",
134134
List.of(
135-
new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ_WRITE))),
136-
new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE))),
135+
new FilesEntitlement(
136+
List.of(
137+
FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ_WRITE),
138+
FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE)
139+
)
140+
),
137141
new ReadStoreAttributesEntitlement()
138142
)
139143
),
@@ -148,8 +152,12 @@ private static List<Scope> createServerEntitlements(Path pidFile) {
148152
"org.elasticsearch.nativeaccess",
149153
List.of(
150154
new LoadNativeLibrariesEntitlement(),
151-
new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ_WRITE))),
152-
new FilesEntitlement(List.of(FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE)))
155+
new FilesEntitlement(
156+
List.of(
157+
FilesEntitlement.FileData.ofBaseDirPath(SHARED_DATA, READ_WRITE),
158+
FilesEntitlement.FileData.ofBaseDirPath(DATA, READ_WRITE)
159+
)
160+
)
153161
)
154162
)
155163
);

0 commit comments

Comments
 (0)