Removing redundant postgres docker directory.

eventuate-local · Apr 11, 2018 · 5a24d0e · 5a24d0e
1 parent 81d01be
commit 5a24d0e
Show file tree

Hide file tree

Showing 19 changed files with 66 additions and 128 deletions.
diff --git a/docker-compose-postgres-wal.yml b/docker-compose-postgres-wal.yml
@@ -17,7 +17,7 @@ kafka:
     - ZOOKEEPER_SERVERS=zookeeper:2181
 
 postgres:
-  build: ./postgres-wal
+  build: ./postgres
   ports:
     - 5432:5432
   environment:

diff --git a/...tgres-wal/src/test/java/io/eventuate/local/postgres/wal/DatabaseOffsetKafkaStoreTest.java b/...tgres-wal/src/test/java/io/eventuate/local/postgres/wal/DatabaseOffsetKafkaStoreTest.java
@@ -2,14 +2,12 @@
 
 import io.eventuate.local.db.log.test.util.AbstractDatabaseOffsetKafkaStoreTest;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @ActiveProfiles("PostgresWal")
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = PostgresWalCdcIntegrationTestConfiguration.class)
-@IntegrationTest
+@SpringBootTest(classes = PostgresWalCdcIntegrationTestConfiguration.class)
 public class DatabaseOffsetKafkaStoreTest extends AbstractDatabaseOffsetKafkaStoreTest {
 }
diff --git a/...es-wal/src/test/java/io/eventuate/local/postgres/wal/DuplicatePublishingDetectorTest.java b/...es-wal/src/test/java/io/eventuate/local/postgres/wal/DuplicatePublishingDetectorTest.java
@@ -2,14 +2,12 @@
 
 import io.eventuate.local.db.log.test.util.AbstractDuplicatePublishingDetectorTest;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @ActiveProfiles("PostgresWal")
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = PostgresWalCdcIntegrationTestConfiguration.class)
-@IntegrationTest
+@SpringBootTest(classes = PostgresWalCdcIntegrationTestConfiguration.class)
 public class DuplicatePublishingDetectorTest extends AbstractDuplicatePublishingDetectorTest {
 }
diff --git a/.../src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcCustomDBIntegrationTest.java b/.../src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcCustomDBIntegrationTest.java
@@ -6,17 +6,13 @@
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.util.stream.Collectors;
-
 @ActiveProfiles("PostgresWal")
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {CustomDBTestConfiguration.class, PostgresWalCdcIntegrationTestConfiguration.class})
-@IntegrationTest
+@SpringBootTest(classes = {CustomDBTestConfiguration.class, PostgresWalCdcIntegrationTestConfiguration.class})
 public class PostgresWalCdcCustomDBIntegrationTest extends AbstractPostgresWalCdcIntegrationTest {
 
   @Autowired

diff --git a/...l/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcEmptyDBIntegrationTest.java b/...l/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcEmptyDBIntegrationTest.java
@@ -6,15 +6,13 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @ActiveProfiles("PostgresWal")
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {EmptyDBTestConfiguration.class, PostgresWalCdcIntegrationTestConfiguration.class})
-@IntegrationTest
+@SpringBootTest(classes = {EmptyDBTestConfiguration.class, PostgresWalCdcIntegrationTestConfiguration.class})
 public class PostgresWalCdcEmptyDBIntegrationTest extends AbstractPostgresWalCdcIntegrationTest {
 
   @Value("${eventuate.database.schema}")

diff --git a/...gres-wal/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcIntegrationTest.java b/...gres-wal/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcIntegrationTest.java
@@ -1,14 +1,12 @@
 package io.eventuate.local.postgres.wal;
 
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @ActiveProfiles("PostgresWal")
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = PostgresWalCdcIntegrationTestConfiguration.class)
-@IntegrationTest
+@SpringBootTest(classes = PostgresWalCdcIntegrationTestConfiguration.class)
 public class PostgresWalCdcIntegrationTest extends AbstractPostgresWalCdcIntegrationTest {
 }
diff --git a/...test/java/io/eventuate/local/postgres/wal/PostgresWalCdcIntegrationTestConfiguration.java b/...test/java/io/eventuate/local/postgres/wal/PostgresWalCdcIntegrationTestConfiguration.java
@@ -10,13 +10,11 @@
 import io.eventuate.local.testutil.SqlScriptEditor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Profile;
 
-import java.util.List;
 import java.util.stream.Collectors;
 
 @Configuration
@@ -103,7 +101,12 @@ public PublishingStrategy<PublishedEvent> publishingStrategy() {
   public SqlScriptEditor sqlScriptEditor() {
     return sqlList -> {
       sqlList.set(0, sqlList.get(0).replace("CREATE SCHEMA", "CREATE SCHEMA IF NOT EXISTS"));
-      return sqlList.stream().map(s -> s.replace("eventuate", "custom")).collect(Collectors.toList());
+
+      return sqlList
+              .stream()
+              .limit(sqlList.size() - 1)
+              .map(s -> s.replace("eventuate", "custom"))
+              .collect(Collectors.toList());
     };
   }
 }
diff --git a/...s-wal/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcKafkaPublisherTest.java b/...s-wal/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcKafkaPublisherTest.java
@@ -2,15 +2,13 @@
 
 import io.eventuate.local.db.log.test.util.AbstractDbLogBasedCdcKafkaPublisherTest;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 
 @ActiveProfiles("PostgresWal")
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = PostgresWalCdcIntegrationTestConfiguration.class)
-@IntegrationTest
+@SpringBootTest(classes = PostgresWalCdcIntegrationTestConfiguration.class)
 public class PostgresWalCdcKafkaPublisherTest extends AbstractDbLogBasedCdcKafkaPublisherTest {
 }
diff --git a/...al/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcProcessorCustomDBTest.java b/...al/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcProcessorCustomDBTest.java
@@ -7,17 +7,13 @@
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.util.stream.Collectors;
-
 @ActiveProfiles("PostgresWal")
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {CustomDBTestConfiguration.class, PostgresWalCdcIntegrationTestConfiguration.class})
-@IntegrationTest
+@SpringBootTest(classes = {CustomDBTestConfiguration.class, PostgresWalCdcIntegrationTestConfiguration.class})
 public class PostgresWalCdcProcessorCustomDBTest extends AbstractPostgresWalCdcProcessorTest {
 
   @Autowired

diff --git a/...wal/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcProcessorEmptyDBTest.java b/...wal/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcProcessorEmptyDBTest.java
@@ -6,15 +6,13 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @ActiveProfiles("PostgresWal")
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {EmptyDBTestConfiguration.class, PostgresWalCdcIntegrationTestConfiguration.class})
-@IntegrationTest
+@SpringBootTest(classes = {EmptyDBTestConfiguration.class, PostgresWalCdcIntegrationTestConfiguration.class})
 public class PostgresWalCdcProcessorEmptyDBTest extends AbstractPostgresWalCdcProcessorTest {
 
   @Value("${eventuate.database.schema}")

diff --git a/...stgres-wal/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcProcessorTest.java b/...stgres-wal/src/test/java/io/eventuate/local/postgres/wal/PostgresWalCdcProcessorTest.java
@@ -1,14 +1,12 @@
 package io.eventuate.local.postgres.wal;
 
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @ActiveProfiles("PostgresWal")
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = PostgresWalCdcIntegrationTestConfiguration.class)
-@IntegrationTest
+@SpringBootTest(classes = PostgresWalCdcIntegrationTestConfiguration.class)
 public class PostgresWalCdcProcessorTest extends AbstractPostgresWalCdcProcessorTest {
 }
diff --git a/postgres-wal/Dockerfile b/postgres-wal/Dockerfile
diff --git a/postgres-wal/build-docker.sh b/postgres-wal/build-docker.sh
diff --git a/postgres-wal/initialize-database.sql b/postgres-wal/initialize-database.sql
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
@@ -1,2 +1,38 @@
-FROM postgres:9.6.5
+FROM postgres:9.6
+
+ENV PLUGIN_VERSION=v0.7.0
+ENV WAL2JSON_COMMIT_ID=f68cb0096c669a2ee5a2d32b54a535513e3cb23b
+
+# Install the packages which will be required to get everything to compile
+RUN apt-get update \
+    && apt-get install -f -y --no-install-recommends \
+        software-properties-common \
+        build-essential \
+        pkg-config \ 
+        git \
+        postgresql-server-dev-9.6 \
+        libproj-dev \
+    && apt-get clean && apt-get update && apt-get install -f -y --no-install-recommends \            
+        liblwgeom-dev \              
+    && add-apt-repository "deb http://ftp.debian.org/debian testing main contrib" \ 
+    && apt-get install nano \
+    && apt-get update && apt-get install -f -y --no-install-recommends \
+        libprotobuf-c-dev=1.2.* \
+    && rm -rf /var/lib/apt/lists/*             
+
+RUN git clone https://github.com/eulerto/wal2json -b master --single-branch \
+    && cd /wal2json \
+    && git checkout $WAL2JSON_COMMIT_ID \
+    && make && make install \
+    && cd / \
+    && rm -rf wal2json
+
+# Copy the custom configuration which will be passed down to the server (using a .sample file is the preferred way of doing it by
+# the base Docker image)
+COPY postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample
+
+# Copy the script which will initialize the replication permissions
+COPY docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
+
+# Initialize schema
 COPY initialize-database.sql /docker-entrypoint-initdb.d
diff --git a/postgres/build-docker.sh b/postgres/build-docker.sh
@@ -1,3 +1 @@
-#! /bin/bash -e
-
-docker build -t test-eventuateio-local-postgres .
+docker build -t test-postgres-wal .
diff --git a/...r-entrypoint-initdb.d/init-permissions.sh → ...r-entrypoint-initdb.d/init-permissions.sh b/...r-entrypoint-initdb.d/init-permissions.sh → ...r-entrypoint-initdb.d/init-permissions.sh
diff --git a/postgres/initialize-database.sql b/postgres/initialize-database.sql
@@ -35,4 +35,6 @@ CREATE TABLE eventuate.snapshots (
   snapshot_json VARCHAR(1000) NOT NULL,
   triggering_events VARCHAR(1000),
   PRIMARY KEY(entity_type, entity_id, entity_version)
-);
+);
+
+SELECT * FROM pg_create_logical_replication_slot('eventuate_slot', 'wal2json');
diff --git a/postgres-wal/postgresql.conf.sample → postgres/postgresql.conf.sample b/postgres-wal/postgresql.conf.sample → postgres/postgresql.conf.sample