Deprecate support for docker.elastic.co/elasticsearch/elasticsearch-o…

…ss (#4574) Since version 7.11.0, there is no more `docker.elastic.co/elasticsearch/elasticsearch-oss` artifact anymore. --------- Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
testcontainers · Nov 30, 2023 · 1bfb966 · 1bfb966
1 parent 89e7f23
commit 1bfb966
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
@@ -28,15 +28,6 @@ You can turn on security by providing a password:
 [HttpClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientSecuredContainer
 <!--/codeinclude-->
 
-## Choose your Elasticsearch license
-
-If you prefer to start a Docker image with the pure OSS version (which means with no security in older versions or
-other new and advanced features), you can use this instead:
-
-<!--codeinclude-->
-[Elasticsearch OSS](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:ossContainer
-<!--/codeinclude-->
-
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:

diff --git a/.../elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/.../elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java
@@ -8,7 +8,6 @@
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
-import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
@@ -60,6 +59,7 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
         "docker.elastic.co/elasticsearch/elasticsearch"
     );
 
+    @Deprecated
     private static final DockerImageName DEFAULT_OSS_IMAGE_NAME = DockerImageName.parse(
         "docker.elastic.co/elasticsearch/elasticsearch-oss"
     );
@@ -72,7 +72,8 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
     @Deprecated
     protected static final String DEFAULT_TAG = "7.9.2";
 
-    private final boolean isOss;
+    @Deprecated
+    private boolean isOss = false;
 
     private final boolean isAtLeastMajorVersion8;
 
@@ -103,9 +104,16 @@ public ElasticsearchContainer(String dockerImageName) {
     public ElasticsearchContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME, ELASTICSEARCH_IMAGE_NAME);
-        this.isOss = dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME);
 
-        withNetworkAliases("elasticsearch-" + Base58.randomString(6));
+        if (dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME)) {
+            this.isOss = true;
+            log.warn(
+                "{} is not supported anymore after 7.10.2. Please switch to {}",
+                dockerImageName.getUnversionedPart(),
+                DEFAULT_IMAGE_NAME.getUnversionedPart()
+            );
+        }
+
         withEnv("discovery.type", "single-node");
         // disable disk threshold checks
         withEnv("cluster.routing.allocation.disk.threshold_enabled", "false");

diff --git a/...sticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java b/...sticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
@@ -166,9 +166,7 @@ public void elasticsearchOssImage() throws IOException {
         try (
             // ossContainer {
             ElasticsearchContainer container = new ElasticsearchContainer(
-                DockerImageName
-                    .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                    .withTag(ELASTICSEARCH_VERSION)
+                "docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2"
             )
             // }
         ) {
@@ -282,11 +280,7 @@ public void incompatibleSettingsTest() {
         // The OSS image can not use security feature
         assertThat(
             catchThrowable(() -> {
-                new ElasticsearchContainer(
-                    DockerImageName
-                        .parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                        .withTag(ELASTICSEARCH_VERSION)
-                )
+                new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2")
                     .withPassword("foo");
             })
         )