Skip to content

Conversation

@prdoyle
Copy link
Contributor

@prdoyle prdoyle commented Mar 3, 2025

Backport of: #123776 and #124023

Co-authored-by: Lorenzo Dematté <[email protected]>
Co-authored-by: Patrick Doyle <[email protected]>
@prdoyle prdoyle added test-windows Trigger CI checks on Windows auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) auto-backport Automatically create backport pull requests when merged test-entitlements v8.18.1 v8.19.0 v9.0.1 :Core/Infra/Entitlements Entitlements infrastructure labels Mar 3, 2025
@prdoyle prdoyle self-assigned this Mar 3, 2025
@prdoyle prdoyle requested a review from a team as a code owner March 3, 2025 21:15
@elasticsearchmachine elasticsearchmachine added the Team:Core/Infra Meta label for core/infra team label Mar 3, 2025
@elasticsearchmachine
Copy link
Collaborator

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

@prdoyle prdoyle changed the title remove duplicate paths in FileAccessTree (#123776) Remove duplicate paths in FileAccessTree (#123776) Mar 3, 2025
@prdoyle prdoyle changed the title Remove duplicate paths in FileAccessTree (#123776) [9.0] Remove duplicate paths in FileAccessTree (#123776) Mar 4, 2025
@prdoyle
Copy link
Contributor Author

prdoyle commented Mar 4, 2025

The plan is to hold off merging this until main acquires a fix for this. Then we can add those commits to this branch and merge it all together to avoid breaking windows.

prdoyle and others added 2 commits March 5, 2025 08:53
* Remove duplicate exclusive paths

* Normalize paths in tests to support Windows

* Remove withMode
@prdoyle
Copy link
Contributor Author

prdoyle commented Mar 5, 2025

I've cherry-picked #124023

@prdoyle prdoyle changed the title [9.0] Remove duplicate paths in FileAccessTree (#123776) [9.0] Remove duplicate paths in FileAccessTree (#123776 and #124023) Mar 5, 2025
@prdoyle prdoyle changed the title [9.0] Remove duplicate paths in FileAccessTree (#123776 and #124023) [9.0] Remove duplicate paths (including exclusive) in FileAccessTree (#123776 and #124023) Mar 5, 2025
@prdoyle
Copy link
Contributor Author

prdoyle commented Mar 7, 2025

The CI passed but the GitHub status didn't get updated. I'll merge.

@prdoyle prdoyle merged commit 09a40a9 into elastic:9.0 Mar 7, 2025
25 of 26 checks passed
@prdoyle prdoyle deleted the backport-9.0 branch March 7, 2025 14:36
prdoyle added a commit to prdoyle/elasticsearch that referenced this pull request Mar 7, 2025
…lastic#123776 and elastic#124023) (elastic#123924)

* remove duplicate paths in FileAccessTree (elastic#123776)

Co-authored-by: Lorenzo Dematté <[email protected]>
Co-authored-by: Patrick Doyle <[email protected]>

* Remove duplicate exclusive paths (elastic#124023)

* Remove duplicate exclusive paths

* Normalize paths in tests to support Windows

* Remove withMode

---------

Co-authored-by: Jack Conradson <[email protected]>
Co-authored-by: Lorenzo Dematté <[email protected]>
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
8.18
8.x

prdoyle added a commit to prdoyle/elasticsearch that referenced this pull request Mar 7, 2025
…lastic#123776 and elastic#124023) (elastic#123924)

* remove duplicate paths in FileAccessTree (elastic#123776)

Co-authored-by: Lorenzo Dematté <[email protected]>
Co-authored-by: Patrick Doyle <[email protected]>

* Remove duplicate exclusive paths (elastic#124023)

* Remove duplicate exclusive paths

* Normalize paths in tests to support Windows

* Remove withMode

---------

Co-authored-by: Jack Conradson <[email protected]>
Co-authored-by: Lorenzo Dematté <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Mar 8, 2025
…123776 and #124023) (#123924) (#124331)

* remove duplicate paths in FileAccessTree (#123776)




* Remove duplicate exclusive paths (#124023)

* Remove duplicate exclusive paths

* Normalize paths in tests to support Windows

* Remove withMode

---------

Co-authored-by: Jack Conradson <[email protected]>
Co-authored-by: Lorenzo Dematté <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Mar 9, 2025
…123776 and #124023) (#123924) (#124332)

* remove duplicate paths in FileAccessTree (#123776)




* Remove duplicate exclusive paths (#124023)

* Remove duplicate exclusive paths

* Normalize paths in tests to support Windows

* Remove withMode

---------

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

Labels

auto-backport Automatically create backport pull requests when merged auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) :Core/Infra/Entitlements Entitlements infrastructure >non-issue Team:Core/Infra Meta label for core/infra team test-windows Trigger CI checks on Windows v8.18.1 v8.19.0 v9.0.1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants