Deduplicate opensearch roles in datanode (#23100)

* Deduplicate opensearch roles in datanode #22569

* added test, fixed impl

* added changelog

Author: todvora

changelog/unreleased/pr-23100.toml

@@ -0,0 +1,5 @@
+type = "f"
+message = "Deduplicate opensearch node roles in datanode"
+
+pulls = ["23100"]
+issues = ["22569"]

data-node/src/main/java/org/graylog/datanode/opensearch/configuration/OpensearchConfiguration.java

@@ -60,9 +60,7 @@ public OpensearchConfiguration(OpensearchDistribution opensearchDistribution, Da
 
     @Nonnull
     private String buildRolesList() {
-        return configurationParts.stream()
-                .flatMap(cfg -> cfg.nodeRoles().stream())
-                .collect(Collectors.joining(","));
+         return String.join(",", opensearchRoles());
     }
 
     public Environment getEnv() {
@@ -128,6 +126,7 @@ public Optional<KeystoreInformation> transportCertificate() {
     public List<String> opensearchRoles() {
         return configurationParts.stream()
                 .flatMap(cfg -> cfg.nodeRoles().stream())
+                .distinct()
                 .collect(Collectors.toList());
     }
 

data-node/src/test/java/org/graylog/datanode/opensearch/configuration/OpensearchConfigurationTest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2020 Graylog, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Server Side Public License, version 1,
+ * as published by MongoDB, Inc.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Server Side Public License for more details.
+ *
+ * You should have received a copy of the Server Side Public License
+ * along with this program. If not, see
+ * <http://www.mongodb.com/licensing/server-side-public-license>.
+ */
+package org.graylog.datanode.opensearch.configuration;
+
+import org.assertj.core.api.Assertions;
+import org.graylog.datanode.OpensearchDistribution;
+import org.graylog.datanode.configuration.DatanodeDirectories;
+import org.graylog.datanode.process.configuration.beans.DatanodeConfigurationPart;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Path;
+import java.util.List;
+
+class OpensearchConfigurationTest {
+
+    @Test
+    void testDeduplicatedOpensearchRoles(@TempDir Path tempDir) {
+        final DatanodeDirectories datanodeDirectories = new DatanodeDirectories(tempDir, tempDir, tempDir, tempDir);
+
+        final DatanodeConfigurationPart cp1 = DatanodeConfigurationPart.builder().addNodeRole("search").build();
+        final DatanodeConfigurationPart cp2 = DatanodeConfigurationPart.builder().addNodeRole("search").build();
+        final DatanodeConfigurationPart cp3 = DatanodeConfigurationPart.builder().nodeRoles(List.of("cluster_manager", "data", "ingest", "remote_cluster_client")).build();
+
+        final OpensearchConfiguration configuration = new OpensearchConfiguration(new OpensearchDistribution(tempDir, "2.15.0"), datanodeDirectories, "localhost", 9200, List.of(cp1, cp2, cp3));
+
+        Assertions.assertThat(configuration.opensearchRoles())
+                .hasSize(5)
+                .doesNotHaveDuplicates();
+    }
+}