Update cron-utils (opensearch-project#266) (opensearch-project#269)

* Update cron-utils Signed-off-by: Ashish Agrawal <ashisagr@amazon.com> Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt · Mar 30, 2022 · ef77e2d · ef77e2d
1 parent c16a683
commit ef77e2d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/SecureTransportAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/SecureTransportAction.kt
@@ -123,7 +123,11 @@ interface SecureTransportAction {
         val resourceBackendRoles = resourceUser?.backendRoles
         val requesterBackendRoles = requesterUser?.backendRoles
 
-        if (resourceBackendRoles == null || requesterBackendRoles == null || resourceBackendRoles.intersect(requesterBackendRoles).isEmpty()) {
+        if (
+            resourceBackendRoles == null ||
+            requesterBackendRoles == null ||
+            resourceBackendRoles.intersect(requesterBackendRoles).isEmpty()
+        ) {
             actionListener.onFailure(
                 AlertingException.wrap(
                     OpenSearchStatusException(

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/resthandler/MonitorRestApiIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/resthandler/MonitorRestApiIT.kt
@@ -586,10 +586,16 @@ class MonitorRestApiIT : AlertingRestTestCase() {
         val expectedAcknowledgedCount = alertsToAcknowledge.size
 
         val acknowledgedAlerts = responseMap["success"] as List<String>
-        assertTrue("Expected $expectedAcknowledgedCount alerts to be acknowledged successfully.", acknowledgedAlerts.size == expectedAcknowledgedCount)
+        assertTrue(
+            "Expected $expectedAcknowledgedCount alerts to be acknowledged successfully.",
+            acknowledgedAlerts.size == expectedAcknowledgedCount
+        )
 
         val acknowledgedAlertsList = acknowledgedAlerts.toString()
-        alertsToAcknowledge.forEach { alert -> assertTrue("Alert with ID ${alert.id} not found in failed list.", acknowledgedAlertsList.contains(alert.id)) }
+        alertsToAcknowledge.forEach {
+            alert ->
+            assertTrue("Alert with ID ${alert.id} not found in failed list.", acknowledgedAlertsList.contains(alert.id))
+        }
 
         val failedResponse = responseMap["failed"] as List<String>
         assertTrue("Expected 0 alerts to fail acknowledgment.", failedResponse.isEmpty())
@@ -604,7 +610,8 @@ class MonitorRestApiIT : AlertingRestTestCase() {
 
         val alertsGroup2 = (1..15).map { createAlert(randomAlert(monitor).copy(state = Alert.State.ACTIVE)) }.toTypedArray()
 
-        val alertsToAcknowledge = arrayOf(*alertsGroup1, *alertsGroup2) // Creating an array of alerts that includes alerts that have been already acknowledged, and new alerts.
+        // Creating an array of alerts that includes alerts that have been already acknowledged, and new alerts.
+        val alertsToAcknowledge = arrayOf(*alertsGroup1, *alertsGroup2)
 
         // WHEN
         val response = acknowledgeAlerts(monitor, *alertsToAcknowledge)
@@ -614,18 +621,33 @@ class MonitorRestApiIT : AlertingRestTestCase() {
         val expectedAcknowledgedCount = alertsToAcknowledge.size - alertsGroup1.size
 
         val acknowledgedAlerts = responseMap["success"] as List<String>
-        assertTrue("Expected $expectedAcknowledgedCount alerts to be acknowledged successfully.", acknowledgedAlerts.size == expectedAcknowledgedCount)
+        assertTrue(
+            "Expected $expectedAcknowledgedCount alerts to be acknowledged successfully.",
+            acknowledgedAlerts.size == expectedAcknowledgedCount
+        )
 
         val acknowledgedAlertsList = acknowledgedAlerts.toString()
-        alertsGroup2.forEach { alert -> assertTrue("Alert with ID ${alert.id} not found in failed list.", acknowledgedAlertsList.contains(alert.id)) }
-        alertsGroup1.forEach { alert -> assertFalse("Alert with ID ${alert.id} found in failed list.", acknowledgedAlertsList.contains(alert.id)) }
+        alertsGroup2.forEach {
+            alert ->
+            assertTrue("Alert with ID ${alert.id} not found in failed list.", acknowledgedAlertsList.contains(alert.id))
+        }
+        alertsGroup1.forEach {
+            alert ->
+            assertFalse("Alert with ID ${alert.id} found in failed list.", acknowledgedAlertsList.contains(alert.id))
+        }
 
         val failedResponse = responseMap["failed"] as List<String>
         assertTrue("Expected ${alertsGroup1.size} alerts to fail acknowledgment.", failedResponse.size == alertsGroup1.size)
 
         val failedResponseList = failedResponse.toString()
-        alertsGroup1.forEach { alert -> assertTrue("Alert with ID ${alert.id} not found in failed list.", failedResponseList.contains(alert.id)) }
-        alertsGroup2.forEach { alert -> assertFalse("Alert with ID ${alert.id} found in failed list.", failedResponseList.contains(alert.id)) }
+        alertsGroup1.forEach {
+            alert ->
+            assertTrue("Alert with ID ${alert.id} not found in failed list.", failedResponseList.contains(alert.id))
+        }
+        alertsGroup2.forEach {
+            alert ->
+            assertFalse("Alert with ID ${alert.id} found in failed list.", failedResponseList.contains(alert.id))
+        }
     }
 
     @Throws(Exception::class)

diff --git a/build.gradle b/build.gradle
@@ -105,7 +105,6 @@ allprojects {
         compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = "1.8"
         compileKotlin.dependsOn ktlint
     }
-
 }
 
 evaluationDependsOnChildren()

diff --git a/core/build.gradle b/core/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
     compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
-    compile "com.cronutils:cron-utils:9.1.3"
+    compile "com.cronutils:cron-utils:9.1.6"
     compile "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
     compile 'com.google.googlejavaformat:google-java-format:1.10.0'
     compile "org.opensearch:common-utils:${common_utils_version}"