adding ctor with optional comments indices args

Signed-off-by: Dennis Toepker <[email protected]>
opensearch-project · Jun 10, 2024 · 1465074 · 1465074
1 parent 1437ed7
commit 1465074
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/DataSources.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/DataSources.kt
@@ -32,7 +32,7 @@ data class DataSources(
     val alertsHistoryIndexPattern: String? = "<.opendistro-alerting-alert-history-{now/d}-1>", // AlertIndices.ALERT_HISTORY_INDEX_PATTERN
 
     /** Configures a custom index alias to store comments associated with alerts.*/
-    val commentsIndex: String = ".opensearch-alerting-comments-history-write", // AlertIndices.COMMENTS_HISTORY_WRITE_INDEX
+    val commentsIndex: String? = ".opensearch-alerting-comments-history-write", // AlertIndices.COMMENTS_HISTORY_WRITE_INDEX
 
     /** Configures a custom index pattern for commentsIndex alias.*/
     val commentsIndexPattern: String? = "<.opensearch-alerting-comments-history-{now/d}-1>", // AlertIndices.COMMENTS_HISTORY_INDEX_PATTERN
@@ -56,9 +56,6 @@ data class DataSources(
         require(alertsIndex.isNotEmpty()) {
             "Alerts index cannot be empty"
         }
-        require(commentsIndex.isNotEmpty()) {
-            "Comments index cannot be empty"
-        }
         if (queryIndexMappingsByType.isNotEmpty()) {
             require(queryIndex != ScheduledJob.DOC_LEVEL_QUERIES_INDEX) {
                 "Custom query index mappings are configurable only if a custom query index is configured too."
@@ -89,6 +86,29 @@ data class DataSources(
         findingsEnabled = sin.readOptionalBoolean()
     )
 
+    @Throws(IOException::class)
+    constructor(
+        queryIndex: String,
+        findingsIndex: String,
+        findingsIndexPattern: String?,
+        alertsIndex: String,
+        alertsHistoryIndex: String?,
+        alertsHistoryIndexPattern: String?,
+        queryIndexMappingsByType: Map<String, Map<String, String>>,
+        findingsEnabled: Boolean?
+    ) : this(
+        queryIndex = queryIndex,
+        findingsIndex = findingsIndex,
+        findingsIndexPattern = findingsIndexPattern,
+        alertsIndex = alertsIndex,
+        alertsHistoryIndex = alertsHistoryIndex,
+        alertsHistoryIndexPattern = alertsHistoryIndexPattern,
+        commentsIndex = null,
+        commentsIndexPattern = null,
+        queryIndexMappingsByType = queryIndexMappingsByType,
+        findingsEnabled = findingsEnabled
+    )
+
     @Suppress("UNCHECKED_CAST")
     fun asTemplateArg(): Map<String, Any?> {
         return mapOf(