Skip to content

Map Store Removal: Remove map modules #24541

Merged
ahus1 merged 3 commits intokeycloak:mainfrom
vramik:map_store_removal-map-modules
Nov 13, 2023
Merged

Map Store Removal: Remove map modules #24541
ahus1 merged 3 commits intokeycloak:mainfrom
vramik:map_store_removal-map-modules

Conversation

@vramik
Copy link
Contributor

@vramik vramik commented Nov 3, 2023

Closes #24100
Closes #24099
Closes #24098

This PR contains 3 commits

  • removal map related modules
  • update of build steps in KeycloakProcessor
  • removal of quarkus config options.

As each commit resolves its own issue, please do not squash commits upon merge.

@ghost ghost added the flaky-test label Nov 3, 2023
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Unreported flaky test detected, please review

@ghost
Copy link

ghost commented Nov 3, 2023

Unreported flaky test detected

If the below flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR.

org.keycloak.testsuite.account.AccountRestServiceTest#updateConsentForClientWithPut

Keycloak CI - Java Distribution IT (windows-latest - temurin - 19)

java.lang.AssertionError
	at org.junit.Assert.fail(Assert.java:87)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.junit.Assert.assertTrue(Assert.java:53)
	at org.keycloak.testsuite.account.AccountRestServiceTest.updateConsentForClientWithPut(AccountRestServiceTest.java:1377)
...

Report flaky test

org.keycloak.testsuite.account.AccountRestServiceTest#createConsentForClientWithPut

Keycloak CI - Java Distribution IT (windows-latest - temurin - 19)

java.lang.AssertionError: 
type
Expected: is "GRANT_CONSENT"
     but: was "UPDATE_CONSENT"
	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
...

Report flaky test

org.keycloak.testsuite.account.AccountRestServiceTest#createConsentForClient

Keycloak CI - Java Distribution IT (windows-latest - temurin - 19)

java.lang.AssertionError: 
type
Expected: is "GRANT_CONSENT"
     but: was "UPDATE_CONSENT"
	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
...

Report flaky test

@vramik vramik force-pushed the map_store_removal-map-modules branch 2 times, most recently from fa33111 to 4937ed5 Compare November 5, 2023 12:47
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Unreported flaky test detected, please review

@ghost
Copy link

ghost commented Nov 5, 2023

Unreported flaky test detected

If the below flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR.

org.keycloak.testsuite.webauthn.account.WebAuthnSigningInTest#cancelPasswordlessRegistration

Keycloak CI - WebAuthn IT (chrome)

java.lang.AssertionError: Expected OIDCLogin but was  (https://localhost:8543/auth/realms/test/protocol/openid-connect/auth?client_id=account-console&redirect_uri=https%3A%2F%2Flocalhost%3A8543%2Fauth%2Frealms%2Ftest%2Faccount%2F%23%2Fsecurity%2Fsigningin&state=e360c5c7-5847-42fe-8378-54f7a263cafc&response_mode=fragment&response_type=code&scope=openid&nonce=3126eb88-7c0a-4490-876c-8063797833f2&code_challenge=_B7SN7qmuY0QdEc6hIBEo5cjNTzD5QyvUdjZR_3PVH4&code_challenge_method=S256)
	at org.junit.Assert.fail(Assert.java:89)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.keycloak.testsuite.page.AbstractPage.assertCurrent(AbstractPage.java:110)
	at jdk.internal.reflect.GeneratedMethodAccessor635.invoke(Unknown Source)
...

Report flaky test

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Unreported flaky test detected, please review

@ghost
Copy link

ghost commented Nov 8, 2023

Unreported flaky test detected

If the below flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR.

org.keycloak.testsuite.webauthn.account.WebAuthnTransportLocaleTest#localizationTransportUSB

Keycloak CI - WebAuthn IT (chrome)

java.lang.AssertionError: Expected OIDCLogin but was  (https://localhost:8543/auth/realms/test/protocol/openid-connect/auth?client_id=account-console&redirect_uri=https%3A%2F%2Flocalhost%3A8543%2Fauth%2Frealms%2Ftest%2Faccount%2F%23%2Fsecurity%2Fsigningin&state=1cc8175c-77ef-4a72-9c3b-6d5cc6b210ea&response_mode=fragment&response_type=code&scope=openid&nonce=ed90a4d7-4b99-4b08-a327-b046d9eae8d1&code_challenge=IOH782zgU768SMbuZBz97Qb1_I7mWHmVwFZxJ4JI-5Y&code_challenge_method=S256)
	at org.junit.Assert.fail(Assert.java:89)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.keycloak.testsuite.page.AbstractPage.assertCurrent(AbstractPage.java:110)
	at jdk.internal.reflect.GeneratedMethodAccessor635.invoke(Unknown Source)
...

Report flaky test

@vramik vramik force-pushed the map_store_removal-map-modules branch from 9b092f8 to aa0e24a Compare November 8, 2023 19:10
@vramik vramik marked this pull request as ready for review November 8, 2023 20:32
@vramik vramik requested a review from a team November 8, 2023 20:32
@vramik vramik requested review from a team as code owners November 8, 2023 20:32
Copy link
Member

@ahus1 ahus1 left a comment

Choose a reason for hiding this comment

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

Hi @vramik - this looks great, thank you for this PR. All commits look good to me. I rerun the failed test, and they failed again, please investigate the logs. If I should re-run them again, let me know.

One more thing: If I would merge this now, the CLI options for Quarkus would be available, but they wouldn't work any more. So I suggest to put the changes for #24098 (removing command line options for Quarkus) as additional commits on this PR.

WDYT?

I see that you assigned issue #24098 already to you. Do you want to add those commit to this PR? Alternatively, I could have a look as I've worked with the CLI before.

@vramik
Copy link
Contributor Author

vramik commented Nov 9, 2023

Hi @vramik - this looks great, thank you for this PR. All commits look good to me. I rerun the failed test, and they failed again, please investigate the logs. If I should re-run them again, let me know.

Thank you @ahus1, the failed tests are not related to this PR, there is certificate in the testsuite which expired recently. There is the report: #24650

One more thing: If I would merge this now, the CLI options for Quarkus would be available, but they wouldn't work any more. So I suggest to put the changes for #24098 (removing command line options for Quarkus) as additional commits on this PR.

WDYT?

I see that you assigned issue #24098 already to you. Do you want to add those commit to this PR? Alternatively, I could have a look as I've worked with the CLI before.

Agreed, that's basically the reason why I wanted to put the changes either in kc23 or kc24. Your proposed solution works for me. I have already started with #24098.

Since current commits look good to you, I'll squash them and I'll add additional ones on top of it referencing other issues.

@vramik vramik force-pushed the map_store_removal-map-modules branch from aa0e24a to ef76f6e Compare November 9, 2023 09:18
@vramik vramik requested a review from ahus1 November 9, 2023 09:23
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.

I've added some comments below related to the Quarkus codebase.

@ahus1
Copy link
Member

ahus1 commented Nov 9, 2023

@vramik - the PR to fix the certificates has been merged to main, so the next run of the PR should look greener.

@ahus1
Copy link
Member

ahus1 commented Nov 9, 2023

@vramik - one more thing: When we now remove the modules and the CLI options, we IMHO need a short paragraph in the release notes / migration guide.

@vramik vramik marked this pull request as draft November 9, 2023 13:25
Signed-off-by: vramik <vramik@redhat.com>

Closes keycloak#24100
Signed-off-by: vramik <vramik@redhat.com>

Closes keycloak#24099
@vramik vramik force-pushed the map_store_removal-map-modules branch 2 times, most recently from 8c27b86 to b87c59b Compare November 12, 2023 20:28
@vramik vramik requested a review from mabartos November 12, 2023 21:44
@vramik vramik marked this pull request as ready for review November 12, 2023 21:44
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.

@vramik Changes related to the Quarkus distribution LGTM. I've just put a small suggestion to the docs. I'll leave the decision up to you, how to handle that.

Signed-off-by: vramik <vramik@redhat.com>

Closes keycloak#24098
@vramik vramik force-pushed the map_store_removal-map-modules branch from b87c59b to c19691f Compare November 13, 2023 09:48
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.

@vramik Thanks. Changes related to the Quarkus distribution LGTM.

Copy link
Member

@ahus1 ahus1 left a comment

Choose a reason for hiding this comment

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

Thank you for this change @vramik and @mabartos for the review. I also reviewed it from the store team perspective and it looks good to me.

I think we might need 1-2 more sentences for the release notes and migration guide, but let's keep that for another PR. I'll prepare one later today.

@ahus1 ahus1 enabled auto-merge (rebase) November 13, 2023 10:20
@ahus1 ahus1 merged commit 71b6757 into keycloak:main Nov 13, 2023
@vramik vramik deleted the map_store_removal-map-modules branch December 7, 2023 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

3 participants