feat: remove the github postgres service and use Testcontainers

sovity · Feb 7, 2024 · 7dacbdc · 7dacbdc
1 parent 6fd6425
commit 7dacbdc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 47 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,41 +21,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-    services:
-      postgres1:
-        image: postgres:15
-        env:
-          POSTGRES_USER: edc
-          POSTGRES_PASSWORD: edc
-          POSTGRES_DB: edc
-        ports:
-          - 54321:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      postgres2:
-        image: postgres:15
-        env:
-          POSTGRES_USER: edc
-          POSTGRES_PASSWORD: edc
-          POSTGRES_DB: edc
-        ports:
-          - 54322:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      SKIP_TESTCONTAINERS: true
-      TEST_POSTGRES_1_JDBC_URL: jdbc:postgresql://localhost:54321/edc
-      TEST_POSTGRES_1_JDBC_USER: edc
-      TEST_POSTGRES_1_JDBC_PASSWORD: edc
-      TEST_POSTGRES_2_JDBC_URL: jdbc:postgresql://localhost:54322/edc
-      TEST_POSTGRES_2_JDBC_USER: edc
-      TEST_POSTGRES_2_JDBC_PASSWORD: edc
     steps:
       - uses: FranzDiebold/github-env-vars-action@v2
       - uses: actions/checkout@v3

diff --git a/tests/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java b/tests/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java
@@ -35,7 +35,7 @@
 import de.sovity.edc.extension.e2e.connector.ConnectorRemote;
 import de.sovity.edc.extension.e2e.connector.MockDataAddressRemote;
 import de.sovity.edc.extension.e2e.db.TestDatabase;
-import de.sovity.edc.extension.e2e.db.TestDatabaseFactory;
+import de.sovity.edc.extension.e2e.db.TestDatabaseViaTestcontainers;
 import de.sovity.edc.utils.jsonld.vocab.Prop;
 import org.awaitility.Awaitility;
 import org.eclipse.edc.junit.extensions.EdcExtension;
@@ -63,9 +63,9 @@ class ApiWrapperDemoTest {
     static EdcExtension consumerEdcContext = new EdcExtension();
 
     @RegisterExtension
-    static final TestDatabase PROVIDER_DATABASE = TestDatabaseFactory.getTestDatabase(1);
+    static final TestDatabase PROVIDER_DATABASE = new TestDatabaseViaTestcontainers();
     @RegisterExtension
-    static final TestDatabase CONSUMER_DATABASE = TestDatabaseFactory.getTestDatabase(2);
+    static final TestDatabase CONSUMER_DATABASE = new TestDatabaseViaTestcontainers();
 
     private ConnectorRemote providerConnector;
     private ConnectorRemote consumerConnector;

diff --git a/tests/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java b/tests/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java
@@ -16,7 +16,7 @@
 import de.sovity.edc.extension.e2e.connector.ConnectorRemote;
 import de.sovity.edc.extension.e2e.connector.MockDataAddressRemote;
 import de.sovity.edc.extension.e2e.db.TestDatabase;
-import de.sovity.edc.extension.e2e.db.TestDatabaseFactory;
+import de.sovity.edc.extension.e2e.db.TestDatabaseViaTestcontainers;
 import org.eclipse.edc.junit.extensions.EdcExtension;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -40,9 +40,9 @@ class ManagementApiTransferTest {
     static EdcExtension consumerEdcContext = new EdcExtension();
 
     @RegisterExtension
-    static final TestDatabase PROVIDER_DATABASE = TestDatabaseFactory.getTestDatabase(1);
+    static final TestDatabase PROVIDER_DATABASE = new TestDatabaseViaTestcontainers();
     @RegisterExtension
-    static final TestDatabase CONSUMER_DATABASE = TestDatabaseFactory.getTestDatabase(2);
+    static final TestDatabase CONSUMER_DATABASE = new TestDatabaseViaTestcontainers();
 
     private ConnectorRemote providerConnector;
     private ConnectorRemote consumerConnector;

diff --git a/tests/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java b/tests/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java
@@ -20,7 +20,7 @@
 import de.sovity.edc.extension.e2e.connector.ConnectorRemote;
 import de.sovity.edc.extension.e2e.connector.MockDataAddressRemote;
 import de.sovity.edc.extension.e2e.db.TestDatabase;
-import de.sovity.edc.extension.e2e.db.TestDatabaseFactory;
+import de.sovity.edc.extension.e2e.db.TestDatabaseViaTestcontainers;
 import org.assertj.core.api.SoftAssertions;
 import org.assertj.core.data.TemporalUnitLessThanOffset;
 import org.eclipse.edc.junit.extensions.EdcExtension;
@@ -54,9 +54,9 @@ class Ms8ConnectorMigrationTest {
     static EdcExtension consumerEdcContext = new EdcExtension();
 
     @RegisterExtension
-    static final TestDatabase PROVIDER_DATABASE = TestDatabaseFactory.getTestDatabase(1);
+    static final TestDatabase PROVIDER_DATABASE = new TestDatabaseViaTestcontainers();
     @RegisterExtension
-    static final TestDatabase CONSUMER_DATABASE = TestDatabaseFactory.getTestDatabase(2);
+    static final TestDatabase CONSUMER_DATABASE = new TestDatabaseViaTestcontainers();
 
     private ConnectorRemote providerConnector;
     private ConnectorRemote consumerConnector;

diff --git a/tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java b/tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java
@@ -38,7 +38,7 @@
 import de.sovity.edc.extension.e2e.connector.ConnectorRemote;
 import de.sovity.edc.extension.e2e.connector.MockDataAddressRemote;
 import de.sovity.edc.extension.e2e.db.TestDatabase;
-import de.sovity.edc.extension.e2e.db.TestDatabaseFactory;
+import de.sovity.edc.extension.e2e.db.TestDatabaseViaTestcontainers;
 import de.sovity.edc.utils.JsonUtils;
 import de.sovity.edc.utils.jsonld.vocab.Prop;
 import jakarta.json.Json;
@@ -76,9 +76,9 @@ class UiApiWrapperTest {
     static EdcExtension consumerEdcContext = new EdcExtension();
 
     @RegisterExtension
-    static final TestDatabase PROVIDER_DATABASE = TestDatabaseFactory.getTestDatabase(1);
+    static final TestDatabase PROVIDER_DATABASE = new TestDatabaseViaTestcontainers();
     @RegisterExtension
-    static final TestDatabase CONSUMER_DATABASE = TestDatabaseFactory.getTestDatabase(2);
+    static final TestDatabase CONSUMER_DATABASE = new TestDatabaseViaTestcontainers();
 
     private ConnectorRemote providerConnector;
     private ConnectorRemote consumerConnector;