Support entitlements in internal cluster tests #130710
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mosche
added
>refactoring
test-windows
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
…erTest to test, file permissions in internalClusterTest are stricter on the lucene tempDir
|
TODO: Improve Javadocs on final version to better guide DEVs what to do |
prdoyle
approved these changes
Jul 16, 2025
| logger.debug("Unregistering node dirs: config [{}], dataDirs [{}], repoDirs [{}]", configDir, dataDirs, repoDirs); | ||
| baseDirPaths.compute(BaseDir.CONFIG, baseDirModifier(paths -> paths.remove(configDir))); | ||
| baseDirPaths.compute(BaseDir.DATA, baseDirModifier(paths -> paths.removeAll(dataDirs))); | ||
| baseDirPaths.compute(BaseDir.SHARED_REPO, baseDirModifier(paths -> paths.removeAll(repoDirs))); |
There was a problem hiding this comment.
Huh, this baseDirModifier pattern is kind of neat. The code ends up quite readable.
| @@ -50,7 +50,7 @@ configure(childProjects.values()) { | |||
| // Omit oddball libraries that aren't in server. | |||
| def nonServerLibs = ['plugin-scanner'] | |||
| if (false == nonServerLibs.contains(project.name)) { | |||
| project.getTasks().withType(Test.class).matching(test -> ['test'].contains(test.name)).configureEach(test -> { | |||
| project.getTasks().withType(Test.class).matching(test -> ['test', 'internalClusterTest'].contains(test.name)).configureEach(test -> { | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR enables entitlement enforcement in
internalClusterTests.To prevent an implicit grant-all if storing node homes inside the Java temp dir, the temporary folder of
ESTestCaseis configured separately from the Java temp dir ininternalClusterTests(by means of the system propertytempDir, seeTestRuleTemporaryFilesCleanup)ReloadingDatabasesWhilePerformingGeoLookupsITfrominternalClusterTesttotest, file permissions ininternalClusterTestonly grant file permissions on node base dirs - but not for the entire Lucene test temp dir overall.This adds support to trivially allow test utility classes if annotated with
@WithoutEntitlementsby walking the entire stack. For example, seeSecurityTestUtilswhich uses IOUtils to work with files.@EntitledTestUtilities) on the test suite similar to@EntitledTestPackages. This way stack walks can be limited to cases where such an annotation is present on the test suite.Relates to ES-11586
Relates to ES-12042