Refactor before entitlements for testing #129099
Merged
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
It's only called in one place, and there's no need to override it for testing. Removing it just makes things simpler.
Tests in org.elasticsearch.entitlement.bridge are going to be uniquely hard to test once we patch the bridge into java.base, due to Java's prohibition on split packages. Let's just move this guy to another package.
prdoyle
added
auto-backport
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
prdoyle
force-pushed
the
refactor-before-entitlements-for-testing
branch
from
fbc505f to
0a04b2e
Compare
In our unit test, we have a mock checker that doesn't extend EntitlementChecker, so downcasting to that would require us to needlessly rework the unit test.
ldematte
approved these changes
Jun 9, 2025
| import static org.elasticsearch.entitlement.BridgeUtilTests.MockSensitiveClass.mockSensitiveMethod; | ||
|
|
||
| /** | ||
| * Note: this is not un the bridge package because that is a uniquely bad one to use for tests. |
There was a problem hiding this comment.
Suggested change
| * Note: this is not un the bridge package because that is a uniquely bad one to use for tests. | |
| * Note: this is not in the bridge package because that is a uniquely bad one to use for tests. |
| * Since: | ||
| * <ol> | ||
| * <li> | ||
| * we much patch the bridge module into {@code java.base} for it to be reachable |
There was a problem hiding this comment.
Suggested change
| * we much patch the bridge module into {@code java.base} for it to be reachable | |
| * we must patch the bridge module into {@code java.base} for it to be reachable |
...ramework/src/main/java/org/elasticsearch/entitlement/bootstrap/TestEntitlementBootstrap.java
Show resolved
Hide resolved
...vider/src/main/java/org/elasticsearch/entitlement/instrumentation/impl/InstrumenterImpl.java
Show resolved
Hide resolved
prdoyle
added a commit
to prdoyle/elasticsearch
that referenced
this pull request
Jun 9, 2025
* Support multiple plugin source paths * Refactor: remove unncessary PathLookup method. It's only called in one place, and there's no need to override it for testing. Removing it just makes things simpler. * Refactor: local var for pathLookup * Fix bugs in test build info parsing * Fix representative_class in test * Move BridgeUtilTests. Tests in org.elasticsearch.entitlement.bridge are going to be uniquely hard to test once we patch the bridge into java.base, due to Java's prohibition on split packages. Let's just move this guy to another package. * Upcast (?!) Java23EntitlementChecker to EntitlementChecker * Empty TestPathLookup * Create PolicyManager during bootstrap, allowing us to share initialization * Use empty component path list instead of null * Downcast to the class of the check method. In our unit test, we have a mock checker that doesn't extend EntitlementChecker, so downcasting to that would require us to needlessly rework the unit test. * Fix javadoc typos
💚 Backport successful
|
benchaplin
pushed a commit
to benchaplin/elasticsearch
that referenced
this pull request
Jun 9, 2025
* Support multiple plugin source paths * Refactor: remove unncessary PathLookup method. It's only called in one place, and there's no need to override it for testing. Removing it just makes things simpler. * Refactor: local var for pathLookup * Fix bugs in test build info parsing * Fix representative_class in test * Move BridgeUtilTests. Tests in org.elasticsearch.entitlement.bridge are going to be uniquely hard to test once we patch the bridge into java.base, due to Java's prohibition on split packages. Let's just move this guy to another package. * Upcast (?!) Java23EntitlementChecker to EntitlementChecker * Empty TestPathLookup * Create PolicyManager during bootstrap, allowing us to share initialization * Use empty component path list instead of null * Downcast to the class of the check method. In our unit test, we have a mock checker that doesn't extend EntitlementChecker, so downcasting to that would require us to needlessly rework the unit test. * Fix javadoc typos
valeriy42
pushed a commit
to valeriy42/elasticsearch
that referenced
this pull request
Jun 12, 2025
* Support multiple plugin source paths * Refactor: remove unncessary PathLookup method. It's only called in one place, and there's no need to override it for testing. Removing it just makes things simpler. * Refactor: local var for pathLookup * Fix bugs in test build info parsing * Fix representative_class in test * Move BridgeUtilTests. Tests in org.elasticsearch.entitlement.bridge are going to be uniquely hard to test once we patch the bridge into java.base, due to Java's prohibition on split packages. Let's just move this guy to another package. * Upcast (?!) Java23EntitlementChecker to EntitlementChecker * Empty TestPathLookup * Create PolicyManager during bootstrap, allowing us to share initialization * Use empty component path list instead of null * Downcast to the class of the check method. In our unit test, we have a mock checker that doesn't extend EntitlementChecker, so downcasting to that would require us to needlessly rework the unit test. * Fix javadoc typos
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 is a sequence of mergeable commits in preparation for further work on enabling entitlements during unit tests.
Reviewers: this could be less daunting if reviewed commit-by-commit.
See ES-11597.