[OTPL-6466] Using PostgreSQLContainer as a back end with same API

CHANGELOG.md

@@ -1,3 +1,22 @@
+
+1.0.0
+-----
+* A completely rewritten version of `otj-pg-embedded`. Uses "testcontainers" for docker, while preserving API compatibility.
+
+Advantages
+* multi arch (m1 etc) support
+* Works the same way on every OS - Mac, Windows, Linux. Please note the maintainers only test on Mac Linux
+* Easy to switch docker image tag to upgrade versions
+* More maintainable and secure (you can pull docker images you trust, instead of trusting our tarballs)
+
+A few Disadvantages
+
+* Slower than running a tarball
+* A few compatibility drops and options have probably disappeared. Feel free to submit PRs
+
+No further PRs or tickets will be accepted for the pre 1.0.0 release. In addition, before filing tickets, please
+test your docker environment etc. 
+
 0.13.4
 ------
 * POM 287, Flyway 7

README.md

@@ -48,31 +48,22 @@ independent databases gives you.
 
 ## Postgres version
 
-The JAR file contains bundled version of Postgres. You can pass different Postgres version by implementing [`PgBinaryResolver`](src/main/java/com/opentable/db/postgres/embedded/PgBinaryResolver.java).
+It is possible to change postgres version:
 
-Example:
 ```java
-class ClasspathBinaryResolver implements PgBinaryResolver {
-    public InputStream getPgBinary(String system, String machineHardware) throws IOException {
-        ClassPathResource resource = new ClassPathResource(format("postgresql-%s-%s.txz", system, machineHardware));
-        return resource.getInputStream();
-    }
-}
-
-EmbeddedPostgreSQL
-            .builder()
-            .setPgBinaryResolver(new ClasspathBinaryResolver())
-            .start();
-
+    EmbeddedPostgres.builder()
+        .setTag("10")
+        .start();
 ```
 
-## Windows
+or use custom image:
 
-If you experience difficulty running `otj-pg-embedded` tests on Windows, make sure
-you've installed the appropriate MFC redistributables.
+```java
+    EmbeddedPostgres.builder()
+        .setImage(DockerImageName.parse("docker.otenv.com/super-postgres"))
+        .start();
+```
 
-* [Microsoft Site](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads])
-* [Github issue discussing this](https://github.com/opentable/otj-pg-embedded/issues/65)
 
 ## Using JUnit5
 

pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.opentable</groupId>
     <artifactId>otj-parent-spring</artifactId>
-    <version>287</version>
+    <version>308</version>
   </parent>
 
   <scm>
@@ -31,7 +31,7 @@
 
   <groupId>com.opentable.components</groupId>
   <artifactId>otj-pg-embedded</artifactId>
-  <version>0.13.5-SNAPSHOT</version>
+  <version>1.01.1-SNAPSHOT</version>
   <description>Embedded PostgreSQL driver</description>
 
   <properties>
@@ -51,27 +51,6 @@
     </license>
   </licenses>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.3.2</version>
-        <executions>
-          <execution>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <executable>./repack-postgres.sh</executable>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -83,27 +62,6 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.tukaani</groupId>
-      <artifactId>xz</artifactId>
-      <version>1.5</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-core</artifactId>
@@ -120,9 +78,14 @@
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>com.github.spotbugs</groupId>
-      <artifactId>spotbugs-annotations</artifactId>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>postgresql</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers</artifactId>
     </dependency>
 
     <dependency>
@@ -157,4 +120,31 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>${dep.testcontainers.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers</artifactId>
+        <version>${dep.testcontainers.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>

src/main/java/com/opentable/db/postgres/embedded/ConnectionInfo.java

@@ -17,11 +17,13 @@ public class ConnectionInfo {
     private final String dbName;
     private final int port;
     private final String user;
+    private final String password;
 
-    public ConnectionInfo(final String dbName, final int port, final String user) {
+    public ConnectionInfo(final String dbName, final int port, final String user, final String password) {
         this.dbName = dbName;
         this.port = port;
         this.user = user;
+        this.password = password;
     }
 
     public String getUser() {
@@ -35,4 +37,8 @@ public String getDbName() {
     public int getPort() {
         return port;
     }
+
+    public String getPassword() {
+        return password;
+    }
 }