From 6a98778c04a791d05eab52e3b5858e6e8c1272b2 Mon Sep 17 00:00:00 2001 From: Ashish Agrawal Date: Fri, 7 Jan 2022 14:13:10 -0800 Subject: [PATCH] Update cron-utils (#266) (#269) * Update cron-utils Signed-off-by: Ashish Agrawal --- .../transport/SecureTransportAction.kt | 6 ++- .../alerting/resthandler/MonitorRestApiIT.kt | 38 +++++++++++++++---- build.gradle | 1 - core/build.gradle | 2 +- 4 files changed, 36 insertions(+), 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 index 4ad7be890..e70abd5ec 100644 --- 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 index 25ac5b4a4..33e9c0c96 100644 --- a/alerting/src/test/kotlin/org/opensearch/alerting/resthandler/MonitorRestApiIT.kt +++ b/alerting/src/test/kotlin/org/opensearch/alerting/resthandler/MonitorRestApiIT.kt @@ -584,10 +584,16 @@ class MonitorRestApiIT : AlertingRestTestCase() { val expectedAcknowledgedCount = alertsToAcknowledge.size val acknowledgedAlerts = responseMap["success"] as List - 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 assertTrue("Expected 0 alerts to fail acknowledgment.", failedResponse.isEmpty()) @@ -602,7 +608,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) @@ -612,18 +619,33 @@ class MonitorRestApiIT : AlertingRestTestCase() { val expectedAcknowledgedCount = alertsToAcknowledge.size - alertsGroup1.size val acknowledgedAlerts = responseMap["success"] as List - 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 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 index 9ef63df65..e236c21a0 100644 --- 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 index 77980442f..20792d73e 100644 --- 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}"