Skip to content

Conversation

@prdoyle
Copy link
Contributor

@prdoyle prdoyle commented Jan 30, 2025

PRs #121204 and #121234 conflicted.

@prdoyle prdoyle added >non-issue :Core/Infra/Core Core issues without another label v9.1.0 labels Jan 30, 2025
@prdoyle prdoyle self-assigned this Jan 30, 2025
@elasticsearchmachine elasticsearchmachine added the Team:Core/Infra Meta label for core/infra team label Jan 30, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

Copy link
Contributor

@jdconrad jdconrad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for fixing this.

@prdoyle prdoyle enabled auto-merge (squash) January 30, 2025 15:43
@prdoyle
Copy link
Contributor Author

prdoyle commented Jan 30, 2025

I didn't bother with test-entitlements. That isn't what this fix is targeting anyway. (If test-entitlements is busted, that can be handled separately at a lower priority because it doesn't affect teams who aren't working on entitlements.)

@prdoyle prdoyle merged commit 2bbf7c7 into elastic:main Jan 30, 2025
16 of 17 checks passed
prdoyle added a commit to prdoyle/elasticsearch that referenced this pull request Jan 30, 2025
* Fix PolicyManagerTests after package move

* Unmute
@prdoyle prdoyle deleted the fix-conflict branch January 30, 2025 21:41
prdoyle added a commit to prdoyle/elasticsearch that referenced this pull request Jan 30, 2025
* Fix PolicyManagerTests after package move

* Unmute
elasticsearchmachine pushed a commit that referenced this pull request Jan 30, 2025
…#121341)

* Add single flag entitlement validation (#121234)

This adds basic flag entitlement validation when creating PolicyManager. If a module has the same flag 
entitlement as part of it's policy multiple times we will throw an IllegalArgumentException. With this 
validation we can safely assume FileEntitlement is the only one we currently have that allows multiple entitlements in a policy.

* Refactor: separate package for entitlement records (#121204)

* Fix PolicyManagerTests after package move (#121304)

* Fix PolicyManagerTests after package move

* Unmute

---------

Co-authored-by: Jack Conradson <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Jan 31, 2025
…#121339)

* Refactor: separate package for entitlement records (#121204)

* Fix PolicyManagerTests after package move (#121304)

* Fix PolicyManagerTests after package move

* Unmute
elasticsearchmachine pushed a commit that referenced this pull request Jan 31, 2025
…#121340)

* Add single flag entitlement validation (#121234)

This adds basic flag entitlement validation when creating PolicyManager. If a module has the same flag 
entitlement as part of it's policy multiple times we will throw an IllegalArgumentException. With this 
validation we can safely assume FileEntitlement is the only one we currently have that allows multiple entitlements in a policy.

* Refactor: separate package for entitlement records (#121204)

* Fix PolicyManagerTests after package move (#121304)

* Fix PolicyManagerTests after package move

* Unmute

---------

Co-authored-by: Jack Conradson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Core/Infra/Core Core issues without another label >non-issue Team:Core/Infra Meta label for core/infra team v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants