-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Add InfluxDB v3 support #10596
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sbushmelev
wants to merge
5
commits into
testcontainers:main
Choose a base branch
from
sbushmelev:influx3-support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+260
−2
Open
Add InfluxDB v3 support #10596
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ac59b23
Add Influx db v3 support
sbushmelev fe09508
Corrected the comments for org.testcontainers.influxdb.InfluxDBContainer
sbushmelev 0a5296f
Add docs and fix comments
sbushmelev d861707
Merge branch 'main' into influx3-support
eddumelendez f711917
Change image version, fix tests
sbushmelev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
modules/influxdb/src/main/java/org/testcontainers/influxdb/InfluxDBContainer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| package org.testcontainers.influxdb; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.github.dockerjava.api.command.InspectContainerResponse; | ||
| import com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.HttpResponseException; | ||
| import com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.classic.methods.HttpPost; | ||
| import com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.impl.classic.CloseableHttpClient; | ||
| import com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.impl.classic.HttpClients; | ||
| import com.github.dockerjava.zerodep.shaded.org.apache.hc.core5.http.HttpStatus; | ||
| import org.testcontainers.containers.GenericContainer; | ||
| import org.testcontainers.containers.wait.strategy.HttpWaitStrategy; | ||
| import org.testcontainers.utility.DockerImageName; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
|
|
||
| import static java.lang.String.format; | ||
|
|
||
| /** | ||
| * Testcontainers implementation for InfluxDB 3 (InfluxDB IOx). | ||
| * <p> | ||
| * Supported image: {@code influxdb} | ||
| * <p> | ||
| * Exposed ports: 8181 | ||
| */ | ||
| public class InfluxDBContainer extends GenericContainer<InfluxDBContainer> { | ||
|
|
||
| /** | ||
| * The default port exposed by InfluxDB 3. | ||
| */ | ||
| private static final Integer INFLUXDB_PORT = 8181; | ||
|
|
||
| private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("influxdb"); | ||
|
|
||
| /** | ||
| * The authentication token for InfluxDB 3. | ||
| */ | ||
| private String token; | ||
|
|
||
| private boolean isAuthDisable; | ||
|
|
||
| /** | ||
| * Creates a new InfluxDB 3 container using the specified Docker image. | ||
| * | ||
| * @param dockerImageName the name of the Docker image | ||
| */ | ||
| public InfluxDBContainer(final DockerImageName dockerImageName) { | ||
| super(dockerImageName); | ||
| dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME); | ||
|
|
||
| this.waitStrategy = | ||
| new HttpWaitStrategy() | ||
| .forPath("/health") | ||
| .forStatusCodeMatching(stausCode -> stausCode.equals(200) || stausCode.equals(401)); | ||
|
|
||
| withCommand("influxdb3 serve --node-id local01 --object-store file --data-dir /home/influxdb3/.influxdb3"); | ||
|
|
||
| addExposedPort(INFLUXDB_PORT); | ||
| } | ||
|
|
||
| /** | ||
| * Creates an admin authentication token by making an HTTP request to the InfluxDB 3 instance. | ||
| * | ||
| * @return the generated authentication token | ||
| * @throws IllegalArgumentException if the token cannot be created due to HTTP or IO errors | ||
| * @throws HttpResponseException if the InfluxDB server returns a non-201 status code | ||
| */ | ||
| private String createToken() { | ||
| HttpPost httpPost = new HttpPost(format("%s/api/v3/configure/token/admin", getUrl())); | ||
|
|
||
| httpPost.setHeader("Accept", "application/json"); | ||
| httpPost.setHeader("Content-Type", "application/json"); | ||
|
|
||
| try (CloseableHttpClient httpClient = HttpClients.createDefault()) { | ||
| return httpClient.execute(httpPost, classicHttpResponse -> { | ||
| if (classicHttpResponse.getCode() != HttpStatus.SC_CREATED) { | ||
| throw new HttpResponseException( | ||
| classicHttpResponse.getCode(), | ||
| "Failed to get token" | ||
| ); | ||
| } | ||
| try (InputStream content = classicHttpResponse.getEntity().getContent()) { | ||
| return new ObjectMapper().readTree(content).get("token").asText(); | ||
| } | ||
| }); | ||
| } catch (IOException e) { | ||
| throw new IllegalArgumentException("Cannot get token", e); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Configures environment variables for the InfluxDB 3 container. | ||
| * <p> | ||
| * This is automatically called by Testcontainers during container startup. | ||
| * </p> | ||
| */ | ||
| @Override | ||
| protected void configure() { | ||
| addEnv("INFLUXDB3_START_WITHOUT_AUTH", Boolean.toString(isAuthDisable)); | ||
| } | ||
|
|
||
| /** | ||
| * Disables authentication for this InfluxDB instance. | ||
| * <p> | ||
| * When authentication is disabled, no token is required to access the database. | ||
| * </p> | ||
| * | ||
| * @return this container instance for method chaining | ||
| */ | ||
| public InfluxDBContainer withAuthDisabled() { | ||
| this.isAuthDisable = true; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the URL for connecting to this InfluxDB instance. | ||
| * <p> | ||
| * The URL includes the host and mapped port (since the actual port may change). | ||
| * </p> | ||
| * | ||
| * @return the HTTP URL to access InfluxDB (e.g., "http://localhost:32768") | ||
| */ | ||
| public String getUrl() { | ||
| return "http://" + getHost() + ":" + getMappedPort(INFLUXDB_PORT); | ||
| } | ||
|
|
||
| @Override | ||
| protected void containerIsStarted(InspectContainerResponse containerInfo) { | ||
| if (!isAuthDisable) { | ||
| this.token = createToken(); | ||
| } | ||
| } | ||
|
|
||
| public String getToken() { | ||
| return token; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
modules/influxdb/src/test/java/org/testcontainers/influxdb/InfluxDBV3ContainerTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package org.testcontainers.influxdb; | ||
|
|
||
| import com.influxdb.v3.client.InfluxDBClient; | ||
| import com.influxdb.v3.client.Point; | ||
| import org.junit.Test; | ||
| import org.testcontainers.containers.InfluxDBTestUtils; | ||
|
|
||
| import java.math.BigInteger; | ||
| import java.time.Instant; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.fail; | ||
|
|
||
| public class InfluxDBV3ContainerTest { | ||
|
|
||
| @Test | ||
| public void createInfluxDBContainerV3WithAuthTokenTest() { | ||
| try (final InfluxDBContainer container = new InfluxDBContainer(InfluxDBTestUtils.INFLUXDB_V3_TEST_IMAGE)) { | ||
| container.start(); | ||
| try (final InfluxDBClient client = InfluxDBClient.getInstance(container.getUrl(), container.getToken().toCharArray(), "test")) { | ||
| assertThat(client).isNotNull(); | ||
| assertThat(client.getServerVersion()).isEqualTo("3.3.0"); | ||
| } catch (Exception e) { | ||
| fail("Cannot get instance of influxdb v3", e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void createInfluxDBContainerV3WithDisableAuthTokenTest() { | ||
| try (final InfluxDBContainer container = new InfluxDBContainer(InfluxDBTestUtils.INFLUXDB_V3_TEST_IMAGE).withAuthDisabled()) { | ||
| container.start(); | ||
| try (final InfluxDBClient client = InfluxDBClient.getInstance(container.getUrl(), null, "test")) { | ||
| assertThat(client).isNotNull(); | ||
| assertThat(client.getServerVersion()).isEqualTo("3.3.0"); | ||
| } catch (Exception e) { | ||
| fail("Cannot get instance of influxdb v3", e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void getTokenWithAuthDisableTest() { | ||
| try (final InfluxDBContainer container = new InfluxDBContainer(InfluxDBTestUtils.INFLUXDB_V3_TEST_IMAGE).withAuthDisabled()) { | ||
| container.start(); | ||
| assertThat(container.getToken()).isNull(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void writeAndReadResultTest() { | ||
| try (final InfluxDBContainer container = new InfluxDBContainer(InfluxDBTestUtils.INFLUXDB_V3_TEST_IMAGE)) { | ||
| container.start(); | ||
| try (final InfluxDBClient client = InfluxDBClient.getInstance(container.getUrl(), container.getToken().toCharArray(), "test")) { | ||
| String location = "west"; | ||
| Double value = 55.15; | ||
| Point point = Point.measurement("temperature") | ||
| .setTag("location", location) | ||
| .setField("value", value) | ||
| .setTimestamp(Instant.now()); | ||
| client.writePoint(point); | ||
| String query = "select time,location,value from temperature"; | ||
| try (final Stream<Object[]> result = client.query(query)) { | ||
| List<Object[]> rows = result.collect(Collectors.toList()); | ||
| assertThat(rows).hasSize(1); | ||
| Object[] row = rows.get(0); | ||
| assertThat(row[0]).isNotNull().isInstanceOf(BigInteger.class); | ||
| assertThat((String) row[1]).isEqualTo(location); | ||
| assertThat((Double) row[2]).isEqualTo(value); | ||
| } | ||
| } catch (Exception e) { | ||
| fail("Cannot write or read data from influxdb v3", e); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.