Skip to content

Conversation

@n1v0lg
Copy link
Contributor

@n1v0lg n1v0lg commented Oct 8, 2024

Revert "Fix BWC for file-settings based role mappings (#113900)" and related changes. Reverted commits:

This is due to a bug in the above fix. We will reintroduce a paired down version of the fix in a subsequent PR.

@n1v0lg n1v0lg added >non-issue :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) auto-backport Automatically create backport pull requests when merged v8.16.0 v9.0.0 v8.15.3 labels Oct 8, 2024
@n1v0lg n1v0lg requested a review from jfreden October 8, 2024 14:56
@n1v0lg n1v0lg self-assigned this Oct 8, 2024
@n1v0lg n1v0lg requested a review from jakelandis October 8, 2024 15:37
Copy link
Contributor

@jakelandis jakelandis left a comment

Choose a reason for hiding this comment

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

LGTM (assuming these are git reverts without additional changes)

@n1v0lg
Copy link
Contributor Author

n1v0lg commented Oct 8, 2024

CI failure was unrelated: https://gradle-enterprise.elastic.co/s/npgurfby72vjg

@n1v0lg
Copy link
Contributor Author

n1v0lg commented Oct 8, 2024

assuming these are git reverts without additional changes

@jakelandis yup, just three reverts

@n1v0lg n1v0lg removed the request for review from jfreden October 8, 2024 15:47
@n1v0lg
Copy link
Contributor Author

n1v0lg commented Oct 8, 2024

@elasticmachine update branch

@n1v0lg n1v0lg marked this pull request as ready for review October 8, 2024 15:55
@elasticsearchmachine elasticsearchmachine added the Team:Security Meta label for security team label Oct 8, 2024
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-security (Team:Security)

@n1v0lg n1v0lg added auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) and removed auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) labels Oct 8, 2024
@n1v0lg
Copy link
Contributor Author

n1v0lg commented Oct 9, 2024

@elasticmachine update branch

@n1v0lg n1v0lg added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Oct 9, 2024
@n1v0lg
Copy link
Contributor Author

n1v0lg commented Oct 9, 2024

@elasticmachine update branch

@n1v0lg n1v0lg merged commit f389623 into main Oct 9, 2024
20 of 22 checks passed
@n1v0lg
Copy link
Contributor Author

n1v0lg commented Oct 9, 2024

Discussed with es-delivery: the CI job is stuck on an non-test-related step so I'm force merging without waiting for job completion.

@n1v0lg n1v0lg deleted the revert-role-mapping-changes branch October 9, 2024 11:46
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

The backport operation could not be completed due to the following error:

An unexpected error occurred when attempting to backport this PR.

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 114326

jfreden pushed a commit to jfreden/elasticsearch that referenced this pull request Oct 9, 2024
…" and related (elastic#114326)

Revert "Fix BWC for file-settings based role mappings (elastic#113900)" and related changes. Reverted commits:

- 763764c
- bc8f9dc
- ce07060

This is due to a bug in the above fix. We will reintroduce a paired down version of the fix in a subsequent PR.

(cherry picked from commit f389623)
jfreden pushed a commit to jfreden/elasticsearch that referenced this pull request Oct 9, 2024
…" and related (elastic#114326)

Revert "Fix BWC for file-settings based role mappings (elastic#113900)" and related changes. Reverted commits:

- 763764c
- bc8f9dc
- ce07060

This is due to a bug in the above fix. We will reintroduce a paired down version of the fix in a subsequent PR.

(cherry picked from commit f389623)

# Conflicts:
#	x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java
#	x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleAction.java
#	x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/rolemapping/TransportDeleteRoleMappingAction.java
#	x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/rolemapping/TransportPutRoleMappingAction.java
@jfreden
Copy link
Contributor

jfreden commented Oct 9, 2024

💚 All backports created successfully

Status Branch Result
8.x
8.15

Questions ?

Please refer to the Backport tool documentation

n1v0lg pushed a commit that referenced this pull request Oct 9, 2024
…" and related (#114326) (#114405)

# Backport

This will backport the following commits from `main` to `8.15`:
 - [Revert "Fix BWC for file-settings based role mappings (#113900)" and related  (#114326)](#114326)
n1v0lg pushed a commit that referenced this pull request Oct 9, 2024
…" and related (#114326) (#114404)

# Backport

This will backport the following commits from `main` to `8.x`:
 - [Revert "Fix BWC for file-settings based role mappings (#113900)" and related  (#114326)](#114326)
matthewabbott pushed a commit to matthewabbott/elasticsearch that referenced this pull request Oct 10, 2024
…" and related (elastic#114326)

Revert "Fix BWC for file-settings based role mappings (elastic#113900)" and related changes. Reverted commits:

- 763764c
- bc8f9dc
- ce07060

This is due to a bug in the above fix. We will reintroduce a paired down version of the fix in a subsequent PR.
davidkyle pushed a commit to davidkyle/elasticsearch that referenced this pull request Oct 13, 2024
…" and related (elastic#114326)

Revert "Fix BWC for file-settings based role mappings (elastic#113900)" and related changes. Reverted commits:

- 763764c
- bc8f9dc
- ce07060

This is due to a bug in the above fix. We will reintroduce a paired down version of the fix in a subsequent PR.
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!) backport pending >non-issue :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) Team:Security Meta label for security team v8.15.3 v8.16.0 v9.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants