Add InfluxDB v2 support

docs/modules/databases/influxdb.md

@@ -1,22 +1,53 @@
 # InfluxDB Module
 
-Testcontainers module for InfluxData [InfluxDB](https://github.com/influxdata/influxdb).
+Testcontainers module for InfluxData [InfluxDB](https://www.influxdata.com/products/influxdb/).
 
-## Usage example
+## Important Note
+
+They are breaking changes in InfluxDB v2.x. For more information refer to the
+main [documentation](https://docs.influxdata.com/influxdb/v2.0/upgrade/v1-to-v2/). InfluxDB
+official [container registry](https://hub.docker.com/_/influxdb) on docker hub.
+
+## InfluxDB V2.x Usage example
 
 Running influxDbContainer as a stand-in for InfluxDB in a test:
 
-```java
-public class SomeTest {
+<!--codeinclude-->
+[InfluxDBContainerV2Test](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV2Test.java)
+<!--/codeinclude-->
 
-    @Rule
-    public InfluxDBContainer influxDbContainer = new InfluxDBContainer();
-
-    @Test
-    public void someTestMethod() {
-         InfluxDB influxDB = influxDbContainer.getNewInfluxDB();
-         ...
-```
+
+The influxDB will be setup with the following data:<br/>
+
+| Property      | Default Value | 
+| ------------- |:-------------:|
+| username      | test-user     | 
+| password      | test-password | 
+| organization  | test-org      |
+| bucket        | test-bucket   |  
+| retention     | 0 (infinite)  |
+| adminToken    |       -       |
+
+For more details about the InfluxDB setup go to the
+official [docs](https://docs.influxdata.com/influxdb/v2.0/upgrade/v1-to-v2/docker/#influxdb-2x-initialization-credentials)
+.
+
+It is possible to override the default values, take a look at these tests:
+
+<!--codeinclude-->
+[InfluxDBContainerV2WithUserTest](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV2WithUserTest.java)
+<!--/codeinclude-->
+
+**NOTE**: You can find the latest documentation about the influxdb v2.x java
+client [here](https://github.com/influxdata/influxdb-client-java).
+
+## InfluxDB V1.x Usage example (Deprecated)
+
+Running influxDbContainer as a stand-in for InfluxDB in a test:
+
+<!--codeinclude-->
+[InfluxDBContainerV1Test](../../../modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java)
+<!--/codeinclude-->
 
 ## Adding this module to your project dependencies
 

modules/influxdb/build.gradle

@@ -3,6 +3,9 @@ description = "Testcontainers :: InfluxDB"
 dependencies {
     api project(':testcontainers')
 
-    compileOnly 'org.influxdb:influxdb-java:2.21'
-    testImplementation 'org.influxdb:influxdb-java:2.21'
+    implementation "org.influxdb:influxdb-java:2.21"
+    implementation "org.influxdb:influxdb-java:2.21"
+
+    implementation "com.influxdb:influxdb-client-java:3.1.0"
+    testImplementation "com.influxdb:influxdb-client-java:3.1.0"
 }

modules/influxdb/src/main/java/org/testcontainers/containers/InfluxDBContainer.java

@@ -1,163 +1,22 @@
 package org.testcontainers.containers;
 
-import org.influxdb.InfluxDB;
-import org.influxdb.InfluxDBFactory;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.Collections;
-import java.util.Set;
-
 /**
- * See <a href="https://store.docker.com/images/influxdb">https://store.docker.com/images/influxdb</a>
+ * @deprecated instead use {@link InfluxDBContainerV1#InfluxDBContainerV1(DockerImageName) } for InfluxDB 1.x or {@link
+ * InfluxDBContainerV2#InfluxDBContainerV2(DockerImageName)} for InfluxDB 2.x instead
  */
-public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends GenericContainer<SELF> {
-
-    public static final Integer INFLUXDB_PORT = 8086;
-
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("influxdb");
-    private static final String DEFAULT_TAG = "1.4.3";
-
-    @Deprecated
-    public static final String VERSION = DEFAULT_TAG;
-
-    private boolean authEnabled = true;
-    private String admin = "admin";
-    private String adminPassword = "password";
-
-    private String database;
-    private String username = "any";
-    private String password = "any";
-
-    /**
-     * @deprecated use {@link InfluxDBContainer(DockerImageName)} instead
-     */
-    @Deprecated
+@Deprecated
+public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends InfluxDBContainerV1<SELF> {
     public InfluxDBContainer() {
-        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+        super();
     }
 
-    /**
-     * @deprecated use {@link InfluxDBContainer(DockerImageName)} instead
-     */
-    @Deprecated
     public InfluxDBContainer(final String version) {
-        this(DEFAULT_IMAGE_NAME.withTag(version));
-    }
-
-    public InfluxDBContainer(final DockerImageName dockerImageName) {
-        super(dockerImageName);
-
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-
-        waitStrategy = new WaitAllStrategy()
-            .withStrategy(Wait.forHttp("/ping").withBasicCredentials(username, password).forStatusCode(204))
-            .withStrategy(Wait.forListeningPort());
-
-        addExposedPort(INFLUXDB_PORT);
-    }
-
-    @Override
-    protected void configure() {
-        addEnv("INFLUXDB_ADMIN_USER", admin);
-        addEnv("INFLUXDB_ADMIN_PASSWORD", adminPassword);
-
-        addEnv("INFLUXDB_HTTP_AUTH_ENABLED", String.valueOf(authEnabled));
-
-        addEnv("INFLUXDB_DB", database);
-        addEnv("INFLUXDB_USER", username);
-        addEnv("INFLUXDB_USER_PASSWORD", password);
-    }
-
-    @Override
-    public Set<Integer> getLivenessCheckPortNumbers() {
-        return Collections.singleton(getMappedPort(INFLUXDB_PORT));
-    }
-
-    /**
-     * Set env variable `INFLUXDB_HTTP_AUTH_ENABLED`.
-     *
-     * @param authEnabled Enables authentication.
-     * @return a reference to this container instance
-     */
-    public SELF withAuthEnabled(final boolean authEnabled) {
-        this.authEnabled = authEnabled;
-        return self();
-    }
-
-    /**
-     * Set env variable `INFLUXDB_ADMIN_USER`.
-     *
-     * @param admin The name of the admin user to be created. If this is unset, no admin user is created.
-     * @return a reference to this container instance
-     */
-    public SELF withAdmin(final String admin) {
-        this.admin = admin;
-        return self();
-    }
-
-    /**
-     * Set env variable `INFLUXDB_ADMIN_PASSWORD`.
-     *
-     * @param adminPassword TThe password for the admin user configured with `INFLUXDB_ADMIN_USER`. If this is unset, a
-     *                      random password is generated and printed to standard out.
-     * @return a reference to this container instance
-     */
-    public SELF withAdminPassword(final String adminPassword) {
-        this.adminPassword = adminPassword;
-        return self();
-    }
-
-    /**
-     * Set env variable `INFLUXDB_DB`.
-     *
-     * @param database Automatically initializes a database with the name of this environment variable.
-     * @return a reference to this container instance
-     */
-    public SELF withDatabase(final String database) {
-        this.database = database;
-        return self();
-    }
-
-    /**
-     * Set env variable `INFLUXDB_USER`.
-     *
-     * @param username The name of a user to be created with no privileges. If `INFLUXDB_DB` is set, this user will
-     *                 be granted read and write permissions for that database.
-     * @return a reference to this container instance
-     */
-    public SELF withUsername(final String username) {
-        this.username = username;
-        return self();
-    }
-
-    /**
-     * Set env variable `INFLUXDB_USER_PASSWORD`.
-     *
-     * @param password The password for the user configured with `INFLUXDB_USER`. If this is unset, a random password
-     *                 is generated and printed to standard out.
-     * @return a reference to this container instance
-     */
-    public SELF withPassword(final String password) {
-        this.password = password;
-        return self();
-    }
-
-
-    /**
-     * @return a url to influxDb
-     */
-    public String getUrl() {
-        return "http://" + getHost() + ":" + getLivenessCheckPort();
+        super(version);
     }
 
-    /**
-     * @return a influxDb client
-     */
-    public InfluxDB getNewInfluxDB() {
-        InfluxDB influxDB = InfluxDBFactory.connect(getUrl(), username, password);
-        influxDB.setDatabase(database);
-        return influxDB;
+    public InfluxDBContainer(final DockerImageName influxdbTestImage) {
+        super(influxdbTestImage);
     }
 }