chore(e2e-aws-tests): split to modules

camunda · Feb 6, 2024 · b190a48 · b190a48
1 parent 38e60b2
commit b190a48
Show file tree

Hide file tree

Showing 16 changed files with 238 additions and 86 deletions.
diff --git a/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-base/pom.xml b/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-base/pom.xml
@@ -0,0 +1,75 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.camunda.connector</groupId>
+        <artifactId>connectors-e2e-test-aws-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>8.5.0-SNAPSHOT</version>
+    </parent>
+
+    <name>connectors-e2e-test-aws-base</name>
+    <description>Camunda Connector AWS e2e tests base functionality</description>
+    <artifactId>connectors-e2e-test-aws-base</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>localstack</artifactId>
+            <version>${version.localstack}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-bom</artifactId>
+            <version>${version.aws-java-sdk}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>io.camunda.connector</groupId>
+            <artifactId>connector-aws-lambda</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.camunda.connector</groupId>
+            <artifactId>connector-aws-sns</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.camunda.connector</groupId>
+            <artifactId>connector-aws-sqs</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.camunda.connector</groupId>
+            <artifactId>connector-aws-eventbridge</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-sns</artifactId>
+            <version>${version.aws-java-sdk}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-events</artifactId>
+            <version>${version.aws-lambda-java-events}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>${version.aws-lambda-java-core}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/.../io/camunda/connector/e2e/AwsService.java → .../io/camunda/connector/e2e/AwsService.java b/.../io/camunda/connector/e2e/AwsService.java → .../io/camunda/connector/e2e/AwsService.java
diff --git a/.../camunda/connector/e2e/AwsTestHelper.java → .../camunda/connector/e2e/AwsTestHelper.java b/.../camunda/connector/e2e/AwsTestHelper.java → .../camunda/connector/e2e/AwsTestHelper.java
@@ -121,7 +121,7 @@ static void waitForLambdaClientInitialization(final AWSLambda lambdaClient)
    * @param lambdaFunctionZipFilePath The file path to the ZIP file containing the Lambda function
    *     code.
    * @param functionName The name of the Lambda function to be created.
-   * @throws IOException if an error occurs during file operations.
+   * @throws java.io.IOException if an error occurs during file operations.
    */
   static void initializeLambdaFunction(
       final AWSLambda lambdaClient,

diff --git a/...io/camunda/connector/e2e/BaseAwsTest.java → ...io/camunda/connector/e2e/BaseAwsTest.java b/...io/camunda/connector/e2e/BaseAwsTest.java → ...io/camunda/connector/e2e/BaseAwsTest.java
diff --git a/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-dynamodb/pom.xml b/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-dynamodb/pom.xml
@@ -0,0 +1,21 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.camunda.connector</groupId>
+        <artifactId>connectors-e2e-test-aws-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>8.5.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>connectors-e2e-test-aws-dynamodb</artifactId>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
diff --git a/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-event-bridge/pom.xml b/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-event-bridge/pom.xml
@@ -0,0 +1,25 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.camunda.connector</groupId>
+        <artifactId>connectors-e2e-test-aws-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>8.5.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>connectors-e2e-test-aws-event-bridge</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.camunda.connector</groupId>
+            <artifactId>connectors-e2e-test-aws-base</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/...nda/connector/e2e/AwsEventBridgeTest.java → ...nda/connector/e2e/AwsEventBridgeTest.java b/...nda/connector/e2e/AwsEventBridgeTest.java → ...nda/connector/e2e/AwsEventBridgeTest.java
@@ -43,7 +43,7 @@
 
 public class AwsEventBridgeTest extends BaseAwsTest {
   private static final String ELEMENT_TEMPLATE_PATH =
-      "../../connectors/aws/aws-eventbridge/element-templates/aws-eventbridge-outbound-connector.json";
+      "../../../connectors/aws/aws-eventbridge/element-templates/aws-eventbridge-outbound-connector.json";
 
   private static final String RULE_NAME = "test-rule";
   private static final String QUEUE_NAME = "test-queue";

diff --git a/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-lambda/pom.xml b/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-lambda/pom.xml
@@ -0,0 +1,25 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.camunda.connector</groupId>
+        <artifactId>connectors-e2e-test-aws-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>8.5.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>connectors-e2e-test-aws-lambda</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.camunda.connector</groupId>
+            <artifactId>connectors-e2e-test-aws-base</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/.../camunda/connector/e2e/AwsLambdaTest.java → .../camunda/connector/e2e/AwsLambdaTest.java b/.../camunda/connector/e2e/AwsLambdaTest.java → .../camunda/connector/e2e/AwsLambdaTest.java
@@ -34,7 +34,7 @@
 public class AwsLambdaTest extends BaseAwsTest {
 
   private static final String ELEMENT_TEMPLATE_PATH =
-      "../../connectors/aws/aws-lambda/element-templates/aws-lambda-outbound-connector.json";
+      "../../../connectors/aws/aws-lambda/element-templates/aws-lambda-outbound-connector.json";
   private static final String FUNCTION_NAME = "myLambdaFunction";
   private static final String LAMBDA_FUNCTION_ZIP_FILE_PATH = "src/test/resources/function.zip";
 

diff --git a/...-test-aws/src/test/resources/function.zip → ...ws-lambda/src/test/resources/function.zip b/...-test-aws/src/test/resources/function.zip → ...ws-lambda/src/test/resources/function.zip
diff --git a/...aws/src/test/resources/lambda_function.py → ...bda/src/test/resources/lambda_function.py b/...aws/src/test/resources/lambda_function.py → ...bda/src/test/resources/lambda_function.py
diff --git a/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-sns/pom.xml b/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-sns/pom.xml
@@ -0,0 +1,27 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.camunda.connector</groupId>
+        <artifactId>connectors-e2e-test-aws-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>8.5.0-SNAPSHOT</version>
+    </parent>
+
+    <name>connectors-e2e-test-aws-sns</name>
+    <description>Camunda AWS SNS Connector e2e test</description>
+    <artifactId>connectors-e2e-test-aws-sns</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.camunda.connector</groupId>
+            <artifactId>connectors-e2e-test-aws-base</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/.../io/camunda/connector/e2e/AwsSnsTest.java → .../io/camunda/connector/e2e/AwsSnsTest.java b/.../io/camunda/connector/e2e/AwsSnsTest.java → .../io/camunda/connector/e2e/AwsSnsTest.java
@@ -44,7 +44,7 @@
 public class AwsSnsTest extends BaseAwsTest {
 
   private static final String ELEMENT_TEMPLATE_PATH =
-      "../../connectors/aws/aws-sns/element-templates/aws-sns-outbound-connector.json";
+      "../../../connectors/aws/aws-sns/element-templates/aws-sns-outbound-connector.json";
   private static final String TEST_TOPIC_NAME = "test-sns-topic";
   private static final String TEST_QUEUE_NAME = "test-sqs-sqs-queue";
   private static final String MESSAGE_GROUP_ID = "messageGroupId";

diff --git a/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-sqs/pom.xml b/connectors-e2e-test/connectors-e2e-test-aws/connectors-e2e-test-aws-sqs/pom.xml
@@ -0,0 +1,24 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.camunda.connector</groupId>
+        <artifactId>connectors-e2e-test-aws-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>8.5.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>connectors-e2e-test-aws-sqs</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.camunda.connector</groupId>
+            <artifactId>connectors-e2e-test-aws-base</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/.../io/camunda/connector/e2e/AwsSqsTest.java → .../io/camunda/connector/e2e/AwsSqsTest.java b/.../io/camunda/connector/e2e/AwsSqsTest.java → .../io/camunda/connector/e2e/AwsSqsTest.java
@@ -16,6 +16,7 @@
  */
 package io.camunda.connector.e2e;
 
+import static io.camunda.connector.e2e.AwsTestHelper.initSqsClient;
 import static io.camunda.zeebe.process.test.assertions.BpmnAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -34,7 +35,7 @@
 
 public class AwsSqsTest extends BaseAwsTest {
   private static final String ELEMENT_TEMPLATE_PATH =
-      "../../connectors/aws/aws-sqs/element-templates/aws-sqs-outbound-connector.json";
+      "../../../connectors/aws/aws-sqs/element-templates/aws-sqs-outbound-connector.json";
   private static final String TEST_STANDARD_QUEUE_NAME = "test-sqs-queue";
   private static final String TEST_FIFO_QUEUE_NAME = TEST_STANDARD_QUEUE_NAME + ".fifo";
   private static final String ELEMENT_ID = "sqs-standard";
@@ -53,7 +54,7 @@ public class AwsSqsTest extends BaseAwsTest {
    */
   @BeforeAll
   public static void initClient() {
-    sqsClient = AwsTestHelper.initSqsClient(localstack);
+    sqsClient = initSqsClient(localstack);
   }
 
   /**

diff --git a/connectors-e2e-test/connectors-e2e-test-aws/pom.xml b/connectors-e2e-test/connectors-e2e-test-aws/pom.xml
@@ -9,92 +9,46 @@
     <version>8.5.0-SNAPSHOT</version>
   </parent>
 
-  <description>Tests</description>
-  <artifactId>connectors-e2e-aws</artifactId>
-  <packaging>jar</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <artifactId>connectors-e2e-test-aws-parent</artifactId>
+  <packaging>pom</packaging>
+  <name>connectors-e2e-test-aws-parent</name>
+  <version>8.5.0-SNAPSHOT</version>
+
+  <modules>
+    <module>connectors-e2e-test-aws-base</module>
+    <module>connectors-e2e-test-aws-sns</module>
+    <module>connectors-e2e-test-aws-sqs</module>
+    <module>connectors-e2e-test-aws-dynamodb</module>
+    <module>connectors-e2e-test-aws-lambda</module>
+    <module>connectors-e2e-test-aws-event-bridge</module>
+  </modules>
 
   <dependencies>
-
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>localstack</artifactId>
-      <version>${version.localstack}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-bom</artifactId>
-      <version>${version.aws-java-sdk}</version>
-      <type>pom</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.camunda.connector</groupId>
-      <artifactId>connector-aws-lambda</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>io.camunda.connector</groupId>
-      <artifactId>connector-aws-sns</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.camunda.connector</groupId>
-      <artifactId>connector-aws-sqs</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.camunda.connector</groupId>
-      <artifactId>connector-aws-eventbridge</artifactId>
+      <artifactId>connectors-e2e-test-base</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-sns</artifactId>
-      <version>${version.aws-java-sdk}</version>
     </dependency>
 
-      <dependency>
-        <groupId>com.amazonaws</groupId>
-        <artifactId>aws-lambda-java-events</artifactId>
-        <version>${version.aws-lambda-java-events}</version>
-        <scope>test</scope>
-      </dependency>
+</dependencies>
 
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-lambda-java-core</artifactId>
-      <version>${version.aws-lambda-java-core}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
+  <build>
+    <plugins>
+      <!-- Maven JAR Plugin for generating a test JAR -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${plugin.version.maven-jar-plugin}</version> <!-- Use the latest version -->
+        <executions>
+          <execution>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
-    <dependency>
-      <groupId>io.camunda.connector</groupId>
-      <artifactId>connectors-e2e-test-base</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
+    </plugins>
+  </build>
+</project>