rebased with main

@mike-pt Please, see https://github.com/keycloak/keycloak/actions/runs/9645408727/job/26890406244?pr=30669#step:4:2086.

@mike-pt Please, see https://github.com/keycloak/keycloak/actions/runs/9645408727/job/26890406244?pr=30669#step:4:2086.

I see the issue now, I missed one more DROP statement still using TEMPORARY.
Should be good now

@pedroigor is there any other pending action from me on this?

It sounds like a reasonable fix.

Could you remove the merge commit to maintain a linear Git history?

To do so, run:

git clone --single-branch --branch patch-1 [email protected]:mike-pt/keycloak.git
cd keycloak

# Remove the merge commit from your local branch
git reset --hard HEAD~1

# Rebase your local branch onto main
git remote add upstream [email protected]:keycloak/keycloak.git
git pull --rebase upstream main

# Make sure the only commit in it is signed
git commit --amend --signoff

# Force push your local branch to remove the previously pushed merge commit by resetting the remote branch
git push --force

Additionally, I suggest adding the following line at the end of the PR, as it hints that you haven’t overlooked this requirement in the commit message.

Signed-off-by: mike-pt <[email protected]>

@codespearhead recommendations addressed

Unreported flaky test detected

If the 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.WebAuthnIdlessTest#testWebAuthnIDLessAndWebAuthnAndWebAuthnPasswordlessLogin

Keycloak CI - WebAuthn IT (chrome)

java.lang.AssertionError: Expected SelectAuthenticatorPage but was Sign in to test (https://localhost:8543/auth/realms/test/protocol/openid-connect/auth?response_type=code&client_id=test-app&redirect_uri=https%3A%2F%2Flocalhost%3A8543%2Fauth%2Frealms%2Fmaster%2Fapp%2Fauth&state=9f44a0d7-b582-446d-8253-968cd37122c2&scope=openid)
	at org.junit.Assert.fail(Assert.java:89)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.keycloak.testsuite.pages.AbstractPage.assertCurrent(AbstractPage.java:47)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
...

Report flaky test

@pedroigor is there anything blocking this on my side?

@pedroigor sorry for the re ping but its been a month since my last comment and I'm not sure if there is something blocking this or now? It seems it was already approved just needs to be merged in?

Sorry for the delay. Thanks!