From 29b0ee12f517a9fe5705d4080202a2de6fa55ca5 Mon Sep 17 00:00:00 2001
From: Jakub Jedlicka <jjedlick@redhat.com>
Date: Tue, 4 Jun 2024 22:35:59 +0200
Subject: [PATCH 1/2] Update Keycloak version to 24 as Quarkus move to this
 version

---
 .../src/test/resources/keycloak-realm.json                  | 3 +++
 http/http-advanced/src/test/resources/keycloak-realm.json   | 3 +++
 .../src/test/resources/keycloak-realm.json                  | 3 +++
 pom.xml                                                     | 4 ++--
 .../src/test/resources/keycloak-realm.json                  | 6 ++++++
 .../src/test/resources/keycloak-realm.json                  | 6 ++++++
 .../keycloak-jwt/src/test/resources/keycloak-realm.json     | 6 ++++++
 .../src/test/resources/keycloak-realm.json                  | 3 +++
 .../keycloak-oauth2/src/test/resources/keycloak-realm.json  | 6 ++++++
 .../src/test/resources/keycloak-realm.json                  | 6 ++++++
 .../src/test/resources/keycloak-realm.json                  | 3 +++
 .../src/test/resources/keycloak-realm.json                  | 6 ++++++
 .../src/test/resources/keycloak-realm.json                  | 3 +++
 .../keycloak-webapp/src/test/resources/keycloak-realm.json  | 6 ++++++
 security/keycloak/src/test/resources/keycloak-realm.json    | 6 ++++++
 .../src/test/resources/keycloak-realm.json                  | 4 +++-
 16 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/http/http-advanced-reactive/src/test/resources/keycloak-realm.json b/http/http-advanced-reactive/src/test/resources/keycloak-realm.json
index 74590de12..a44238f8a 100644
--- a/http/http-advanced-reactive/src/test/resources/keycloak-realm.json
+++ b/http/http-advanced-reactive/src/test/resources/keycloak-realm.json
@@ -22,6 +22,9 @@
   "users": [
     {
       "username": "test-normal-user",
+      "email": "test-normal-user@localhost",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/http/http-advanced/src/test/resources/keycloak-realm.json b/http/http-advanced/src/test/resources/keycloak-realm.json
index 74590de12..a44238f8a 100644
--- a/http/http-advanced/src/test/resources/keycloak-realm.json
+++ b/http/http-advanced/src/test/resources/keycloak-realm.json
@@ -22,6 +22,9 @@
   "users": [
     {
       "username": "test-normal-user",
+      "email": "test-normal-user@localhost",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/monitoring/micrometer-prometheus-oidc/src/test/resources/keycloak-realm.json b/monitoring/micrometer-prometheus-oidc/src/test/resources/keycloak-realm.json
index ea6b017d6..8e58ab682 100644
--- a/monitoring/micrometer-prometheus-oidc/src/test/resources/keycloak-realm.json
+++ b/monitoring/micrometer-prometheus-oidc/src/test/resources/keycloak-realm.json
@@ -13,6 +13,9 @@
   "users": [
     {
       "username": "test-normal-user",
+      "email": "test-normal-user@localhost",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/pom.xml b/pom.xml
index b935ba02a..b59fb6e5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <!-- Docker images used by both surefire and failsafe plugin -->
         <postgresql.latest.image>docker.io/library/postgres:16.1</postgresql.latest.image>
         <mysql.80.image>registry.access.redhat.com/rhscl/mysql-80-rhel7</mysql.80.image>
-        <rhbk.image>registry.redhat.io/rhbk/keycloak-rhel9:22-8</rhbk.image>
+        <rhbk.image>registry.redhat.io/rhbk/keycloak-rhel9:24</rhbk.image>
         <wiremock-jre8.version>2.35.2</wiremock-jre8.version>
         <build-reporter-maven-extension.version>3.7.0</build-reporter-maven-extension.version>
         <reruns>2</reruns>
@@ -280,7 +280,7 @@
                                 <infinispan.image>quay.io/infinispan/server:14.0</infinispan.image>
                                 <infinispan.expected-log>Infinispan Server.*started in</infinispan.expected-log>
                                 <spring.cloud.server.image>quay.io/quarkusqeteam/spring-cloud-config-server:4.1</spring.cloud.server.image>
-                                <keycloak.image>quay.io/keycloak/keycloak:23.0.6</keycloak.image>
+                                <keycloak.image>quay.io/keycloak/keycloak:24.0</keycloak.image>
                                 <bouncycastle.bctls-fips.version>1.0.12.2</bouncycastle.bctls-fips.version>
                                 <rhbk.image>${rhbk.image}</rhbk.image>
                             </systemPropertyVariables>
diff --git a/security/keycloak-authz-classic/src/test/resources/keycloak-realm.json b/security/keycloak-authz-classic/src/test/resources/keycloak-realm.json
index cb0f295e9..a5e523961 100644
--- a/security/keycloak-authz-classic/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-authz-classic/src/test/resources/keycloak-realm.json
@@ -25,6 +25,9 @@
   "users": [
     {
       "username": "test-normal-user",
+      "email": "test-normal-user@localhost",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
       "enabled": true,
       "credentials": [
         {
@@ -44,6 +47,9 @@
     },
     {
       "username": "test-admin-user",
+      "email": "test-admin-user@localhost",
+      "firstName": "test-admin-user",
+      "lastName": "test-admin-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak-authz-reactive/src/test/resources/keycloak-realm.json b/security/keycloak-authz-reactive/src/test/resources/keycloak-realm.json
index 15167b0ac..8839d3dc1 100644
--- a/security/keycloak-authz-reactive/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-authz-reactive/src/test/resources/keycloak-realm.json
@@ -25,6 +25,9 @@
   "users": [
     {
       "username": "test-normal-user",
+      "email": "test-normal-user@localhost",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
       "enabled": true,
       "credentials": [
         {
@@ -44,6 +47,9 @@
     },
     {
       "username": "test-admin-user",
+      "email": "test-admin-user@localhost",
+      "firstName": "test-admin-user",
+      "lastName": "test-admin-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak-jwt/src/test/resources/keycloak-realm.json b/security/keycloak-jwt/src/test/resources/keycloak-realm.json
index 9ff53795f..89662fa6c 100644
--- a/security/keycloak-jwt/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-jwt/src/test/resources/keycloak-realm.json
@@ -15,6 +15,9 @@
   "users": [
     {
       "username": "test-user",
+      "email": "test-user@localhost",
+      "firstName": "test-user",
+      "lastName": "test-user",
       "enabled": true,
       "credentials": [
         {
@@ -28,6 +31,9 @@
     },
     {
       "username": "test-admin",
+      "email": "test-admin@localhost",
+      "firstName": "test-admin",
+      "lastName": "test-admin",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak-multitenant/src/test/resources/keycloak-realm.json b/security/keycloak-multitenant/src/test/resources/keycloak-realm.json
index 6964f3294..b18a52067 100644
--- a/security/keycloak-multitenant/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-multitenant/src/test/resources/keycloak-realm.json
@@ -12,6 +12,9 @@
   "users": [
     {
       "username": "test-user",
+      "email": "test-user@localhost",
+      "firstName": "test-user",
+      "lastName": "test-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak-oauth2/src/test/resources/keycloak-realm.json b/security/keycloak-oauth2/src/test/resources/keycloak-realm.json
index 504695683..7183361e4 100644
--- a/security/keycloak-oauth2/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-oauth2/src/test/resources/keycloak-realm.json
@@ -15,6 +15,9 @@
   "users": [
     {
       "username": "test-normal-user",
+      "email": "test-normal-user@localhost",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
       "enabled": true,
       "credentials": [
         {
@@ -28,6 +31,9 @@
     },
     {
       "username": "test-admin-user",
+      "email": "test-admin-user@localhost",
+      "firstName": "test-admin-user",
+      "lastName": "test-admin-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak-oidc-client-basic/src/test/resources/keycloak-realm.json b/security/keycloak-oidc-client-basic/src/test/resources/keycloak-realm.json
index 6248d8578..353de72fa 100644
--- a/security/keycloak-oidc-client-basic/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-oidc-client-basic/src/test/resources/keycloak-realm.json
@@ -15,6 +15,9 @@
   "users": [
     {
       "username": "test-normal-user",
+      "email": "test-normal-user@localhost",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
       "enabled": true,
       "credentials": [
         {
@@ -34,6 +37,9 @@
     },
     {
       "username": "test-admin-user",
+      "email": "test-admin-user@localhost",
+      "firstName": "test-admin-user",
+      "lastName": "test-admin-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak-oidc-client-extended/src/test/resources/keycloak-realm.json b/security/keycloak-oidc-client-extended/src/test/resources/keycloak-realm.json
index 8abc438f7..503606db1 100644
--- a/security/keycloak-oidc-client-extended/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-oidc-client-extended/src/test/resources/keycloak-realm.json
@@ -12,6 +12,9 @@
   "users": [
     {
       "username": "test-user",
+      "email": "test-user@localhost",
+      "firstName": "test-user",
+      "lastName": "test-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak-oidc-client-reactive-basic/src/test/resources/keycloak-realm.json b/security/keycloak-oidc-client-reactive-basic/src/test/resources/keycloak-realm.json
index 6248d8578..353de72fa 100644
--- a/security/keycloak-oidc-client-reactive-basic/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-oidc-client-reactive-basic/src/test/resources/keycloak-realm.json
@@ -15,6 +15,9 @@
   "users": [
     {
       "username": "test-normal-user",
+      "email": "test-normal-user@localhost",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
       "enabled": true,
       "credentials": [
         {
@@ -34,6 +37,9 @@
     },
     {
       "username": "test-admin-user",
+      "email": "test-admin-user@localhost",
+      "firstName": "test-admin-user",
+      "lastName": "test-admin-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak-oidc-client-reactive-extended/src/test/resources/keycloak-realm.json b/security/keycloak-oidc-client-reactive-extended/src/test/resources/keycloak-realm.json
index 8abc438f7..503606db1 100644
--- a/security/keycloak-oidc-client-reactive-extended/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-oidc-client-reactive-extended/src/test/resources/keycloak-realm.json
@@ -12,6 +12,9 @@
   "users": [
     {
       "username": "test-user",
+      "email": "test-user@localhost",
+      "firstName": "test-user",
+      "lastName": "test-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak-webapp/src/test/resources/keycloak-realm.json b/security/keycloak-webapp/src/test/resources/keycloak-realm.json
index 9f622ead2..b6faffc53 100644
--- a/security/keycloak-webapp/src/test/resources/keycloak-realm.json
+++ b/security/keycloak-webapp/src/test/resources/keycloak-realm.json
@@ -16,6 +16,9 @@
   "users": [
     {
       "username": "test-user",
+      "email": "test-user@localhost",
+      "firstName": "test-user",
+      "lastName": "test-user",
       "enabled": true,
       "credentials": [
         {
@@ -29,6 +32,9 @@
     },
     {
       "username": "test-admin",
+      "email": "test-admin@localhost",
+      "firstName": "test-admin",
+      "lastName": "test-admin",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/keycloak/src/test/resources/keycloak-realm.json b/security/keycloak/src/test/resources/keycloak-realm.json
index e209797dd..6904c2e56 100644
--- a/security/keycloak/src/test/resources/keycloak-realm.json
+++ b/security/keycloak/src/test/resources/keycloak-realm.json
@@ -16,6 +16,9 @@
   "users": [
     {
       "username": "test-normal-user",
+      "email": "test-normal-user@localhost",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
       "enabled": true,
       "credentials": [
         {
@@ -35,6 +38,9 @@
     },
     {
       "username": "test-admin-user",
+      "email": "test-admin-user@localhost",
+      "firstName": "test-admin-user",
+      "lastName": "test-admin-user",
       "enabled": true,
       "credentials": [
         {
diff --git a/security/oidc-client-mutual-tls/src/test/resources/keycloak-realm.json b/security/oidc-client-mutual-tls/src/test/resources/keycloak-realm.json
index dab0449f2..f8ee62991 100644
--- a/security/oidc-client-mutual-tls/src/test/resources/keycloak-realm.json
+++ b/security/oidc-client-mutual-tls/src/test/resources/keycloak-realm.json
@@ -14,8 +14,10 @@
   "users": [
     {
       "username": "test-normal-user",
-      "enabled": true,
       "email": "test-normal-user@gmail.com",
+      "firstName": "test-normal-user",
+      "lastName": "test-normal-user",
+      "enabled": true,
       "credentials": [
         {
           "type": "password",

From 1cf983a3339adccac74a04ccd571a2760f5ce3cc Mon Sep 17 00:00:00 2001
From: Jakub Jedlicka <jjedlick@redhat.com>
Date: Thu, 6 Jun 2024 23:36:25 +0200
Subject: [PATCH 2/2] Enable keycloak modules disabled in
 quarkus-qe/quarkus-test-suite#1824

---
 pom.xml | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index b59fb6e5b..c6a08dfe9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -512,21 +512,19 @@
                 <module>security/https</module>
                 <module>security/jpa</module>
                 <module>security/jwt</module>
-                <!-- TODO: Jakub to follow-up https://github.com/quarkus-qe/quarkus-test-framework/pull/1153 -->
-                <!-- <module>security/keycloak</module> -->
-                <!-- <module>security/keycloak-authz-classic</module> -->
-                <!-- <module>security/keycloak-authz-reactive</module> -->
-                <!-- <module>security/keycloak-jwt</module> -->
-                <!-- <module>security/keycloak-webapp</module> -->
-                <!-- <module>security/keycloak-oauth2</module> -->
-                <!-- <module>security/keycloak-multitenant</module> -->
-                <!-- <module>security/keycloak-oidc-client-basic</module> -->
-                <!-- <module>security/keycloak-oidc-client-extended</module> -->
-                <!-- <module>security/keycloak-oidc-client-reactive-basic</module> -->
-                <!-- <module>security/keycloak-oidc-client-reactive-extended</module> -->
+                <module>security/keycloak</module>
+                <module>security/keycloak-authz-classic</module>
+                <module>security/keycloak-authz-reactive</module>
+                <module>security/keycloak-jwt</module>
+                <module>security/keycloak-webapp</module>
+                <module>security/keycloak-oauth2</module>
+                <module>security/keycloak-multitenant</module>
+                <module>security/keycloak-oidc-client-basic</module>
+                <module>security/keycloak-oidc-client-extended</module>
+                <module>security/keycloak-oidc-client-reactive-basic</module>
+                <module>security/keycloak-oidc-client-reactive-extended</module>
                 <module>security/vertx-jwt</module>
-                <!-- TODO: Jakub to follow-up https://github.com/quarkus-qe/quarkus-test-framework/pull/1153 -->
-                <!-- <module>security/oidc-client-mutual-tls</module> -->
+                <module>security/oidc-client-mutual-tls</module>
                 <module>security/webauthn</module>
             </modules>
         </profile>
@@ -573,8 +571,7 @@
                 <module>monitoring/micrometer-prometheus</module>
                 <module>monitoring/micrometer-prometheus-kafka</module>
                 <module>monitoring/micrometer-prometheus-kafka-reactive</module>
-                <!-- TODO: Jakub to follow-up https://github.com/quarkus-qe/quarkus-test-framework/pull/1153 -->
-                <!-- <module>monitoring/micrometer-prometheus-oidc</module> -->
+                <module>monitoring/micrometer-prometheus-oidc</module>
                 <module>monitoring/opentelemetry</module>
                 <module>monitoring/opentelemetry-reactive</module>
                 <!-- FIXME: enable the 'microprofile-opentracing' module when new 'quarkus-smallrye-opentracing' is released -->