From a2f027ee00d0c2a686aad62616969838fef35686 Mon Sep 17 00:00:00 2001
From: Ryan Emerson <remerson@redhat.com>
Date: Mon, 19 Feb 2024 11:11:25 +0000
Subject: [PATCH] Use AWS JDBC Wrapper in CI tests. Resolves #27123

Signed-off-by: Ryan Emerson <remerson@redhat.com>
---
 .github/workflows/ci.yml                      |  2 +-
 testsuite/integration-arquillian/pom.xml      | 12 +++----
 .../servers/auth-server/quarkus/pom.xml       | 31 ++++++++++++++++++
 .../testsuite/model/StoreProvider.java        | 32 +++++++++++--------
 4 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c5fa9dcd698..561370f9bd4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -372,7 +372,7 @@ jobs:
           ./aws_ec2.sh create ${REGION}
           ./keycloak_ec2_installer.sh ${REGION} /tmp/keycloak.zip
           ./mvn_ec2_runner.sh ${REGION} "clean install -B -DskipTests -Pdistribution"
-          ./mvn_ec2_runner.sh ${REGION} "clean install -B -DskipTests -pl testsuite/integration-arquillian/servers/auth-server/quarkus -Pauth-server-quarkus -Dmaven.build.cache.enabled=true"
+          ./mvn_ec2_runner.sh ${REGION} "clean install -B -DskipTests -pl testsuite/integration-arquillian/servers/auth-server/quarkus -Pauth-server-quarkus -Pdb-aurora-postgres -Dmaven.build.cache.enabled=true"
           ./mvn_ec2_runner.sh ${REGION} "test -B ${{ env.SUREFIRE_RETRY }} -Pauth-server-quarkus -Pdb-${{ matrix.db }} $PROPS -Dtest=$TESTS -pl testsuite/integration-arquillian/tests/base 2>&1 | misc/log/trimmer.sh"
 
           # Copy returned surefire-report directories to workspace root to ensure they're discovered
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 25bb4e15a66..3ec43f7bb98 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -505,19 +505,19 @@
         <profile>
             <id>db-aurora-postgres</id>
             <properties>
-                <keycloak.storage.connections.vendor>postgres</keycloak.storage.connections.vendor>
-                <keycloak.connectionsJpa.driver>org.postgresql.Driver</keycloak.connectionsJpa.driver>
+                <keycloak.storage.connections.vendor>aurora-postgres</keycloak.storage.connections.vendor>
+                <keycloak.connectionsJpa.driver>software.amazon.jdbc.Driver</keycloak.connectionsJpa.driver>
                 <keycloak.connectionsJpa.database>keycloak</keycloak.connectionsJpa.database>
                 <keycloak.connectionsJpa.user>keycloak</keycloak.connectionsJpa.user>
                 <keycloak.connectionsJpa.password>secret99</keycloak.connectionsJpa.password>
                 <keycloak.connectionsJpa.jdbcParameters/>
-                <keycloak.connectionsJpa.url>jdbc:postgresql://${auth.server.db.host}/${keycloak.connectionsJpa.database}${keycloak.connectionsJpa.jdbcParameters}</keycloak.connectionsJpa.url>
+                <keycloak.connectionsJpa.url>jdbc:aws-wrapper:postgresql://${auth.server.db.host}/${keycloak.connectionsJpa.database}${keycloak.connectionsJpa.jdbcParameters}</keycloak.connectionsJpa.url>
                 <!-- JDBC properties point to "default" JDBC driver for the particular DB -->
                 <!-- For EAP testing, it is recommended to override those with system properties pointing to GAV of more appropriate JDBC driver -->
                 <!-- for the particular EAP version -->
-                <jdbc.mvn.groupId>org.postgresql</jdbc.mvn.groupId>
-                <jdbc.mvn.artifactId>postgresql</jdbc.mvn.artifactId>
-                <jdbc.mvn.version>${postgresql-jdbc.version}</jdbc.mvn.version>
+                <jdbc.mvn.groupId>software.amazon.jdbc</jdbc.mvn.groupId>
+                <jdbc.mvn.artifactId>aws-advanced-jdbc-wrapper</jdbc.mvn.artifactId>
+                <jdbc.mvn.version>${aws-jdbc-wrapper.version}</jdbc.mvn.version>
             </properties>
         </profile>
         <profile>
diff --git a/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml b/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
index 1d6c3b44067..6bbd8ab3e41 100644
--- a/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
+++ b/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
@@ -387,5 +387,36 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>db-aurora-postgres</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>includeProprietaryDependencies</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>software.amazon.jdbc</groupId>
+                                            <artifactId>aws-advanced-jdbc-wrapper</artifactId>
+                                            <version>${aws-jdbc-wrapper.version}</version>
+                                            <type>jar</type>
+                                            <outputDirectory>${auth.server.home}/providers</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java
index c5bbbb64a05..fc215dc0362 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java
@@ -31,27 +31,31 @@ public enum StoreProvider {
     JPA("jpa") {
         @Override
         public void addStoreOptions(List<String> commands) {
-            getDbVendor().ifPresent(vendor -> commands.add("--db=" + vendor));
-            commands.add("--db-username=" + System.getProperty("keycloak.connectionsJpa.user"));
-            commands.add("--db-password=" + System.getProperty("keycloak.connectionsJpa.password"));
-            if ("mssql".equals(getDbVendor().orElse(null))){
-                commands.add("--transaction-xa-enabled=false");
-            }
-            commands.add("--db-url=" + System.getProperty("keycloak.connectionsJpa.url"));
+            addOptions("--", commands);
         }
 
         @Override
         public List<String> getStoreOptionsToKeycloakConfImport() {
             List<String> options = new ArrayList<>();
-            getDbVendor().ifPresent(vendor -> options.add("db=" + vendor));
-            options.add("db-url=" + System.getProperty("keycloak.connectionsJpa.url"));
-            options.add("db-username=" + System.getProperty("keycloak.connectionsJpa.user"));
-            options.add("db-password=" + System.getProperty("keycloak.connectionsJpa.password"));
-            if ("mssql".equals(getDbVendor().orElse(null))){
-                options.add("transaction-xa-enabled=false");
-            }
+            addOptions("", options);
             return options;
         }
+
+        private void addOptions(String prefix, List<String> options) {
+            getDbVendor().ifPresent(vendor -> {
+                if ("mssql".equals(vendor)) {
+                    options.add(prefix + "transaction-xa-enabled=false");
+                } else if ("aurora-postgres".equals(vendor)){
+                    vendor = "postgres";
+                    options.add(prefix + "db-driver=" + System.getProperty("keycloak.connectionsJpa.driver"));
+                    options.add(prefix + "transaction-xa-enabled=false");
+                }
+                options.add(prefix + "db=" + vendor);
+            });
+            options.add(prefix + "db-username=" + System.getProperty("keycloak.connectionsJpa.user"));
+            options.add(prefix + "db-password=" + System.getProperty("keycloak.connectionsJpa.password"));
+            options.add(prefix + "db-url=" + System.getProperty("keycloak.connectionsJpa.url"));
+        }
     },
     DEFAULT("default") {
         @Override