fixed build

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
opensearch-project · Sep 24, 2024 · 61945d8 · 61945d8
1 parent cecabc1
commit 61945d8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/...ions/core-spi/src/main/kotlin/org/opensearch/notifications/spi/utils/ValidationHelpers.kt b/...ions/core-spi/src/main/kotlin/org/opensearch/notifications/spi/utils/ValidationHelpers.kt
@@ -5,11 +5,13 @@
 
 package org.opensearch.notifications.spi.utils
 
+import inet.ipaddr.HostName
 import inet.ipaddr.IPAddressString
 import org.apache.commons.validator.routines.DomainValidator
 import org.apache.hc.client5.http.classic.methods.HttpPatch
 import org.apache.hc.client5.http.classic.methods.HttpPost
 import org.apache.hc.client5.http.classic.methods.HttpPut
+import org.apache.logging.log4j.LogManager
 import org.opensearch.core.common.Strings
 import org.opensearch.notifications.spi.utils.ValidationHelpers.FQDN_REGEX
 import java.net.InetAddress
@@ -49,27 +51,23 @@ fun isValidUrl(urlString: String): Boolean {
     }
 }
 
-"foobar.com"
-
-
-
 fun isHostInDenylist(urlString: String, hostDenyList: List<String>): Boolean {
     val url = URL(urlString)
     if (url.host != null) {
-        val resolvedIps = InetAddress.getAllByName(url.host);
+        val resolvedIps = InetAddress.getAllByName(url.host)
         val resolvedIpStrings = resolvedIps.map { inetAddress -> IPAddressString(inetAddress.hostAddress) }
         val hostStr = HostName(url.host)
 
         for (network in hostDenyList) {
             val denyIpStr = IPAddressString(network)
             val denyHostStr = HostName(network)
-            val hostInDenyList = denyHostStr.equals(hostStr);
-            var ipInDenyList = false;
+            val hostInDenyList = denyHostStr.equals(hostStr)
+            var ipInDenyList = false
 
             for (ipStr in resolvedIpStrings) {
                 if (denyIpStr.contains(ipStr)) {
-                    ipInDenyList = true;
-                    break;
+                    ipInDenyList = true
+                    break
                 }
             }
 

diff --git a/...cations/core/src/main/kotlin/org/opensearch/notifications/core/utils/ValidationHelpers.kt b/...cations/core/src/main/kotlin/org/opensearch/notifications/core/utils/ValidationHelpers.kt
@@ -39,20 +39,20 @@ fun isValidUrl(urlString: String): Boolean {
 fun isHostInDenylist(urlString: String, hostDenyList: List<String>): Boolean {
     val url = URL(urlString)
     if (url.host != null) {
-        val resolvedIps = InetAddress.getAllByName(url.host);
+        val resolvedIps = InetAddress.getAllByName(url.host)
         val resolvedIpStrings = resolvedIps.map { inetAddress -> IPAddressString(inetAddress.hostAddress) }
         val hostStr = HostName(url.host)
 
         for (network in hostDenyList) {
             val denyIpStr = IPAddressString(network)
             val denyHostStr = HostName(network)
-            val hostInDenyList = denyHostStr.equals(hostStr);
-            var ipInDenyList = false;
+            val hostInDenyList = denyHostStr.equals(hostStr)
+            var ipInDenyList = false
 
             for (ipStr in resolvedIpStrings) {
                 if (denyIpStr.contains(ipStr)) {
-                    ipInDenyList = true;
-                    break;
+                    ipInDenyList = true
+                    break
                 }
             }
 

diff --git a/...ns/core/src/test/kotlin/org/opensearch/notifications/core/utils/ValidationHelpersTests.kt b/...ns/core/src/test/kotlin/org/opensearch/notifications/core/utils/ValidationHelpersTests.kt
@@ -5,8 +5,11 @@
 
 package org.opensearch.notifications.core.utils
 
+import io.mockk.every
+import io.mockk.mockkStatic
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
+import java.net.InetAddress
 
 internal class ValidationHelpersTests {