From 52920969038734381da6bcfe7d46dc800ab5d222 Mon Sep 17 00:00:00 2001
From: rkerner <rkerner.mobil@gmail.com>
Date: Tue, 29 Aug 2023 19:38:16 +0200
Subject: [PATCH] DBZ-4395 Add connector specific Debezium Connect REST
 Extension/s and move logic from UI backend to the Debezium Connect REST
 Extension (part 1 of the re-architecturing/re-factoring) * fix that Docker
 networks should not be closed by MongoDb container managers
 (MongoDbReplicaSet and MongoDbShardedCluster)

closes to https://issues.redhat.com/browse/DBZ-4395
---
 .../testing/testcontainers/MongoDbContainer.java      | 11 ++++-------
 .../testing/testcontainers/MongoDbReplicaSet.java     |  2 +-
 .../testing/testcontainers/MongoDbShardedCluster.java |  1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbContainer.java b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbContainer.java
index c36340193..3ceb8f5a5 100644
--- a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbContainer.java
+++ b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbContainer.java
@@ -5,9 +5,6 @@
  */
 package io.debezium.testing.testcontainers;
 
-import static io.debezium.testing.testcontainers.util.DockerUtils.addFakeDnsEntry;
-import static io.debezium.testing.testcontainers.util.DockerUtils.isDockerDesktop;
-import static io.debezium.testing.testcontainers.util.DockerUtils.logDockerDesktopBanner;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.IntStream.range;
 
@@ -178,7 +175,7 @@ private MongoDbContainer(Builder builder) {
         this.authEnabled = builder.authEnabled;
         this.configAddress = builder.configAddress;
 
-        if (isDockerDesktop()) {
+        if (DockerUtils.isDockerDesktop()) {
             this.port = portResolver.resolveFreePort();
             addFixedExposedPort(port, port);
         }
@@ -186,7 +183,7 @@ private MongoDbContainer(Builder builder) {
             this.port = builder.port;
         }
 
-        logDockerDesktopBanner(LOGGER, List.of(name), builder.skipDockerDesktopLogWarning);
+        DockerUtils.logDockerDesktopBanner(LOGGER, List.of(name), builder.skipDockerDesktopLogWarning);
 
         withNetwork(builder.network);
         withNetworkAliases(name);
@@ -228,7 +225,7 @@ public Address getClientAddress() {
         checkStarted();
 
         // Technically we only need to do this for Mac
-        if (isDockerDesktop()) {
+        if (DockerUtils.isDockerDesktop()) {
             return getNamedAddress();
         }
 
@@ -392,7 +389,7 @@ private void checkStarted() {
     @Override
     protected void containerIsStarted(InspectContainerResponse containerInfo) {
         super.containerIsStarted(containerInfo);
-        addFakeDnsEntry(name);
+        DockerUtils.addFakeDnsEntry(name);
     }
 
     /**
diff --git a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbReplicaSet.java b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbReplicaSet.java
index f7369ba0e..c916b15eb 100644
--- a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbReplicaSet.java
+++ b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbReplicaSet.java
@@ -280,7 +280,7 @@ public void start() {
     public void stop() {
         LOGGER.info("[{}] Stopping...", name);
         MoreStartables.deepStopSync(members.stream());
-        network.close();
+        started = false;
     }
 
     private void initializeReplicaSet() {
diff --git a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbShardedCluster.java b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbShardedCluster.java
index 5c9ecf3ae..a4edb0b9a 100644
--- a/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbShardedCluster.java
+++ b/debezium-testing/debezium-testing-testcontainers/src/main/java/io/debezium/testing/testcontainers/MongoDbShardedCluster.java
@@ -148,7 +148,6 @@ public void stop() {
         // Idempotent
         LOGGER.info("Stopping {} shard cluster...", shards.size());
         MoreStartables.deepStopSync(stream());
-        network.close();
     }
 
     public int size() {