Renames plugin name to normalized name set by infra; cleans up tests (#…

…390)
opendistro-for-elasticsearch · Jan 25, 2021 · 4b1b571 · 4b1b571
1 parent 6245828
commit 4b1b571
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -64,7 +64,7 @@ if (!usingRemoteCluster && !usingMultiNode) {
 check.dependsOn jacocoTestReport
 
 esplugin {
-    name 'opendistro_index_management'
+    name 'opendistro-index-management'
     description 'Open Distro Index Management Plugin'
     classname 'com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin'
     extendedPlugins = ['opendistro-job-scheduler']

diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/ODFERestTestCase.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/ODFERestTestCase.kt
@@ -45,8 +45,6 @@ abstract class ODFERestTestCase : ESRestTestCase() {
 
     override fun getProtocol(): String = if (isHttps()) "https" else "http"
 
-    // override fun preserveIndicesUponCompletion(): Boolean = true
-
     @Suppress("UNCHECKED_CAST")
     @Throws(IOException::class)
     private fun runningTasks(response: Response): MutableSet<String> {

diff --git a/...csearch/indexmanagement/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt b/...csearch/indexmanagement/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt
@@ -52,7 +52,7 @@ class IndexStateManagementRestApiIT : IndexStateManagementRestTestCase() {
             val plugins = nodeInfo["plugins"] as List<Map<String, Any>>
 
             for (plugin in plugins) {
-                if (plugin["name"] == "opendistro_index_management") {
+                if (plugin["name"] == "opendistro-index-management") {
                     hasIndexStateMangementPlugin = true
                 }
                 if (plugin["name"] == "opendistro-job-scheduler") {

diff --git a/...on/opendistroforelasticsearch/indexmanagement/rollup/resthandler/RestGetRollupActionIT.kt b/...on/opendistroforelasticsearch/indexmanagement/rollup/resthandler/RestGetRollupActionIT.kt
@@ -76,7 +76,7 @@ class RestGetRollupActionIT : RollupRestTestCase() {
             // Doesn't matter what rollup sets, current system is at schema version 5
             assertEquals(6, (innerRollup["schema_version"] as Int).toLong())
             assertEquals(testRollup.enabled, innerRollup["enabled"] as Boolean)
-            assertEquals(testRollup.enabledTime?.toEpochMilli(), innerRollup["enabled_time"] as Long?)
+            assertEquals(testRollup.enabledTime?.toEpochMilli(), (innerRollup["enabled_time"] as Number?)?.toLong())
             // Last updated time will never be correct as it gets updated in the API call
             // assertEquals(testRollup.lastUpdateTime.toEpochMilli(), innerRollup["last_updated_time"] as Long)
             assertEquals(testRollup.continuous, innerRollup["continuous"] as Boolean)

diff --git a/...lin/com/amazon/opendistroforelasticsearch/indexmanagement/rollup/runner/RollupRunnerIT.kt b/...lin/com/amazon/opendistroforelasticsearch/indexmanagement/rollup/runner/RollupRunnerIT.kt
@@ -123,7 +123,7 @@ class RollupRunnerIT : RollupRestTestCase() {
         // Update rollup start time to run second execution
         updateRollupStartTime(rollup)
 
-        waitFor(Instant.ofEpochSecond(20)) {
+        waitFor() {
             val rollupJob = getRollup(rollupId = rollup.id)
             assertNotNull("Rollup job not found", rollupJob)
             assertNotNull("Rollup job doesn't have metadata set", rollupJob.metadataID)
@@ -308,7 +308,7 @@ class RollupRunnerIT : RollupRestTestCase() {
 
         waitFor { assertTrue("Target rollup index was not created", indexExists(rollup.targetIndex)) }
 
-        val finishedRollup = waitFor(Instant.ofEpochSecond(20)) {
+        val finishedRollup = waitFor() {
             val rollupJob = getRollup(rollupId = rollup.id)
             assertNotNull("Rollup job doesn't have metadata set", rollupJob.metadataID)
             val rollupMetadata = getRollupMetadata(rollupJob.metadataID!!)
@@ -318,7 +318,7 @@ class RollupRunnerIT : RollupRestTestCase() {
 
         updateRollupStartTime(secondRollup)
 
-        val secondFinishedRollup = waitFor(Instant.ofEpochSecond(20)) {
+        val secondFinishedRollup = waitFor() {
             val rollupJob = getRollup(rollupId = secondRollup.id)
             assertNotNull("Rollup job doesn't have metadata set", rollupJob.metadataID)
             val rollupMetadata = getRollupMetadata(rollupJob.metadataID!!)
@@ -328,7 +328,7 @@ class RollupRunnerIT : RollupRestTestCase() {
 
         updateRollupStartTime(thirdRollup)
 
-        val thirdFinishedRollup = waitFor(Instant.ofEpochSecond(20)) {
+        val thirdFinishedRollup = waitFor() {
             val rollupJob = getRollup(rollupId = thirdRollup.id)
             assertNotNull("Rollup job doesn't have metadata set", rollupJob.metadataID)
             val rollupMetadata = getRollupMetadata(rollupJob.metadataID!!)