ci: test the default and alternative client implementations separately (

#935)
quarkiverse · Sep 17, 2023 · 33b0746 · 33b0746
1 parent 7a7d110
commit 33b0746
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,6 +26,9 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        alternative-client-implementation: ['true', 'false']
 
     steps:
       - uses: actions/checkout@v3
@@ -36,4 +39,4 @@ jobs:
           java-version: 11
           cache: maven
       - name: Build with Maven
-        run: ./mvnw -B formatter:validate verify --file pom.xml -Dnative
+        run: ./mvnw -B formatter:validate verify --file pom.xml -Dnative -Dalternative-client-implementation=${{ matrix.alternative-client-implementation }}
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.quarkiverse.amazonservices</groupId>
@@ -20,10 +22,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-reactive</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-netty</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
@@ -76,22 +74,7 @@
             <groupId>io.quarkiverse.amazonservices</groupId>
             <artifactId>quarkus-amazon-cognito-user-pools</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>netty-nio-client</artifactId>
-        </dependency>        
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>aws-crt-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>url-connection-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>apache-client</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.jboss.slf4j</groupId>
             <artifactId>slf4j-jboss-logmanager</artifactId>
@@ -157,6 +140,52 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>default-client-implementation</id>
+            <activation>
+                <property>
+                  <name>alternative-client-implementation</name>
+                  <value>!true</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>url-connection-client</artifactId>
+                </dependency>
+            </dependencies>
+            <properties>
+                <sync-client.type>url</sync-client.type>
+                <async-client.type>netty</async-client.type>
+            </properties>
+        </profile>
+        <profile>
+            <id>alternative-client-implementation</id>
+            <activation>
+                <property>
+                  <name>alternative-client-implementation</name>
+                  <value>true</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>aws-crt-client</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </dependency>
+            </dependencies>
+            <properties>
+                <sync-client.type>apache</sync-client.type>
+                <async-client.type>aws-crt</async-client.type>
+            </properties>
+        </profile>
         <profile>
             <id>native-image</id>
             <activation>
@@ -176,7 +205,8 @@
                                 </goals>
                                 <configuration>
                                     <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                                        <native.image.path>
+                                            ${project.build.directory}/${project.build.finalName}-runner</native.image.path>
                                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                                         <maven.home>${maven.home}</maven.home>
                                     </systemPropertyVariables>
@@ -191,4 +221,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/integration-tests/src/main/resources/application.properties b/integration-tests/src/main/resources/application.properties
@@ -12,5 +12,25 @@ quarkus.dynamodb.interceptors=io.quarkus.it.amazon.dynamodb.DynamoDBModifyRespon
 quarkus.s3.interceptors=io.quarkus.it.amazon.s3.S3ModifyResponse
 quarkus.dynamodbenhanced.client-extensions=software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension,io.quarkus.it.amazon.dynamodb.enhanced.MyExtension
 
-quarkus.s3.sync-client.type=apache
-quarkus.kms.async-client.type=aws-crt
+quarkus.cognito-user-pools.sync-client.type=${sync-client.type}
+quarkus.dynamodb.sync-client.type=${sync-client.type}
+quarkus.iam.sync-client.type=${sync-client.type}
+quarkus.kms.sync-client.type=${sync-client.type}
+quarkus.s3.sync-client.type=${sync-client.type}
+quarkus.secretsmanager.sync-client.type=${sync-client.type}
+quarkus.ses.sync-client.type=${sync-client.type}
+quarkus.sns.sync-client.type=${sync-client.type}
+quarkus.sqs.sync-client.type=${sync-client.type}
+quarkus.ssm.sync-client.type=${sync-client.type}
+quarkus.sts.sync-client.type=${sync-client.type}
+quarkus.cognito-user-pools.async-client.type=${async-client.type}
+quarkus.dynamodb.async-client.type=${async-client.type}
+quarkus.iam.async-client.type=${async-client.type}
+quarkus.kms.async-client.type=${async-client.type}
+quarkus.s3.async-client.type=${async-client.type}
+quarkus.secretsmanager.async-client.type=${async-client.type}
+quarkus.ses.async-client.type=${async-client.type}
+quarkus.sns.async-client.type=${async-client.type}
+quarkus.sqs.async-client.type=${async-client.type}
+quarkus.ssm.async-client.type=${async-client.type}
+quarkus.sts.async-client.type=${async-client.type}