Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Galleon layer metadata to the SAML Galleon feature-pack #24438

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Add Galleon layer metadata to the SAML Galleon feature-pack #24438

merged 1 commit into from
Nov 22, 2023

Conversation

jfdenise
Copy link
Contributor

@jfdenise jfdenise commented Oct 31, 2023 •
edited by mposolda
Loading

NOTE: This should only impact SAML Galleon feature-pack for WildFly, not EAP.

Introduce the usage of metadata in the Galleon layers of SAML feature-pack. Required by WildFly Glow tooling.

The discovery rules are:

  • If the web.xml file contains the xml element /web-app/login-config/auth-method with KEYCLOAK-SAML value, the keycloak-saml layer is included.
  • If the keycloak-saml layer is included, then the keycloak-client-saml layer is included.
  • If the WildFly ejb-lite Galleon layer and keycloak-client-saml are included, then the keycloak-client-saml-ejb is included.

Some unit tests have been added.

Closes #24912

@ghost ghost added the flaky-test label Oct 31, 2023
@ghost ghost mentioned this pull request Oct 31, 2023
Closed
pskopek
pskopek approved these changes Nov 20, 2023
View reviewed changes
Copy link
Contributor

@pskopek pskopek left a comment

Choose a reason for hiding this comment

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

It looks fine to me. @jfdenise can you rebase this PR and remove the DRAFT states, please?

@pskopek pskopek added this to the 23.0.0 milestone Nov 20, 2023
@jfdenise jfdenise marked this pull request as ready for review November 20, 2023 09:18
@jfdenise jfdenise requested a review from a team as a code owner November 20, 2023 09:18
@jfdenise
Copy link
Contributor Author

@pskopek , thank-you. I rebased and removed the Draft state.

@jfdenise jfdenise changed the title [DRAFT] Add Galleon layer metadata to the SAML Galleon feature-pack Add Galleon layer metadata to the SAML Galleon feature-pack Nov 20, 2023
This was referenced Nov 20, 2023
Closed
Closed
Closed
@jfdenise
Add Galleon layer metadata to the SAML Galleon feature-pack
5fd9b1e 
Signed-off-by: Jean-Francois Denise <jdenise@redhat.com>
This was referenced Nov 21, 2023
Closed
Closed
@mposolda mposolda self-assigned this Nov 22, 2023
@mposolda
Copy link
Contributor

@jfdenise Thanks for the contribution!

I am adding also @mabartos as reviewer.

mabartos
mabartos approved these changes Nov 22, 2023
View reviewed changes
Copy link
Contributor

@mabartos mabartos left a comment

Choose a reason for hiding this comment

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

@jfdenise Nice work! This is a nice improvement. LGTM; from my POV, I don't see any problems with that. Tests are properly executed and passing.

@mposolda mposolda merged commit 203eb34 into keycloak:main Nov 22, 2023
69 checks passed
@mposolda
Copy link
Contributor

@mabartos @pskopek Thanks for the review!

@mposolda mposolda mentioned this pull request Nov 22, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pskopek pskopek pskopek approved these changes

@mposolda mposolda mposolda approved these changes

@mabartos mabartos mabartos approved these changes

Assignees

@mposolda mposolda

Labels
flaky-test
Projects
None yet
Milestone
23.0.0
Development

Successfully merging this pull request may close these issues.

Add Galleon layer metadata to the SAML Galleon feature-pack
4 participants
@jfdenise @mposolda @pskopek @mabartos