Add a profiles testsuite for jpa-map storage

Closes #12045

testsuite/integration-arquillian/tests/base/pom.xml

@@ -852,6 +852,47 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>map-storage-jpa</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireActiveProfile>
+                                    <profiles>map-storage</profiles>
+                                    <message>map-storage profile not active</message>
+                                </requireActiveProfile>
+                            </rules>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <keycloak.map.storage.connectionsJpa.url>${keycloak.map.storage.connectionsJpa.url}</keycloak.map.storage.connectionsJpa.url>
+                                <keycloak.map.storage.connectionsJpa.user>${keycloak.map.storage.connectionsJpa.user}</keycloak.map.storage.connectionsJpa.user>
+                                <keycloak.map.storage.connectionsJpa.password>${keycloak.map.storage.connectionsJpa.password}</keycloak.map.storage.connectionsJpa.password>
+
+                                <keycloak.authSession.map.storage.provider>jpa-map-storage</keycloak.authSession.map.storage.provider>
+                                <keycloak.client.map.storage.provider>jpa-map-storage</keycloak.client.map.storage.provider>
+                                <keycloak.clientScope.map.storage.provider>jpa-map-storage</keycloak.clientScope.map.storage.provider>
+                                <keycloak.group.map.storage.provider>jpa-map-storage</keycloak.group.map.storage.provider>
+                                <keycloak.loginFailure.map.storage.provider>jpa-map-storage</keycloak.loginFailure.map.storage.provider>
+                                <keycloak.realm.map.storage.provider>jpa-map-storage</keycloak.realm.map.storage.provider>
+                                <keycloak.role.map.storage.provider>jpa-map-storage</keycloak.role.map.storage.provider>
+                          </systemPropertyVariables>
+                      </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>

testsuite/model/pom.xml

@@ -109,6 +109,11 @@
             <artifactId>infinispan-component-annotations</artifactId>
             <version>${infinispan.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.driver.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -152,6 +157,9 @@
                         <keycloak.connectionsJpa.default.user>${keycloak.connectionsJpa.user}</keycloak.connectionsJpa.default.user>
                         <keycloak.connectionsJpa.default.password>${keycloak.connectionsJpa.password}</keycloak.connectionsJpa.default.password>
                         <keycloak.connectionsJpa.default.url>${keycloak.connectionsJpa.url}</keycloak.connectionsJpa.default.url>
+                        <keycloak.map.storage.connectionsJpa.url>${keycloak.map.storage.connectionsJpa.url}</keycloak.map.storage.connectionsJpa.url>
+                        <keycloak.map.storage.connectionsJpa.user>${keycloak.map.storage.connectionsJpa.user}</keycloak.map.storage.connectionsJpa.user>
+                        <keycloak.map.storage.connectionsJpa.password>${keycloak.map.storage.connectionsJpa.password}</keycloak.map.storage.connectionsJpa.password>
                         <log4j.configuration>file:${project.build.directory}/test-classes/log4j.properties</log4j.configuration> <!-- for the logging to properly work with tests in the 'other' module -->
                         <keycloak.profile.feature.map_storage>${keycloak.profile.feature.map_storage}</keycloak.profile.feature.map_storage>
                         <keycloak.userSessions.infinispan.preloadOfflineSessionsFromDatabase>${keycloak.userSessions.infinispan.preloadOfflineSessionsFromDatabase}</keycloak.userSessions.infinispan.preloadOfflineSessionsFromDatabase>
@@ -308,6 +316,14 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>map-jpa</id>
+            <properties>
+                <keycloak.profile.feature.map_storage>enabled</keycloak.profile.feature.map_storage>
+                <keycloak.model.parameters>Map,JpaMapStorage</keycloak.model.parameters>
+            </properties>
+        </profile>
+
         <profile>
             <id>.asyncProfiler</id>
             <activation>

testsuite/model/src/main/java/org/keycloak/testsuite/model/KeycloakModelParameters.java

@@ -32,6 +32,8 @@ public class KeycloakModelParameters {
     private final Set<Class<? extends Spi>> allowedSpis;
     private final Set<Class<? extends ProviderFactory>> allowedFactories;
 
+    protected static final String STORAGE_CONFIG = "storage.provider";
+
     public KeycloakModelParameters(Set<Class<? extends Spi>> allowedSpis, Set<Class<? extends ProviderFactory>> allowedFactories) {
         this.allowedSpis = allowedSpis;
         this.allowedFactories = allowedFactories;

testsuite/model/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java

@@ -122,10 +122,8 @@ public class ClientModelTest extends KeycloakModelTest {
             });
 
             withRealm(realmId, (session, realm) -> {
-                ClientModel client = session.clients().searchClientsByClientIdStream(realm, "%", 0, 10).findFirst().orElse(null);
+                // when searching by "%" all entries are expected
-                assertThat(client, notNullValue());
+                assertThat(session.clients().searchClientsByClientIdStream(realm, "%", 0, 10).count(), is(equalTo(2L)));
-                assertThat(client.getId(), is(equalTo(searchClient.getId())));
-                assertThat(client.getClientId(), is(equalTo(searchClientId)));
                 return null;
             });
         }

testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HotRodMapStorage.java

@@ -68,8 +68,6 @@ public class HotRodMapStorage extends KeycloakModelParameters {
       .add(ConcurrentHashMapStorageProviderFactory.class) // TODO: this should be removed when we have a HotRod implementation for each area
       .build();
     
-    private static final String STORAGE_CONFIG = "storage.provider";
-
     private HotRodServerRule hotRodServerRule = new HotRodServerRule();
 
     @Override

testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaMapStorage.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2020 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.keycloak.testsuite.model.parameters;
+
+import com.google.common.collect.ImmutableSet;
+import java.util.Set;
+import org.jboss.logging.Logger;
+import org.keycloak.authorization.store.StoreFactorySpi;
+import org.keycloak.models.DeploymentStateSpi;
+import org.keycloak.models.UserLoginFailureSpi;
+import org.keycloak.models.UserSessionSpi;
+import org.keycloak.models.dblock.NoLockingDBLockProviderFactory;
+import org.keycloak.models.map.authSession.MapRootAuthenticationSessionProviderFactory;
+import org.keycloak.models.map.authorization.MapAuthorizationStoreFactory;
+import org.keycloak.models.map.client.MapClientProviderFactory;
+import org.keycloak.models.map.clientscope.MapClientScopeProviderFactory;
+import org.keycloak.models.map.deploymentState.MapDeploymentStateProviderFactory;
+import org.keycloak.models.map.group.MapGroupProviderFactory;
+import org.keycloak.models.map.loginFailure.MapUserLoginFailureProviderFactory;
+import org.keycloak.models.map.realm.MapRealmProviderFactory;
+import org.keycloak.models.map.role.MapRoleProviderFactory;
+import org.keycloak.models.map.storage.MapStorageSpi;
+import org.keycloak.models.map.storage.chm.ConcurrentHashMapStorageProviderFactory;
+import org.keycloak.models.map.storage.jpa.JpaMapStorageProviderFactory;
+import org.keycloak.models.map.storage.jpa.liquibase.connection.MapLiquibaseConnectionProviderFactory;
+import org.keycloak.models.map.storage.jpa.liquibase.connection.MapLiquibaseConnectionSpi;
+import org.keycloak.models.map.storage.jpa.updater.MapJpaUpdaterProviderFactory;
+import org.keycloak.models.map.storage.jpa.updater.MapJpaUpdaterSpi;
+import org.keycloak.models.map.user.MapUserProviderFactory;
+import org.keycloak.models.map.userSession.MapUserSessionProviderFactory;
+import org.keycloak.provider.ProviderFactory;
+import org.keycloak.provider.Spi;
+import org.keycloak.sessions.AuthenticationSessionSpi;
+import org.keycloak.testsuite.model.Config;
+import org.keycloak.testsuite.model.KeycloakModelParameters;
+
+public class JpaMapStorage extends KeycloakModelParameters {
+
+    private static final Logger LOG = Logger.getLogger(JpaMapStorage.class.getName());
+
+    static final Set<Class<? extends Spi>> ALLOWED_SPIS = ImmutableSet.<Class<? extends Spi>>builder()
+            .add(MapJpaUpdaterSpi.class)
+            .add(MapLiquibaseConnectionSpi.class)
+            .build();
+
+    static final Set<Class<? extends ProviderFactory>> ALLOWED_FACTORIES = ImmutableSet.<Class<? extends ProviderFactory>>builder()
+            .add(ConcurrentHashMapStorageProviderFactory.class)
+            .add(JpaMapStorageProviderFactory.class)
+            .add(MapJpaUpdaterProviderFactory.class)
+            .add(MapLiquibaseConnectionProviderFactory.class)
+            .build();
+
+    public JpaMapStorage() {
+        super(ALLOWED_SPIS, ALLOWED_FACTORIES);
+    }
+
+    @Override
+    public void updateConfig(Config cf) {
+        cf.spi(MapStorageSpi.NAME)
+                .provider(ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)
+                .config("dir", "${project.build.directory:target}");
+
+        cf.spi(MapStorageSpi.NAME)
+                .provider(JpaMapStorageProviderFactory.PROVIDER_ID)
+                .config("url", System.getProperty("keycloak.map.storage.connectionsJpa.url"))
+                .config("user", System.getProperty("keycloak.map.storage.connectionsJpa.user"))
+                .config("password", System.getProperty("keycloak.map.storage.connectionsJpa.password"))
+                .config("driver", "org.postgresql.Driver")
+                .config("driverDialect", "org.keycloak.models.map.storage.jpa.hibernate.dialect.JsonbPostgreSQL95Dialect");
+
+        cf.spi(AuthenticationSessionSpi.PROVIDER_ID).provider(MapRootAuthenticationSessionProviderFactory.PROVIDER_ID)  .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)
+          .spi("client").provider(MapClientProviderFactory.PROVIDER_ID)                                                 .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)
+          .spi("clientScope").provider(MapClientScopeProviderFactory.PROVIDER_ID)                                       .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)
+          .spi("group").provider(MapGroupProviderFactory.PROVIDER_ID)                                                   .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)
+          .spi("realm").provider(MapRealmProviderFactory.PROVIDER_ID)                                                   .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)
+          .spi("role").provider(MapRoleProviderFactory.PROVIDER_ID)                                                     .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)
+          .spi(DeploymentStateSpi.NAME).provider(MapDeploymentStateProviderFactory.PROVIDER_ID)                         .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)
+          .spi(StoreFactorySpi.NAME).provider(MapAuthorizationStoreFactory.PROVIDER_ID)                                 .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)
+          .spi("user").provider(MapUserProviderFactory.PROVIDER_ID)                                                     .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)
+          .spi(UserLoginFailureSpi.NAME).provider(MapUserLoginFailureProviderFactory.PROVIDER_ID)                       .config(STORAGE_CONFIG, JpaMapStorageProviderFactory.PROVIDER_ID)
+          .spi("dblock").provider(NoLockingDBLockProviderFactory.PROVIDER_ID)                                           .config(STORAGE_CONFIG, ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)
+          .spi(UserSessionSpi.NAME).provider(MapUserSessionProviderFactory.PROVIDER_ID)                                 .config("storage-user-sessions.provider", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID)
+                                                                                                                        .config("storage-client-sessions.provider", ConcurrentHashMapStorageProviderFactory.PROVIDER_ID);
+
+    }
+}

testsuite/model/test-all-profiles.sh

@@ -12,6 +12,11 @@ mvn -version
 EXIT_CODE=0
 mvn clean
 for I in `perl -ne 'print "$1\n" if (m,<id>([^.<]+)</id>,)' pom.xml`; do
+
+    ## skip map-jpa for GHA
+    if [[ $I == 'map-jpa' ]]; then 
+        continue
+    fi
     echo "========"
     echo "======== Start of Profile $I"
     echo "========"

testsuite/pom.xml

@@ -31,6 +31,12 @@
     <name>Keycloak TestSuite</name>
     <description />
 
+    <properties>
+        <keycloak.map.storage.connectionsJpa.url>jdbc:postgresql://localhost:5432/keycloak</keycloak.map.storage.connectionsJpa.url>
+        <keycloak.map.storage.connectionsJpa.user>keycloak</keycloak.map.storage.connectionsJpa.user>
+        <keycloak.map.storage.connectionsJpa.password>pass</keycloak.map.storage.connectionsJpa.password>
+    </properties>
+
     <build>
         <plugins>
             <plugin>