Revert DocumentDB source hosts array to host string

Signed-off-by: Dinu John <[email protected]>
dinujoh · Apr 24, 2024 · ab46266 · ab46266
1 parent 92efb15
commit ab46266
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/...godb/src/main/java/org/opensearch/dataprepper/plugins/mongo/client/MongoDBConnection.java b/...godb/src/main/java/org/opensearch/dataprepper/plugins/mongo/client/MongoDBConnection.java
@@ -54,12 +54,12 @@ private static String getConnectionString(final MongoDBSourceConfig sourceConfig
             throw new RuntimeException("Unsupported characters in password.");
         }
 
-        if (sourceConfig.getHosts() == null || sourceConfig.getHosts().length == 0) {
-            throw new RuntimeException("The hosts array should at least have one host.");
+        if (sourceConfig.getHost() == null || sourceConfig.getHost().isBlank()) {
+            throw new RuntimeException("The host should not be null or empty.");
         }
 
         // Support for only single host
-        final String hostname = sourceConfig.getHosts()[0];
+        final String hostname = sourceConfig.getHost();
         final int port = sourceConfig.getPort();
         final String tls = sourceConfig.getTls().toString();
         final String invalidHostAllowed = sourceConfig.getSslInsecureDisableVerification().toString();

diff --git a/...main/java/org/opensearch/dataprepper/plugins/mongo/configuration/MongoDBSourceConfig.java b/...main/java/org/opensearch/dataprepper/plugins/mongo/configuration/MongoDBSourceConfig.java
@@ -12,12 +12,11 @@ public class MongoDBSourceConfig {
     private static final int DEFAULT_PORT = 27017;
     private static final Boolean DEFAULT_INSECURE = false;
     private static final Boolean DEFAULT_INSECURE_DISABLE_VERIFICATION = false;
-    private static final String DEFAULT_SNAPSHOT_FETCH_SIZE = "1000";
     private static final String DEFAULT_READ_PREFERENCE = "primaryPreferred";
     private static final Boolean DEFAULT_DIRECT_CONNECT = true;
     private static final Duration DEFAULT_ACKNOWLEDGEMENT_SET_TIMEOUT = Duration.ofHours(2);
-    @JsonProperty("hosts")
-    private @NotNull String[] hosts;
+    @JsonProperty("host")
+    private @NotNull String host;
     @JsonProperty("port")
     private int port = DEFAULT_PORT;
     @JsonProperty("trust_store_file_path")
@@ -27,8 +26,6 @@ public class MongoDBSourceConfig {
     @JsonProperty("authentication")
     private AuthenticationConfig authenticationConfig;
 
-    @JsonProperty("snapshot_fetch_size")
-    private String snapshotFetchSize;
     @JsonProperty("read_preference")
     private String readPreference;
     @JsonProperty("collections")
@@ -61,7 +58,6 @@ public class MongoDBSourceConfig {
     private AwsConfig awsConfig;
 
     public MongoDBSourceConfig() {
-        this.snapshotFetchSize = DEFAULT_SNAPSHOT_FETCH_SIZE;
         this.readPreference = DEFAULT_READ_PREFERENCE;
         this.collections = new ArrayList<>();
         this.insecure = DEFAULT_INSECURE;
@@ -74,8 +70,8 @@ public AuthenticationConfig getAuthenticationConfig() {
         return this.authenticationConfig;
     }
 
-    public String[] getHosts() {
-        return this.hosts;
+    public String getHost() {
+        return this.host;
     }
 
     public int getPort() {

diff --git a/.../src/test/java/org/opensearch/dataprepper/plugins/mongo/client/MongoDBConnectionTest.java b/.../src/test/java/org/opensearch/dataprepper/plugins/mongo/client/MongoDBConnectionTest.java
@@ -36,7 +36,7 @@ void setUp() {
         when(mongoDBSourceConfig.getAuthenticationConfig()).thenReturn(authenticationConfig);
         when(authenticationConfig.getUsername()).thenReturn("\uD800\uD800" + UUID.randomUUID());
         when(authenticationConfig.getPassword()).thenReturn("aЯ ⾀sd?q=%%l€0£.lo" + UUID.randomUUID());
-        when(mongoDBSourceConfig.getHosts()).thenReturn(new String[] { UUID.randomUUID().toString() });
+        when(mongoDBSourceConfig.getHost()).thenReturn(UUID.randomUUID().toString());
         when(mongoDBSourceConfig.getPort()).thenReturn(getRandomInteger());
         when(mongoDBSourceConfig.getTls()).thenReturn(getRandomBoolean());
         when(mongoDBSourceConfig.getSslInsecureDisableVerification()).thenReturn(getRandomBoolean());
@@ -71,7 +71,7 @@ public void getMongoClientNullHost() {
         when(mongoDBSourceConfig.getAuthenticationConfig()).thenReturn(authenticationConfig);
         when(authenticationConfig.getUsername()).thenReturn("\uD800\uD800" + UUID.randomUUID());
         when(authenticationConfig.getPassword()).thenReturn("aЯ ⾀sd?q=%%l€0£.lo" + UUID.randomUUID());
-        when(mongoDBSourceConfig.getHosts()).thenReturn(null);
+        when(mongoDBSourceConfig.getHost()).thenReturn(null);
         assertThrows(RuntimeException.class, () -> MongoDBConnection.getMongoClient(mongoDBSourceConfig));
     }
 
@@ -80,7 +80,7 @@ public void getMongoClientEmptyHost() {
         when(mongoDBSourceConfig.getAuthenticationConfig()).thenReturn(authenticationConfig);
         when(authenticationConfig.getUsername()).thenReturn("\uD800\uD800" + UUID.randomUUID());
         when(authenticationConfig.getPassword()).thenReturn("aЯ ⾀sd?q=%%l€0£.lo" + UUID.randomUUID());
-        when(mongoDBSourceConfig.getHosts()).thenReturn(new String[]{});
+        when(mongoDBSourceConfig.getHost()).thenReturn(" ");
         assertThrows(RuntimeException.class, () -> MongoDBConnection.getMongoClient(mongoDBSourceConfig));
     }