Run mongosh or mongo if cmd exists (#5774)

Previously, the command execution relied on the image version which
is different when building custom images. Instead, `mongosh` or `mongo`
is executed if it is present within the PATH.

Author: eddumelendez

modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java

@@ -5,7 +5,6 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.utility.ComparableVersion;
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.IOException;
@@ -30,8 +29,6 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
 
     private static final String MONGODB_DATABASE_NAME_DEFAULT = "test";
 
-    private final boolean isAtLeastVersion6;
-
     /**
      * @deprecated use {@link MongoDBContainer(DockerImageName)} instead
      */
@@ -48,8 +45,6 @@ public MongoDBContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        this.isAtLeastVersion6 = new ComparableVersion(dockerImageName.getVersionPart()).isGreaterThanOrEqualTo("6.0");
-
         withExposedPorts(MONGODB_INTERNAL_PORT);
         withCommand("--replSet", "docker-rs");
         waitingFor(Wait.forLogMessage("(?i).*waiting for connections.*", 1));
@@ -92,8 +87,11 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
     }
 
     private String[] buildMongoEvalCommand(final String command) {
-        String cmd = this.isAtLeastVersion6 ? "mongosh" : "mongo";
-        return new String[] { cmd, "--eval", command };
+        return new String[] {
+            "sh",
+            "-c",
+            "mongosh mongo --eval \"" + command + "\"  || mongo --eval \"" + command + "\"",
+        };
     }
 
     private void checkMongoNodeExitCode(final Container.ExecResult execResult) {

modules/mongodb/src/test/java/org/testcontainers/containers/MongoDBContainerTest.java

@@ -30,56 +30,59 @@ public void shouldExecuteTransactions() {
             // startingMongoDBContainer {
             mongoDBContainer.start();
             // }
+            executeTx(mongoDBContainer);
+        }
+    }
 
-            final String mongoRsUrl = mongoDBContainer.getReplicaSetUrl();
-            assertThat(mongoRsUrl).isNotNull();
-            final String connectionString = mongoDBContainer.getConnectionString();
-            final MongoClient mongoSyncClientBase = MongoClients.create(connectionString);
-            final MongoClient mongoSyncClient = MongoClients.create(mongoRsUrl);
-            mongoSyncClient
-                .getDatabase("mydb1")
-                .getCollection("foo")
-                .withWriteConcern(WriteConcern.MAJORITY)
-                .insertOne(new Document("abc", 0));
-            mongoSyncClient
-                .getDatabase("mydb2")
-                .getCollection("bar")
-                .withWriteConcern(WriteConcern.MAJORITY)
-                .insertOne(new Document("xyz", 0));
-            mongoSyncClientBase
-                .getDatabase("mydb3")
-                .getCollection("baz")
-                .withWriteConcern(WriteConcern.MAJORITY)
-                .insertOne(new Document("def", 0));
+    private void executeTx(MongoDBContainer mongoDBContainer) {
+        final String mongoRsUrl = mongoDBContainer.getReplicaSetUrl();
+        assertThat(mongoRsUrl).isNotNull();
+        final String connectionString = mongoDBContainer.getConnectionString();
+        final MongoClient mongoSyncClientBase = MongoClients.create(connectionString);
+        final MongoClient mongoSyncClient = MongoClients.create(mongoRsUrl);
+        mongoSyncClient
+            .getDatabase("mydb1")
+            .getCollection("foo")
+            .withWriteConcern(WriteConcern.MAJORITY)
+            .insertOne(new Document("abc", 0));
+        mongoSyncClient
+            .getDatabase("mydb2")
+            .getCollection("bar")
+            .withWriteConcern(WriteConcern.MAJORITY)
+            .insertOne(new Document("xyz", 0));
+        mongoSyncClientBase
+            .getDatabase("mydb3")
+            .getCollection("baz")
+            .withWriteConcern(WriteConcern.MAJORITY)
+            .insertOne(new Document("def", 0));
 
-            final ClientSession clientSession = mongoSyncClient.startSession();
-            final TransactionOptions txnOptions = TransactionOptions
-                .builder()
-                .readPreference(ReadPreference.primary())
-                .readConcern(ReadConcern.LOCAL)
-                .writeConcern(WriteConcern.MAJORITY)
-                .build();
+        final ClientSession clientSession = mongoSyncClient.startSession();
+        final TransactionOptions txnOptions = TransactionOptions
+            .builder()
+            .readPreference(ReadPreference.primary())
+            .readConcern(ReadConcern.LOCAL)
+            .writeConcern(WriteConcern.MAJORITY)
+            .build();
 
-            final String trxResult = "Inserted into collections in different databases";
+        final String trxResult = "Inserted into collections in different databases";
 
-            TransactionBody<String> txnBody = () -> {
-                final MongoCollection<Document> coll1 = mongoSyncClient.getDatabase("mydb1").getCollection("foo");
-                final MongoCollection<Document> coll2 = mongoSyncClient.getDatabase("mydb2").getCollection("bar");
+        TransactionBody<String> txnBody = () -> {
+            final MongoCollection<Document> coll1 = mongoSyncClient.getDatabase("mydb1").getCollection("foo");
+            final MongoCollection<Document> coll2 = mongoSyncClient.getDatabase("mydb2").getCollection("bar");
 
-                coll1.insertOne(clientSession, new Document("abc", 1));
-                coll2.insertOne(clientSession, new Document("xyz", 999));
-                return trxResult;
-            };
+            coll1.insertOne(clientSession, new Document("abc", 1));
+            coll2.insertOne(clientSession, new Document("xyz", 999));
+            return trxResult;
+        };
 
-            try {
-                final String trxResultActual = clientSession.withTransaction(txnBody, txnOptions);
-                assertThat(trxResultActual).isEqualTo(trxResult);
-            } catch (RuntimeException re) {
-                throw new IllegalStateException(re.getMessage(), re);
-            } finally {
-                clientSession.close();
-                mongoSyncClient.close();
-            }
+        try {
+            final String trxResultActual = clientSession.withTransaction(txnBody, txnOptions);
+            assertThat(trxResultActual).isEqualTo(trxResult);
+        } catch (RuntimeException re) {
+            throw new IllegalStateException(re.getMessage(), re);
+        } finally {
+            clientSession.close();
+            mongoSyncClient.close();
         }
     }
 
@@ -103,6 +106,7 @@ public void shouldTestDatabaseName() {
     public void supportsMongoDB_6() {
         try (final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:6.0.1")) {
             mongoDBContainer.start();
+            executeTx(mongoDBContainer);
         }
     }
 }