Remove Alerting's notification subproject (#413)

* Remove notification subproject Signed-off-by: Mohammad Qureshi <[email protected]> * Remove publishing to maven in build script Signed-off-by: Mohammad Qureshi <[email protected]>
opensearch-project · Apr 20, 2022 · 214c9db · 214c9db
1 parent caf5855
commit 214c9db
Show file tree

Hide file tree

Showing 30 changed files with 6 additions and 2,253 deletions.
diff --git a/alerting/build.gradle b/alerting/build.gradle
@@ -64,7 +64,6 @@ dependencies {
     implementation "org.jetbrains:annotations:13.0"
 
     api project(":alerting-core")
-    api project(":alerting-notification")
     implementation "com.github.seancfoley:ipaddress:5.3.3"
 
     testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"

diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/util/AlertingUtils.kt b/alerting/src/main/kotlin/org/opensearch/alerting/util/AlertingUtils.kt
@@ -5,12 +5,10 @@
 
 package org.opensearch.alerting.util
 
-import inet.ipaddr.IPAddressString
 import org.opensearch.action.index.IndexRequest
 import org.opensearch.action.index.IndexResponse
 import org.opensearch.action.support.WriteRequest
 import org.opensearch.alerting.core.model.ScheduledJob
-import org.opensearch.alerting.destination.message.BaseMessage
 import org.opensearch.alerting.model.AggregationResultBucket
 import org.opensearch.alerting.model.BucketLevelTriggerRunResult
 import org.opensearch.alerting.model.Monitor
@@ -49,20 +47,6 @@ fun Destination.isAllowed(allowList: List<String>): Boolean = allowList.contains
 
 fun Destination.isTestAction(): Boolean = this.type == DestinationType.TEST_ACTION
 
-fun BaseMessage.isHostInDenylist(networks: List<String>): Boolean {
-    if (this.url != null || this.uri.host != null) {
-        val ipStr = IPAddressString(this.uri.host)
-        for (network in networks) {
-            val netStr = IPAddressString(network)
-            if (netStr.contains(ipStr)) {
-                return true
-            }
-        }
-    }
-
-    return false
-}
-
 fun Monitor.isBucketLevelMonitor(): Boolean = this.monitorType == Monitor.MonitorType.BUCKET_LEVEL_MONITOR
 
 fun Monitor.isDocLevelMonitor(): Boolean = this.monitorType == Monitor.MonitorType.DOC_LEVEL_MONITOR

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/AlertingRestTestCase.kt b/alerting/src/test/kotlin/org/opensearch/alerting/AlertingRestTestCase.kt
@@ -138,7 +138,12 @@ abstract class AlertingRestTestCase : ODFERestTestCase() {
         // Create Alerting config index if it doesn't exist to avoid mapping issues with legacy destination indexing
         createAlertingConfigIndex()
 
-        val response = indexDocWithAdminClient(ScheduledJob.SCHEDULED_JOBS_INDEX, UUIDs.base64UUID(), destination.toJsonStringWithType(), refresh)
+        val response = indexDocWithAdminClient(
+            ScheduledJob.SCHEDULED_JOBS_INDEX,
+            UUIDs.base64UUID(),
+            destination.toJsonStringWithType(),
+            refresh
+        )
         val destinationJson = jsonXContent.createParser(
             NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE,
             response.entity.content

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/util/AlertingUtilsTests.kt b/alerting/src/test/kotlin/org/opensearch/alerting/util/AlertingUtilsTests.kt
diff --git a/notification/build.gradle b/notification/build.gradle
diff --git a/notification/src/main/java/org/opensearch/alerting/destination/Notification.java b/notification/src/main/java/org/opensearch/alerting/destination/Notification.java
diff --git a/...tion/src/main/java/org/opensearch/alerting/destination/client/DestinationEmailClient.java b/...tion/src/main/java/org/opensearch/alerting/destination/client/DestinationEmailClient.java
diff --git a/.../src/main/java/org/opensearch/alerting/destination/client/DestinationEmailClientPool.java b/.../src/main/java/org/opensearch/alerting/destination/client/DestinationEmailClientPool.java