diff --git a/build.gradle b/build.gradle index 689ae3b74..d5d82473b 100644 --- a/build.gradle +++ b/build.gradle @@ -59,13 +59,13 @@ check.dependsOn jacocoTestReport esplugin { name 'opendistro_index_management' - description 'Open Distro Index State Management Plugin' - classname 'com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin' + description 'Open Distro Index Management Plugin' + classname 'com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin' extendedPlugins = ['opendistro-job-scheduler'] } allOpen { - annotation("com.amazon.opendistroforelasticsearch.indexstatemanagement.util.OpenForTesting") + annotation("com.amazon.opendistroforelasticsearch.indexmanagement.util.OpenForTesting") } configurations { diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementHistory.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementHistory.kt similarity index 66% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementHistory.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementHistory.kt index f1b1d523b..2dc41b26f 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementHistory.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementHistory.kt @@ -13,13 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._DOC +package com.amazon.opendistroforelasticsearch.indexmanagement + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.util._DOC +import com.amazon.opendistroforelasticsearch.indexmanagement.settings.IndexManagementSettings import org.apache.logging.log4j.LogManager import org.elasticsearch.action.DocWriteRequest import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest @@ -41,39 +42,49 @@ import org.elasticsearch.threadpool.Scheduler import org.elasticsearch.threadpool.ThreadPool import java.time.Instant -class IndexStateManagementHistory( +class IndexManagementHistory( settings: Settings, private val client: Client, private val threadPool: ThreadPool, private val clusterService: ClusterService, - private val indexStateManagementIndices: IndexStateManagementIndices + private val indexManagementIndices: IndexManagementIndices ) : LocalNodeMasterListener { private val logger = LogManager.getLogger(javaClass) private var scheduledRollover: Scheduler.Cancellable? = null - @Volatile private var historyEnabled = ManagedIndexSettings.HISTORY_ENABLED.get(settings) + @Volatile private var historyEnabled = IndexManagementSettings.HISTORY_ENABLED.get(settings) - @Volatile private var historyMaxDocs = ManagedIndexSettings.HISTORY_MAX_DOCS.get(settings) + // Setting does not have a fallbackSetting method signature so we are doing it manually here + @Volatile private var historyMaxDocs = when { + IndexManagementSettings.HISTORY_MAX_DOCS.exists(settings) -> IndexManagementSettings.HISTORY_MAX_DOCS.get(settings) + ManagedIndexSettings.DEPRECATED_HISTORY_MAX_DOCS.exists(settings) -> ManagedIndexSettings.DEPRECATED_HISTORY_MAX_DOCS.get(settings) + else -> IndexManagementSettings.HISTORY_MAX_DOCS.get(settings) + } - @Volatile private var historyMaxAge = ManagedIndexSettings.HISTORY_INDEX_MAX_AGE.get(settings) + @Volatile private var historyMaxAge = IndexManagementSettings.HISTORY_INDEX_MAX_AGE.get(settings) - @Volatile private var historyRolloverCheckPeriod = ManagedIndexSettings.HISTORY_ROLLOVER_CHECK_PERIOD.get(settings) + @Volatile private var historyRolloverCheckPeriod = IndexManagementSettings.HISTORY_ROLLOVER_CHECK_PERIOD.get(settings) - @Volatile private var historyRetentionPeriod = ManagedIndexSettings.HISTORY_RETENTION_PERIOD.get(settings) + @Volatile private var historyRetentionPeriod = IndexManagementSettings.HISTORY_RETENTION_PERIOD.get(settings) init { clusterService.addLocalNodeMasterListener(this) - clusterService.clusterSettings.addSettingsUpdateConsumer(ManagedIndexSettings.HISTORY_ENABLED) { - historyEnabled = it - } - clusterService.clusterSettings.addSettingsUpdateConsumer(ManagedIndexSettings.HISTORY_MAX_DOCS) { historyMaxDocs = it } - clusterService.clusterSettings.addSettingsUpdateConsumer(ManagedIndexSettings.HISTORY_INDEX_MAX_AGE) { historyMaxAge = it } - clusterService.clusterSettings.addSettingsUpdateConsumer(ManagedIndexSettings.HISTORY_ROLLOVER_CHECK_PERIOD) { + clusterService.clusterSettings.addSettingsUpdateConsumer(IndexManagementSettings.HISTORY_ENABLED) { historyEnabled = it } + // Setting does not have a fallbackSetting method signature so we are doing it manually here + clusterService.clusterSettings.addSettingsUpdateConsumer(IndexManagementSettings.HISTORY_MAX_DOCS, ManagedIndexSettings.DEPRECATED_HISTORY_MAX_DOCS) { im, ism -> + historyMaxDocs = when { + IndexManagementSettings.HISTORY_MAX_DOCS.exists(settings) -> im + ManagedIndexSettings.DEPRECATED_HISTORY_MAX_DOCS.exists(settings) -> ism + else -> im + } + } + clusterService.clusterSettings.addSettingsUpdateConsumer(IndexManagementSettings.HISTORY_INDEX_MAX_AGE) { historyMaxAge = it } + clusterService.clusterSettings.addSettingsUpdateConsumer(IndexManagementSettings.HISTORY_ROLLOVER_CHECK_PERIOD) { historyRolloverCheckPeriod = it rescheduleRollover() } - clusterService.clusterSettings.addSettingsUpdateConsumer(ManagedIndexSettings.HISTORY_RETENTION_PERIOD) { + clusterService.clusterSettings.addSettingsUpdateConsumer(IndexManagementSettings.HISTORY_RETENTION_PERIOD) { historyRetentionPeriod = it } } @@ -111,19 +122,19 @@ class IndexStateManagementHistory( } private fun rolloverHistoryIndex(): Boolean { - if (!indexStateManagementIndices.indexStateManagementIndexHistoryExists()) { + if (!indexManagementIndices.indexManagementIndexHistoryExists()) { return false } // We have to pass null for newIndexName in order to get Elastic to increment the index count. - val request = RolloverRequest(IndexStateManagementIndices.HISTORY_WRITE_INDEX_ALIAS, null) - request.createIndexRequest.index(IndexStateManagementIndices.HISTORY_INDEX_PATTERN) - .mapping(_DOC, IndexStateManagementIndices.indexStateManagementHistoryMappings, XContentType.JSON) + val request = RolloverRequest(IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS, null) + request.createIndexRequest.index(IndexManagementIndices.HISTORY_INDEX_PATTERN) + .mapping(_DOC, IndexManagementIndices.indexManagementHistoryMappings, XContentType.JSON) request.addMaxIndexDocsCondition(historyMaxDocs) request.addMaxIndexAgeCondition(historyMaxAge) val response = client.admin().indices().rolloverIndex(request).actionGet() if (!response.isRolledOver) { - logger.info("${IndexStateManagementIndices.HISTORY_WRITE_INDEX_ALIAS} not rolled over. Conditions were: ${response.conditionStatus}") + logger.info("${IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS} not rolled over. Conditions were: ${response.conditionStatus}") } return response.isRolledOver } @@ -134,7 +145,7 @@ class IndexStateManagementHistory( val clusterStateRequest = ClusterStateRequest() .clear() - .indices(IndexStateManagementIndices.HISTORY_ALL) + .indices(IndexManagementIndices.HISTORY_ALL) .metadata(true) .local(true) .indicesOptions(IndicesOptions.strictExpand()) @@ -146,7 +157,7 @@ class IndexStateManagementHistory( val creationTime = indexMetaData.creationDate if ((Instant.now().toEpochMilli() - creationTime) > historyRetentionPeriod.millis) { - val alias = indexMetaData.aliases.firstOrNull { IndexStateManagementIndices.HISTORY_WRITE_INDEX_ALIAS == it.value.alias } + val alias = indexMetaData.aliases.firstOrNull { IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS == it.value.alias } if (alias != null && historyEnabled) { // If index has write alias and history is enable, don't delete the index. continue @@ -177,20 +188,20 @@ class IndexStateManagementHistory( } @Suppress("NestedBlockDepth") - suspend fun addHistory(managedIndexMetaData: List) { + suspend fun addManagedIndexMetaDataHistory(managedIndexMetaData: List) { if (!historyEnabled) { logger.debug("Index State Management history is not enabled") return } - if (!indexStateManagementIndices.checkAndUpdateHistoryIndex()) { + if (!indexManagementIndices.checkAndUpdateHistoryIndex()) { logger.error("Failed to create or update the ism history index:") return // we can't continue to add the history documents below as it would potentially create dynamic mappings } val docWriteRequest: List> = managedIndexMetaData - .filter { shouldAddToHistory(it) } - .map { indexHistory(it) } + .filter { shouldAddManagedIndexMetaDataToHistory(it) } + .map { createManagedIndexMetaDataHistoryIndexRequest(it) } if (docWriteRequest.isNotEmpty()) { val bulkRequest = BulkRequest().add(docWriteRequest) @@ -209,24 +220,24 @@ class IndexStateManagementHistory( } } - private fun shouldAddToHistory(managedIndexMetaData: ManagedIndexMetaData): Boolean { - return when { - managedIndexMetaData.stepMetaData?.stepStatus == Step.StepStatus.STARTING -> false - managedIndexMetaData.stepMetaData?.stepStatus == Step.StepStatus.CONDITION_NOT_MET -> false + private fun shouldAddManagedIndexMetaDataToHistory(managedIndexMetaData: ManagedIndexMetaData): Boolean { + return when (managedIndexMetaData.stepMetaData?.stepStatus) { + Step.StepStatus.STARTING -> false + Step.StepStatus.CONDITION_NOT_MET -> false else -> true } } - private fun indexHistory(managedIndexMetaData: ManagedIndexMetaData): IndexRequest { + private fun createManagedIndexMetaDataHistoryIndexRequest(managedIndexMetaData: ManagedIndexMetaData): IndexRequest { val builder = XContentFactory.jsonBuilder() .startObject() - .startObject(IndexStateManagementPlugin.INDEX_STATE_MANAGEMENT_HISTORY_TYPE) + .startObject(IndexManagementPlugin.INDEX_STATE_MANAGEMENT_HISTORY_TYPE) managedIndexMetaData.toXContent(builder, ToXContent.EMPTY_PARAMS) builder .field("history_timestamp", Instant.now().toEpochMilli()) .endObject() .endObject() - return IndexRequest(IndexStateManagementIndices.HISTORY_WRITE_INDEX_ALIAS) + return IndexRequest(IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS) .source(builder) } } diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementIndices.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementIndices.kt similarity index 75% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementIndices.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementIndices.kt index bd1920165..4456273e7 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementIndices.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementIndices.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement +package com.amazon.opendistroforelasticsearch.indexmanagement -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.IndexUtils -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.OpenForTesting -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._DOC +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.util.IndexUtils +import com.amazon.opendistroforelasticsearch.indexmanagement.util.OpenForTesting +import com.amazon.opendistroforelasticsearch.indexmanagement.util._DOC import org.apache.logging.log4j.LogManager import org.elasticsearch.ResourceAlreadyExistsException import org.elasticsearch.action.ActionListener @@ -36,7 +36,7 @@ import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.xcontent.XContentType @OpenForTesting -class IndexStateManagementIndices( +class IndexManagementIndices( private val client: IndicesAdminClient, private val clusterService: ClusterService ) { @@ -44,9 +44,9 @@ class IndexStateManagementIndices( private val logger = LogManager.getLogger(javaClass) fun checkAndUpdateISMConfigIndex(actionListener: ActionListener) { - if (!indexStateManagementIndexExists()) { - val indexRequest = CreateIndexRequest(INDEX_STATE_MANAGEMENT_INDEX) - .mapping(_DOC, indexStateManagementMappings, XContentType.JSON) + if (!indexManagementIndexExists()) { + val indexRequest = CreateIndexRequest(INDEX_MANAGEMENT_INDEX) + .mapping(_DOC, indexManagementMappings, XContentType.JSON) .settings(Settings.builder().put("index.hidden", true).build()) client.create(indexRequest, object : ActionListener { override fun onFailure(e: Exception) { @@ -62,26 +62,26 @@ class IndexStateManagementIndices( } } - fun indexStateManagementIndexExists(): Boolean = clusterService.state().routingTable.hasIndex(INDEX_STATE_MANAGEMENT_INDEX) + fun indexManagementIndexExists(): Boolean = clusterService.state().routingTable.hasIndex(INDEX_MANAGEMENT_INDEX) /** - * Attempt to create [INDEX_STATE_MANAGEMENT_INDEX] and return whether it exists + * Attempt to create [INDEX_MANAGEMENT_INDEX] and return whether it exists */ @Suppress("ReturnCount") suspend fun attemptInitStateManagementIndex(client: Client): Boolean { - if (indexStateManagementIndexExists()) return true + if (indexManagementIndexExists()) return true return try { val response: AcknowledgedResponse = client.suspendUntil { checkAndUpdateISMConfigIndex(it) } if (response.isAcknowledged) { return true } - logger.error("Creating $INDEX_STATE_MANAGEMENT_INDEX with mappings NOT acknowledged") + logger.error("Creating $INDEX_MANAGEMENT_INDEX with mappings NOT acknowledged") return false } catch (e: ResourceAlreadyExistsException) { true } catch (e: Exception) { - logger.error("Error trying to create $INDEX_STATE_MANAGEMENT_INDEX", e) + logger.error("Error trying to create $INDEX_MANAGEMENT_INDEX", e) false } } @@ -89,11 +89,11 @@ class IndexStateManagementIndices( /** * ============== History ============= */ - fun indexStateManagementIndexHistoryExists(): Boolean = clusterService.state().metadata.hasAlias(HISTORY_WRITE_INDEX_ALIAS) + fun indexManagementIndexHistoryExists(): Boolean = clusterService.state().metadata.hasAlias(HISTORY_WRITE_INDEX_ALIAS) @Suppress("ReturnCount") suspend fun checkAndUpdateHistoryIndex(): Boolean { - if (!indexStateManagementIndexHistoryExists()) { + if (!indexManagementIndexHistoryExists()) { return createHistoryIndex(HISTORY_INDEX_PATTERN, HISTORY_WRITE_INDEX_ALIAS) } else { val response: AcknowledgedResponse = client.suspendUntil { @@ -117,7 +117,7 @@ class IndexStateManagementIndices( if (existsResponse.isExists) return true val request = CreateIndexRequest(index) - .mapping(_DOC, indexStateManagementHistoryMappings, XContentType.JSON) + .mapping(_DOC, indexManagementHistoryMappings, XContentType.JSON) .settings(Settings.builder().put("index.hidden", true).build()) if (alias != null) request.alias(Alias(alias)) return try { @@ -142,9 +142,9 @@ class IndexStateManagementIndices( const val HISTORY_INDEX_PATTERN = "<$HISTORY_INDEX_BASE-{now/d{yyyy.MM.dd}}-1>" const val HISTORY_ALL = "$HISTORY_INDEX_BASE*" - val indexStateManagementMappings = IndexStateManagementIndices::class.java.classLoader + val indexManagementMappings = IndexManagementIndices::class.java.classLoader .getResource("mappings/opendistro-ism-config.json").readText() - val indexStateManagementHistoryMappings = IndexStateManagementIndices::class.java.classLoader + val indexManagementHistoryMappings = IndexManagementIndices::class.java.classLoader .getResource("mappings/opendistro-ism-history.json").readText() } } diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementPlugin.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementPlugin.kt similarity index 58% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementPlugin.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementPlugin.kt index 60019d652..3a64a5093 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementPlugin.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementPlugin.kt @@ -13,21 +13,24 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.transport.action.updateindexmetadata.TransportUpdateManagedIndexMetaDataAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestAddPolicyAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestChangePolicyAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestDeletePolicyAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestExplainAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestGetPolicyAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestIndexPolicyAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestRemovePolicyAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestRetryFailedManagedIndexAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings +package com.amazon.opendistroforelasticsearch.indexmanagement + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.ManagedIndexCoordinator +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.ManagedIndexRunner +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata.TransportUpdateManagedIndexMetaDataAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestAddPolicyAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestChangePolicyAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestDeletePolicyAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestExplainAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestGetPolicyAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestIndexPolicyAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestRemovePolicyAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestRetryFailedManagedIndexAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.settings.IndexManagementSettings import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParser import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobRunner @@ -59,32 +62,29 @@ import org.elasticsearch.threadpool.ThreadPool import org.elasticsearch.watcher.ResourceWatcherService import java.util.function.Supplier -internal class IndexStateManagementPlugin : JobSchedulerExtension, ActionPlugin, Plugin() { +internal class IndexManagementPlugin : JobSchedulerExtension, ActionPlugin, Plugin() { private val logger = LogManager.getLogger(javaClass) - lateinit var indexStateManagementIndices: IndexStateManagementIndices + lateinit var indexManagementIndices: IndexManagementIndices lateinit var clusterService: ClusterService companion object { - const val PLUGIN_NAME = "opendistro-ism" - const val ISM_BASE_URI = "/_opendistro/_ism" + const val PLUGIN_NAME = "opendistro-im" + const val IM_BASE_URI = "/_opendistro/_im" + const val ISM_BASE_URI = "$IM_BASE_URI/_ism" + const val DEPRECATED_ISM_BASE_URI = "/_opendistro/_ism" const val POLICY_BASE_URI = "$ISM_BASE_URI/policies" - const val INDEX_STATE_MANAGEMENT_INDEX = ".opendistro-ism-config" - const val INDEX_STATE_MANAGEMENT_JOB_TYPE = "opendistro-managed-index" + const val DEPRECATED_POLICY_BASE_URI = "$DEPRECATED_ISM_BASE_URI/policies" + const val INDEX_MANAGEMENT_INDEX = ".opendistro-ism-config" + const val INDEX_MANAGEMENT_JOB_TYPE = "opendistro-index-management" const val INDEX_STATE_MANAGEMENT_HISTORY_TYPE = "managed_index_meta_data" } - override fun getJobIndex(): String { - return INDEX_STATE_MANAGEMENT_INDEX - } + override fun getJobIndex(): String = INDEX_MANAGEMENT_INDEX - override fun getJobType(): String { - return INDEX_STATE_MANAGEMENT_JOB_TYPE - } + override fun getJobType(): String = INDEX_MANAGEMENT_JOB_TYPE - override fun getJobRunner(): ScheduledJobRunner { - return ManagedIndexRunner - } + override fun getJobRunner(): ScheduledJobRunner = ManagedIndexRunner override fun getJobParser(): ScheduledJobParser { return ScheduledJobParser { xcp, id, jobDocVersion -> @@ -101,7 +101,7 @@ internal class IndexStateManagementPlugin : JobSchedulerExtension, ActionPlugin, return@ScheduledJobParser null } else -> { - logger.info("Unsupported document was indexed in $INDEX_STATE_MANAGEMENT_INDEX with type: $fieldName") + logger.info("Unsupported document was indexed in $INDEX_MANAGEMENT_INDEX with type: $fieldName") } } } @@ -119,7 +119,7 @@ internal class IndexStateManagementPlugin : JobSchedulerExtension, ActionPlugin, nodesInCluster: Supplier ): List { return listOf( - RestIndexPolicyAction(settings, clusterService, indexStateManagementIndices), + RestIndexPolicyAction(settings, clusterService, indexManagementIndices), RestGetPolicyAction(), RestDeletePolicyAction(), RestExplainAction(), @@ -153,18 +153,23 @@ internal class IndexStateManagementPlugin : JobSchedulerExtension, ActionPlugin, .registerSettings(settings) .registerConsumers() // registerConsumers must happen after registerSettings/clusterService - indexStateManagementIndices = IndexStateManagementIndices(client.admin().indices(), clusterService) - val indexStateManagementHistory = - IndexStateManagementHistory(settings, client, threadPool, clusterService, indexStateManagementIndices) + indexManagementIndices = IndexManagementIndices(client.admin().indices(), clusterService) + val indexManagementHistory = + IndexManagementHistory(settings, client, threadPool, clusterService, indexManagementIndices) val managedIndexCoordinator = ManagedIndexCoordinator(environment.settings(), - client, clusterService, threadPool, indexStateManagementIndices) + client, clusterService, threadPool, indexManagementIndices) - return listOf(managedIndexRunner, indexStateManagementIndices, managedIndexCoordinator, indexStateManagementHistory) + return listOf(managedIndexRunner, indexManagementIndices, managedIndexCoordinator, indexManagementHistory) } override fun getSettings(): List> { return listOf( + IndexManagementSettings.HISTORY_ENABLED, + IndexManagementSettings.HISTORY_INDEX_MAX_AGE, + IndexManagementSettings.HISTORY_MAX_DOCS, + IndexManagementSettings.HISTORY_RETENTION_PERIOD, + IndexManagementSettings.HISTORY_ROLLOVER_CHECK_PERIOD, ManagedIndexSettings.POLICY_ID, ManagedIndexSettings.ROLLOVER_ALIAS, ManagedIndexSettings.INDEX_STATE_MANAGEMENT_ENABLED, @@ -172,12 +177,21 @@ internal class IndexStateManagementPlugin : JobSchedulerExtension, ActionPlugin, ManagedIndexSettings.SWEEP_PERIOD, ManagedIndexSettings.COORDINATOR_BACKOFF_COUNT, ManagedIndexSettings.COORDINATOR_BACKOFF_MILLIS, - ManagedIndexSettings.HISTORY_ENABLED, - ManagedIndexSettings.HISTORY_MAX_DOCS, - ManagedIndexSettings.HISTORY_INDEX_MAX_AGE, - ManagedIndexSettings.HISTORY_ROLLOVER_CHECK_PERIOD, - ManagedIndexSettings.HISTORY_RETENTION_PERIOD, - ManagedIndexSettings.ALLOW_LIST + ManagedIndexSettings.ALLOW_LIST, + // DEPRECATED BELOW + ManagedIndexSettings.DEPRECATED_POLICY_ID, + ManagedIndexSettings.DEPRECATED_ROLLOVER_ALIAS, + ManagedIndexSettings.DEPRECATED_INDEX_STATE_MANAGEMENT_ENABLED, + ManagedIndexSettings.DEPRECATED_JOB_INTERVAL, + ManagedIndexSettings.DEPRECATED_SWEEP_PERIOD, + ManagedIndexSettings.DEPRECATED_COORDINATOR_BACKOFF_COUNT, + ManagedIndexSettings.DEPRECATED_COORDINATOR_BACKOFF_MILLIS, + ManagedIndexSettings.DEPRECATED_ALLOW_LIST, + ManagedIndexSettings.DEPRECATED_HISTORY_ENABLED, + ManagedIndexSettings.DEPRECATED_HISTORY_MAX_DOCS, + ManagedIndexSettings.DEPRECATED_HISTORY_INDEX_MAX_AGE, + ManagedIndexSettings.DEPRECATED_HISTORY_ROLLOVER_CHECK_PERIOD, + ManagedIndexSettings.DEPRECATED_HISTORY_RETENTION_PERIOD ) } diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/ManagedIndexCoordinator.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexCoordinator.kt similarity index 78% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/ManagedIndexCoordinator.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexCoordinator.kt index 8e1b7e210..8898974b0 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/ManagedIndexCoordinator.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexCoordinator.kt @@ -13,38 +13,39 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getClusterStateManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getPolicyID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.retry -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.shouldCreateManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.shouldDeleteManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.shouldDeleteManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.coordinator.ClusterStateManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.coordinator.SweptManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.COORDINATOR_BACKOFF_COUNT -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.COORDINATOR_BACKOFF_MILLIS -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.INDEX_STATE_MANAGEMENT_ENABLED -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.JOB_INTERVAL -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.POLICY_ID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.SWEEP_PERIOD -import com.amazon.opendistroforelasticsearch.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.OpenForTesting -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.managedIndexConfigIndexRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.deleteManagedIndexRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.getCreateManagedIndexRequests -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.getDeleteManagedIndexRequests -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.getSweptManagedIndexSearchRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.isFailed -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.isPolicyCompleted -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.updateEnableManagedIndexRequest +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getClusterStateManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getPolicyID +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.retry +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.shouldCreateManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.shouldDeleteManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.shouldDeleteManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.coordinator.ClusterStateManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.coordinator.SweptManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.COORDINATOR_BACKOFF_COUNT +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.COORDINATOR_BACKOFF_MILLIS +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.INDEX_STATE_MANAGEMENT_ENABLED +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.JOB_INTERVAL +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.POLICY_ID +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.SWEEP_PERIOD +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.util.OpenForTesting +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.managedIndexConfigIndexRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.deleteManagedIndexRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.getCreateManagedIndexRequests +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.getDeleteManagedIndexRequests +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.getSweptManagedIndexSearchRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.isFailed +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.isPolicyCompleted +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.updateEnableManagedIndexRequest import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -83,13 +84,13 @@ import org.elasticsearch.threadpool.ThreadPool /** * Listens for cluster changes to pick up new indices to manage. - * Sweeps the cluster state and [INDEX_STATE_MANAGEMENT_INDEX] for [ManagedIndexConfig]. + * Sweeps the cluster state and [INDEX_MANAGEMENT_INDEX] for [ManagedIndexConfig]. * * This class listens for [ClusterChangedEvent] to pick up on [ManagedIndexConfig] to create or delete. * Also sets up a background process that sweeps the cluster state for [ClusterStateManagedIndexConfig] - * and the [INDEX_STATE_MANAGEMENT_INDEX] for [SweptManagedIndexConfig]. It will then compare these + * and the [INDEX_MANAGEMENT_INDEX] for [SweptManagedIndexConfig]. It will then compare these * ManagedIndices to appropriately create or delete each [ManagedIndexConfig]. Each node that has - * the [IndexStateManagementPlugin] installed will have an instance of this class, but only the elected + * the [IndexManagementPlugin] installed will have an instance of this class, but only the elected * master node will set up the background sweep process and listen for [ClusterChangedEvent]. * * We do not allow updating to a new policy through Coordinator as this can have bad side effects. If @@ -103,13 +104,13 @@ class ManagedIndexCoordinator( private val client: Client, private val clusterService: ClusterService, private val threadPool: ThreadPool, - indexStateManagementIndices: IndexStateManagementIndices + indexManagementIndices: IndexManagementIndices ) : LocalNodeMasterListener, ClusterStateListener, CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default + CoroutineName("ManagedIndexCoordinator")), LifecycleListener() { private val logger = LogManager.getLogger(javaClass) - private val ismIndices = indexStateManagementIndices + private val ismIndices = indexManagementIndices private var scheduledFullSweep: Scheduler.Cancellable? = null @@ -311,14 +312,14 @@ class ManagedIndexCoordinator( TimeValue.timeValueNanos(System.nanoTime() - lastFullSweepTimeNano) /** - * Sweeps the [INDEX_STATE_MANAGEMENT_INDEX] and cluster state. + * Sweeps the [INDEX_MANAGEMENT_INDEX] and cluster state. * - * Sweeps the [INDEX_STATE_MANAGEMENT_INDEX] and cluster state for any [DocWriteRequest] that need to happen + * Sweeps the [INDEX_MANAGEMENT_INDEX] and cluster state for any [DocWriteRequest] that need to happen * and executes them in batch as a bulk request. */ @OpenForTesting suspend fun sweep() { - val currentManagedIndices = sweepManagedIndexJobs(client, ismIndices.indexStateManagementIndexExists()) + val currentManagedIndices = sweepManagedIndexJobs(client, ismIndices.indexManagementIndexExists()) val clusterStateManagedIndices = sweepClusterState(clusterService.state()) val createManagedIndexRequests = @@ -336,9 +337,9 @@ class ManagedIndexCoordinator( } /** - * Sweeps the [INDEX_STATE_MANAGEMENT_INDEX] for ManagedIndices. + * Sweeps the [INDEX_MANAGEMENT_INDEX] for ManagedIndices. * - * Sweeps the [INDEX_STATE_MANAGEMENT_INDEX] for ManagedIndices and only fetches the index, index_uuid, + * Sweeps the [INDEX_MANAGEMENT_INDEX] for ManagedIndices and only fetches the index, index_uuid, * policy_id, and change_policy fields to convert into a [SweptManagedIndexConfig]. * * @return map of IndexUuid to [SweptManagedIndexConfig]. @@ -346,9 +347,9 @@ class ManagedIndexCoordinator( @OpenForTesting suspend fun sweepManagedIndexJobs( client: Client, - indexStateManagementIndexExists: Boolean + indexManagementIndexExists: Boolean ): Map { - if (!indexStateManagementIndexExists) return mapOf() + if (!indexManagementIndexExists) return mapOf() val managedIndexSearchRequest = getSweptManagedIndexSearchRequest() val response: SearchResponse = client.suspendUntil { search(managedIndexSearchRequest, it) } @@ -390,7 +391,7 @@ class ManagedIndexCoordinator( if (hasCreateRequests) { val created = ismIndices.attemptInitStateManagementIndex(client) if (!created) { - logger.error("Failed to create $INDEX_STATE_MANAGEMENT_INDEX") + logger.error("Failed to create $INDEX_MANAGEMENT_INDEX") return } } diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/ManagedIndexRunner.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt similarity index 88% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/ManagedIndexRunner.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt index ac11a4ab2..2e53461a4 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/ManagedIndexRunner.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexRunner.kt @@ -13,49 +13,49 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.convertToMap -import com.amazon.opendistroforelasticsearch.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getPolicyID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.retry -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.string -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StateMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.ALLOW_LIST -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.ALLOW_LIST_NONE -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.DEFAULT_ISM_ENABLED -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.DEFAULT_JOB_INTERVAL -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.INDEX_STATE_MANAGEMENT_ENABLED -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.JOB_INTERVAL -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.managedIndexConfigIndexRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.getActionToExecute -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.getStartingManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.getStateToExecute -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.getCompletedManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.getUpdatedActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.hasDifferentJobInterval -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.hasTimedOut -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.hasVersionConflict -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.isAllowed -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.isFailed -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.isSafeToChange -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.isSuccessfulDelete -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.shouldBackoff -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.shouldChangePolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.updateDisableManagedIndexRequest +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.convertToMap +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getPolicyID +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.retry +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.string +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StateMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.ALLOW_LIST +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.ALLOW_LIST_NONE +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.DEFAULT_ISM_ENABLED +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.DEFAULT_JOB_INTERVAL +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.INDEX_STATE_MANAGEMENT_ENABLED +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.JOB_INTERVAL +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.managedIndexConfigIndexRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.getActionToExecute +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.getStartingManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.getStateToExecute +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.getCompletedManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.getUpdatedActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.hasDifferentJobInterval +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.hasTimedOut +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.hasVersionConflict +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.isAllowed +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.isFailed +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.isSafeToChange +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.isSuccessfulDelete +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.shouldBackoff +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.shouldChangePolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.updateDisableManagedIndexRequest import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobExecutionContext import com.amazon.opendistroforelasticsearch.jobscheduler.spi.LockModel import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter @@ -149,7 +149,7 @@ object ManagedIndexRunner : ScheduledJobRunner, return this } - // must be called after registerSettings and registerClusterService in IndexStateManagementPlugin + // must be called after registerSettings and registerClusterService in IndexManagementPlugin fun registerConsumers(): ManagedIndexRunner { jobInterval = JOB_INTERVAL.get(settings) clusterService.clusterSettings.addSettingsUpdateConsumer(JOB_INTERVAL) { @@ -351,7 +351,7 @@ object ManagedIndexRunner : ScheduledJobRunner, @Suppress("ReturnCount") private suspend fun getPolicy(policyID: String): Policy? { try { - val getRequest = GetRequest(INDEX_STATE_MANAGEMENT_INDEX, policyID) + val getRequest = GetRequest(INDEX_MANAGEMENT_INDEX, policyID) val getResponse: GetResponse = client.suspendUntil { get(getRequest, it) } if (!getResponse.isExists || getResponse.isSourceEmpty) { return null diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/Action.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/Action.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/Action.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/Action.kt index bc19e73fa..31ab18ee9 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/Action.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/Action.kt @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step abstract class Action(val type: ActionType, val config: ActionConfig, val managedIndexMetaData: ManagedIndexMetaData) { diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/AllocationAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/AllocationAction.kt similarity index 66% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/AllocationAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/AllocationAction.kt index d4ab20a8e..93b9646ad 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/AllocationAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/AllocationAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.AllocationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.allocation.AttemptAllocationStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.AllocationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.allocation.AttemptAllocationStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/CloseAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/CloseAction.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/CloseAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/CloseAction.kt index f20c37c4f..73daf63a1 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/CloseAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/CloseAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.CloseActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.close.AttemptCloseStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.CloseActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.close.AttemptCloseStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/DeleteAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/DeleteAction.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/DeleteAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/DeleteAction.kt index 7f5d0fc66..e8e0bd3d0 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/DeleteAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/DeleteAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.DeleteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.delete.AttemptDeleteStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.DeleteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.delete.AttemptDeleteStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ForceMergeAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ForceMergeAction.kt similarity index 77% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ForceMergeAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ForceMergeAction.kt index d583856b5..0dff57d0e 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ForceMergeAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ForceMergeAction.kt @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge.AttemptCallForceMergeStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge.AttemptSetReadOnlyStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge.WaitForForceMergeStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge.AttemptCallForceMergeStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge.AttemptSetReadOnlyStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge.WaitForForceMergeStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/IndexPriorityAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/IndexPriorityAction.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/IndexPriorityAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/IndexPriorityAction.kt index bdc3e213c..395e0b649 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/IndexPriorityAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/IndexPriorityAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.IndexPriorityActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.indexpriority.AttemptSetIndexPriorityStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.IndexPriorityActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.indexpriority.AttemptSetIndexPriorityStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/NotificationAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/NotificationAction.kt similarity index 67% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/NotificationAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/NotificationAction.kt index 0259d0130..9d73bd698 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/NotificationAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/NotificationAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.NotificationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.notification.AttemptNotificationStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.NotificationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.notification.AttemptNotificationStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.script.ScriptService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/OpenAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/OpenAction.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/OpenAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/OpenAction.kt index c429d77cb..167a410df 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/OpenAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/OpenAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.OpenActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.open.AttemptOpenStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.OpenActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.open.AttemptOpenStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadOnlyAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadOnlyAction.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadOnlyAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadOnlyAction.kt index 1bdbbbafc..3acc64303 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadOnlyAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadOnlyAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.readonly.SetReadOnlyStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.readonly.SetReadOnlyStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadWriteAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadWriteAction.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadWriteAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadWriteAction.kt index c5234edb0..bb1028801 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadWriteAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadWriteAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadWriteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.readwrite.SetReadWriteStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadWriteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.readwrite.SetReadWriteStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReplicaCountAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReplicaCountAction.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReplicaCountAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReplicaCountAction.kt index 71afbc313..fc20d2957 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReplicaCountAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReplicaCountAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReplicaCountActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.replicacount.AttemptSetReplicaCountStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReplicaCountActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.replicacount.AttemptSetReplicaCountStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/RolloverAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/RolloverAction.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/RolloverAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/RolloverAction.kt index aa3ab46d4..d1b90d200 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/RolloverAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/RolloverAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.RolloverActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.rollover.AttemptRolloverStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.RolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.rollover.AttemptRolloverStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/SnapshotAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/SnapshotAction.kt similarity index 71% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/SnapshotAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/SnapshotAction.kt index 6e21f238e..fb6504c88 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/SnapshotAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/SnapshotAction.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.SnapshotActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.snapshot.AttemptSnapshotStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.snapshot.WaitForSnapshotStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.SnapshotActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.snapshot.AttemptSnapshotStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.snapshot.WaitForSnapshotStep import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/TransitionsAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/TransitionsAction.kt similarity index 65% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/TransitionsAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/TransitionsAction.kt index a17098eea..450d71a8c 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/TransitionsAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/TransitionsAction.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig.ActionType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.TransitionsActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.transition.AttemptTransitionStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig.ActionType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.TransitionsActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.transition.AttemptTransitionStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/elasticapi/ElasticExtensions.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/elasticapi/ElasticExtensions.kt similarity index 92% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/elasticapi/ElasticExtensions.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/elasticapi/ElasticExtensions.kt index 60f1cf03b..c8b85844d 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/elasticapi/ElasticExtensions.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/elasticapi/ElasticExtensions.kt @@ -15,11 +15,11 @@ @file:Suppress("TooManyFunctions") -package com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.coordinator.ClusterStateManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.coordinator.ClusterStateManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings import com.amazon.opendistroforelasticsearch.jobscheduler.spi.utils.LockService import kotlinx.coroutines.delay import org.apache.logging.log4j.Logger @@ -188,18 +188,17 @@ fun IndexMetadata.shouldDeleteManagedIndexMetaData(): Boolean = * Returns the current policy_id if it exists and is valid otherwise returns null. * */ fun IndexMetadata.getPolicyID(): String? { - if (this.settings.get(ManagedIndexSettings.POLICY_ID.key).isNullOrBlank()) return null - - return this.settings.get(ManagedIndexSettings.POLICY_ID.key) + if (ManagedIndexSettings.POLICY_ID.get(this.settings).isNullOrBlank()) return null + return ManagedIndexSettings.POLICY_ID.get(this.settings) } /** * Returns the current rollover_alias if it exists otherwise returns null. * */ fun IndexMetadata.getRolloverAlias(): String? { - if (this.settings.get(ManagedIndexSettings.ROLLOVER_ALIAS.key).isNullOrBlank()) return null + if (ManagedIndexSettings.ROLLOVER_ALIAS.get(this.settings).isNullOrBlank()) return null - return this.settings.get(ManagedIndexSettings.ROLLOVER_ALIAS.key) + return ManagedIndexSettings.ROLLOVER_ALIAS.get(this.settings) } fun IndexMetadata.getClusterStateManagedIndexConfig(): ClusterStateManagedIndexConfig? { diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ChangePolicy.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ChangePolicy.kt similarity index 94% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ChangePolicy.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ChangePolicy.kt index 45e78ed73..4b6013c9a 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ChangePolicy.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ChangePolicy.kt @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StateMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StateMetaData import org.elasticsearch.common.xcontent.ToXContent import org.elasticsearch.common.xcontent.ToXContentObject import org.elasticsearch.common.xcontent.XContentBuilder diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ErrorNotification.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ErrorNotification.kt similarity index 93% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ErrorNotification.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ErrorNotification.kt index 8fc80cc37..ba6ab73c2 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ErrorNotification.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ErrorNotification.kt @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.Destination +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.Destination import org.elasticsearch.common.xcontent.ToXContent import org.elasticsearch.common.xcontent.ToXContentObject import org.elasticsearch.common.xcontent.XContentBuilder diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ManagedIndexConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ManagedIndexConfig.kt similarity index 95% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ManagedIndexConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ManagedIndexConfig.kt index 27f864456..d9a346cc1 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ManagedIndexConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ManagedIndexConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.instant -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.optionalTimeField -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.XCONTENT_WITHOUT_TYPE +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.instant +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.optionalTimeField +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.XCONTENT_WITHOUT_TYPE import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.Schedule import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.ScheduleParser diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ManagedIndexMetaData.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ManagedIndexMetaData.kt similarity index 94% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ManagedIndexMetaData.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ManagedIndexMetaData.kt index 7f33679db..94a9bc5d6 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ManagedIndexMetaData.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ManagedIndexMetaData.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StateMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StateMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData import org.elasticsearch.common.Strings import org.elasticsearch.common.io.stream.StreamInput import org.elasticsearch.common.io.stream.StreamOutput diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/Policy.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/Policy.kt similarity index 93% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/Policy.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/Policy.kt index 5ab3bc8cb..0c21d310b 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/Policy.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/Policy.kt @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.instant -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.optionalTimeField -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.IndexUtils -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.WITH_TYPE +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.instant +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.optionalTimeField +import com.amazon.opendistroforelasticsearch.indexmanagement.util.IndexUtils +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.WITH_TYPE import org.elasticsearch.common.xcontent.ToXContent import org.elasticsearch.common.xcontent.ToXContentObject import org.elasticsearch.common.xcontent.XContentBuilder diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/State.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/State.kt similarity index 95% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/State.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/State.kt index f7f5cf2d9..8fe3123b6 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/State.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/State.kt @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig import org.elasticsearch.common.xcontent.ToXContent import org.elasticsearch.common.xcontent.ToXContentObject import org.elasticsearch.common.xcontent.XContentBuilder diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/StateFilter.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/StateFilter.kt similarity index 94% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/StateFilter.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/StateFilter.kt index 7fa6abfd5..159ad1527 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/StateFilter.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/StateFilter.kt @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model import org.elasticsearch.common.xcontent.XContentParser import org.elasticsearch.common.xcontent.XContentParser.Token diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/Transition.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/Transition.kt similarity index 98% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/Transition.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/Transition.kt index d96100238..f402430c9 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/Transition.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/Transition.kt @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.CronSchedule import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.ScheduleParser diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ActionConfig.kt similarity index 93% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ActionConfig.kt index a9921f877..f44983104 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ActionConfig.kt @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ActionRetry.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ActionRetry.kt similarity index 95% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ActionRetry.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ActionRetry.kt index f77c2af37..33399dfe8 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ActionRetry.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ActionRetry.kt @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData import org.apache.logging.log4j.LogManager import org.elasticsearch.common.unit.TimeValue import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ActionTimeout.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ActionTimeout.kt similarity index 94% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ActionTimeout.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ActionTimeout.kt index 24dd0eaba..05640e5b6 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ActionTimeout.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ActionTimeout.kt @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action import org.elasticsearch.common.unit.TimeValue import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/AllocationActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/AllocationActionConfig.kt similarity index 91% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/AllocationActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/AllocationActionConfig.kt index 3834f80f0..b06c33360 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/AllocationActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/AllocationActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.AllocationAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.AllocationAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/CloseActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/CloseActionConfig.kt similarity index 84% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/CloseActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/CloseActionConfig.kt index b71a3a2e6..d4a3b735d 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/CloseActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/CloseActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.CloseAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.CloseAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/DeleteActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/DeleteActionConfig.kt similarity index 84% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/DeleteActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/DeleteActionConfig.kt index 1b10b5472..24cb54af0 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/DeleteActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/DeleteActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.DeleteAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.DeleteAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ForceMergeActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ForceMergeActionConfig.kt similarity index 88% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ForceMergeActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ForceMergeActionConfig.kt index 6661bac72..ac259446c 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ForceMergeActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ForceMergeActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.ForceMergeAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.ForceMergeAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/IndexPriorityActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/IndexPriorityActionConfig.kt similarity index 88% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/IndexPriorityActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/IndexPriorityActionConfig.kt index fc14ba2ff..d5e570d4a 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/IndexPriorityActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/IndexPriorityActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.IndexPriorityAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.IndexPriorityAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/NotificationActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/NotificationActionConfig.kt similarity index 87% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/NotificationActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/NotificationActionConfig.kt index 37505b65b..c4a54afc6 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/NotificationActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/NotificationActionConfig.kt @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.NotificationAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.Destination +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.NotificationAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.Destination import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/OpenActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/OpenActionConfig.kt similarity index 84% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/OpenActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/OpenActionConfig.kt index c98146ee3..7862b539f 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/OpenActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/OpenActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.OpenAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.OpenAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ReadOnlyActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ReadOnlyActionConfig.kt similarity index 84% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ReadOnlyActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ReadOnlyActionConfig.kt index d3cef0f23..faeb34297 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ReadOnlyActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ReadOnlyActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.ReadOnlyAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.ReadOnlyAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ReadWriteActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ReadWriteActionConfig.kt similarity index 84% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ReadWriteActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ReadWriteActionConfig.kt index d1b8430e7..20e32533d 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ReadWriteActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ReadWriteActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.ReadWriteAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.ReadWriteAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ReplicaCountActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ReplicaCountActionConfig.kt similarity index 88% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ReplicaCountActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ReplicaCountActionConfig.kt index 3ea70a68e..fc40aa492 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/ReplicaCountActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/ReplicaCountActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.ReplicaCountAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.ReplicaCountAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/RolloverActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/RolloverActionConfig.kt similarity index 90% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/RolloverActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/RolloverActionConfig.kt index f3472f6cf..75cd662b5 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/RolloverActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/RolloverActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.RolloverAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.RolloverAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.unit.ByteSizeValue diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/SnapshotActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/SnapshotActionConfig.kt similarity index 89% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/SnapshotActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/SnapshotActionConfig.kt index 5f7fe0e20..90f2dfbbf 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/SnapshotActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/SnapshotActionConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.SnapshotAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.SnapshotAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/TransitionsActionConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/TransitionsActionConfig.kt similarity index 68% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/TransitionsActionConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/TransitionsActionConfig.kt index 8a2378787..cc2070a7a 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/action/TransitionsActionConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/action/TransitionsActionConfig.kt @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.Action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.action.TransitionsAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Transition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.Action +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action.TransitionsAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Transition import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.elasticsearch.script.ScriptService diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/coordinator/ClusterStateManagedIndexConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/coordinator/ClusterStateManagedIndexConfig.kt similarity index 81% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/coordinator/ClusterStateManagedIndexConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/coordinator/ClusterStateManagedIndexConfig.kt index df8120d4a..44773061f 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/coordinator/ClusterStateManagedIndexConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/coordinator/ClusterStateManagedIndexConfig.kt @@ -13,16 +13,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.coordinator +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.coordinator -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig import org.elasticsearch.common.xcontent.ToXContentObject import org.elasticsearch.index.seqno.SequenceNumbers /** * Data class to hold index metadata from cluster state. * - * This data class is used in the [com.amazon.opendistroforelasticsearch.indexstatemanagement.ManagedIndexCoordinator] + * This data class is used in the [com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.ManagedIndexCoordinator] * when reading in index metadata from cluster state and implements [ToXContentObject] for partial updates * of the [ManagedIndexConfig] job document. */ diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/coordinator/SweptManagedIndexConfig.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/coordinator/SweptManagedIndexConfig.kt similarity index 88% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/coordinator/SweptManagedIndexConfig.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/coordinator/SweptManagedIndexConfig.kt index 07761bd90..2160eb340 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/coordinator/SweptManagedIndexConfig.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/coordinator/SweptManagedIndexConfig.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.coordinator +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.coordinator -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ChangePolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ChangePolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy import org.elasticsearch.common.xcontent.XContentParser import org.elasticsearch.common.xcontent.XContentParser.Token import org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken @@ -26,7 +26,7 @@ import java.io.IOException /** * Data class to hold partial [ManagedIndexConfig] data. * - * This data class is used in the [com.amazon.opendistroforelasticsearch.indexstatemanagement.ManagedIndexCoordinator] + * This data class is used in the [com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.ManagedIndexCoordinator] * to hold partial data when reading in the [ManagedIndexConfig] document from the index. */ data class SweptManagedIndexConfig( diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/Chime.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/Chime.kt similarity index 93% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/Chime.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/Chime.kt index f84f2fe83..16ecb4a12 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/Chime.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/Chime.kt @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.string +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.string import org.elasticsearch.common.Strings import org.elasticsearch.common.xcontent.ToXContent import org.elasticsearch.common.xcontent.XContentBuilder diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/CustomWebhook.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/CustomWebhook.kt similarity index 97% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/CustomWebhook.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/CustomWebhook.kt index 19c6bf2a7..421125871 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/CustomWebhook.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/CustomWebhook.kt @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination import org.elasticsearch.common.Strings import org.elasticsearch.common.xcontent.ToXContent diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/Destination.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/Destination.kt similarity index 96% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/Destination.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/Destination.kt index 8ae097a1f..650b65be0 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/Destination.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/Destination.kt @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination import com.amazon.opendistroforelasticsearch.alerting.destination.Notification import com.amazon.opendistroforelasticsearch.alerting.destination.message.BaseMessage @@ -21,7 +21,7 @@ import com.amazon.opendistroforelasticsearch.alerting.destination.message.ChimeM import com.amazon.opendistroforelasticsearch.alerting.destination.message.CustomWebhookMessage import com.amazon.opendistroforelasticsearch.alerting.destination.message.SlackMessage import com.amazon.opendistroforelasticsearch.alerting.destination.response.DestinationHttpResponse -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.convertToMap +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.convertToMap import org.apache.logging.log4j.LogManager import org.elasticsearch.common.xcontent.ToXContent import org.elasticsearch.common.xcontent.ToXContentObject diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/Slack.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/Slack.kt similarity index 93% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/Slack.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/Slack.kt index c38c6f869..533b59424 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/destination/Slack.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/destination/Slack.kt @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.string +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.string import org.elasticsearch.common.Strings import org.elasticsearch.common.xcontent.ToXContent import org.elasticsearch.common.xcontent.XContentBuilder diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/ActionMetaData.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/ActionMetaData.kt similarity index 94% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/ActionMetaData.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/ActionMetaData.kt index ddc41a67f..9d591a79e 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/ActionMetaData.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/ActionMetaData.kt @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData.Companion.NAME -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData.Companion.START_TIME +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData.Companion.NAME +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData.Companion.START_TIME import org.elasticsearch.common.Strings import org.elasticsearch.common.io.stream.StreamInput import org.elasticsearch.common.io.stream.StreamOutput diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/ActionProperties.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/ActionProperties.kt similarity index 96% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/ActionProperties.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/ActionProperties.kt index 090cfb79b..ace819169 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/ActionProperties.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/ActionProperties.kt @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata import org.elasticsearch.common.io.stream.StreamInput import org.elasticsearch.common.io.stream.StreamOutput diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/PolicyRetryInfoMetaData.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/PolicyRetryInfoMetaData.kt similarity index 97% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/PolicyRetryInfoMetaData.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/PolicyRetryInfoMetaData.kt index fcb7d6433..ee8c15f54 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/PolicyRetryInfoMetaData.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/PolicyRetryInfoMetaData.kt @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata import org.elasticsearch.common.Strings import org.elasticsearch.common.io.stream.StreamInput diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/StateMetaData.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/StateMetaData.kt similarity index 90% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/StateMetaData.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/StateMetaData.kt index 6bcf70ce6..8859e16b3 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/StateMetaData.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/StateMetaData.kt @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData.Companion.NAME -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData.Companion.START_TIME +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData.Companion.NAME +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData.Companion.START_TIME import org.elasticsearch.common.Strings import org.elasticsearch.common.io.stream.StreamInput import org.elasticsearch.common.io.stream.StreamOutput diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/StepMetaData.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/StepMetaData.kt similarity index 90% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/StepMetaData.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/StepMetaData.kt index 738b655ff..e7435359e 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/managedindexmetadata/StepMetaData.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/managedindexmetadata/StepMetaData.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData.Companion.NAME -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData.Companion.START_TIME -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData.Companion.NAME +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData.Companion.START_TIME +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.elasticsearch.common.Strings import org.elasticsearch.common.io.stream.StreamInput import org.elasticsearch.common.io.stream.StreamOutput diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/AsyncActionHandler.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/AsyncActionHandler.kt similarity index 90% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/AsyncActionHandler.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/AsyncActionHandler.kt index ff41c4934..70eccaac6 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/AsyncActionHandler.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/AsyncActionHandler.kt @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler import org.elasticsearch.client.node.NodeClient import org.elasticsearch.rest.BytesRestResponse diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestAddPolicyAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestAddPolicyAction.kt similarity index 87% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestAddPolicyAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestAddPolicyAction.kt index 8f70cde12..90f02f800 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestAddPolicyAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestAddPolicyAction.kt @@ -13,14 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.ISM_BASE_URI -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getPolicyID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FailedIndex -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.buildInvalidIndexResponse +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.DEPRECATED_ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getPolicyID +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FailedIndex +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.buildInvalidIndexResponse import org.elasticsearch.ElasticsearchTimeoutException import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse @@ -57,8 +58,10 @@ class RestAddPolicyAction : BaseRestHandler() { override fun routes(): List { return listOf( - Route(POST, ADD_POLICY_BASE_URI), - Route(POST, "$ADD_POLICY_BASE_URI/{index}") + Route(POST, ADD_POLICY_BASE_URI), + Route(POST, "$ADD_POLICY_BASE_URI/{index}"), + Route(POST, DEPRECATED_ADD_POLICY_BASE_URI), + Route(POST, "$DEPRECATED_ADD_POLICY_BASE_URI/{index}") ) } @@ -187,6 +190,7 @@ class RestAddPolicyAction : BaseRestHandler() { companion object { const val ADD_POLICY_BASE_URI = "$ISM_BASE_URI/add" + const val DEPRECATED_ADD_POLICY_BASE_URI = "$DEPRECATED_ISM_BASE_URI/add" const val ADD_POLICY_TIMEOUT_IN_MILLIS = 30000L } diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestChangePolicyAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestChangePolicyAction.kt similarity index 85% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestChangePolicyAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestChangePolicyAction.kt index 3f774f9b2..5ecd52a92 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestChangePolicyAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestChangePolicyAction.kt @@ -13,23 +13,24 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.ISM_BASE_URI -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getPolicyID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ChangePolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.coordinator.SweptManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILURES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FailedIndex -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.IndexUtils -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.isSafeToChange -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.updateManagedIndexRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.DEPRECATED_ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getPolicyID +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ChangePolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.coordinator.SweptManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILURES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FailedIndex +import com.amazon.opendistroforelasticsearch.indexmanagement.util.IndexUtils +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.isSafeToChange +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.updateManagedIndexRequest import org.apache.logging.log4j.LogManager import org.elasticsearch.action.ActionListener import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest @@ -71,8 +72,10 @@ class RestChangePolicyAction(val clusterService: ClusterService) : BaseRestHandl override fun routes(): List { return listOf( - Route(POST, CHANGE_POLICY_BASE_URI), - Route(POST, "$CHANGE_POLICY_BASE_URI/{index}") + Route(POST, CHANGE_POLICY_BASE_URI), + Route(POST, "$CHANGE_POLICY_BASE_URI/{index}"), + Route(POST, DEPRECATED_CHANGE_POLICY_BASE_URI), + Route(POST, "$DEPRECATED_CHANGE_POLICY_BASE_URI/{index}") ) } @@ -108,7 +111,7 @@ class RestChangePolicyAction(val clusterService: ClusterService) : BaseRestHandl lateinit var response: GetResponse fun start() { - val getRequest = GetRequest(INDEX_STATE_MANAGEMENT_INDEX, changePolicy.policyID) + val getRequest = GetRequest(INDEX_MANAGEMENT_INDEX, changePolicy.policyID) client.get(getRequest, ActionListener.wrap(::onGetPolicyResponse, ::onFailure)) } @@ -128,7 +131,7 @@ class RestChangePolicyAction(val clusterService: ClusterService) : BaseRestHandl private fun onUpdateMapping(acknowledgedResponse: AcknowledgedResponse) { if (!acknowledgedResponse.isAcknowledged) { return channel.sendResponse(BytesRestResponse(RestStatus.FAILED_DEPENDENCY, - "Could not update $INDEX_STATE_MANAGEMENT_INDEX with new mapping.")) + "Could not update $INDEX_MANAGEMENT_INDEX with new mapping.")) } policy = XContentHelper.createParser( channel.request().xContentRegistry, @@ -281,12 +284,13 @@ class RestChangePolicyAction(val clusterService: ClusterService) : BaseRestHandl ) val excludes = emptyArray() val fetchSourceContext = FetchSourceContext(true, includes, excludes) - managedIndexUuids.forEach { request.add(MultiGetRequest.Item(INDEX_STATE_MANAGEMENT_INDEX, it).fetchSourceContext(fetchSourceContext)) } + managedIndexUuids.forEach { request.add(MultiGetRequest.Item(INDEX_MANAGEMENT_INDEX, it).fetchSourceContext(fetchSourceContext)) } return request } companion object { const val CHANGE_POLICY_BASE_URI = "$ISM_BASE_URI/change_policy" + const val DEPRECATED_CHANGE_POLICY_BASE_URI = "$DEPRECATED_ISM_BASE_URI/change_policy" const val INDEX_NOT_MANAGED = "This index is not being managed" const val INDEX_IN_TRANSITION = "Cannot change policy while transitioning to new state" const val INDEX_NOT_INITIALIZED = "This managed index has not been initialized yet" diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestDeletePolicyAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestDeletePolicyAction.kt similarity index 70% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestDeletePolicyAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestDeletePolicyAction.kt index 6b06edd5f..0d699bcc7 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestDeletePolicyAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestDeletePolicyAction.kt @@ -13,11 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.POLICY_BASE_URI -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.REFRESH +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.DEPRECATED_POLICY_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.POLICY_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.util.REFRESH import org.elasticsearch.action.delete.DeleteRequest import org.elasticsearch.action.support.WriteRequest.RefreshPolicy import org.elasticsearch.client.node.NodeClient @@ -32,7 +33,8 @@ class RestDeletePolicyAction : BaseRestHandler() { override fun routes(): List { return listOf( - Route(DELETE, "$POLICY_BASE_URI/{policyID}") + Route(DELETE, "$POLICY_BASE_URI/{policyID}"), + Route(DELETE, "$DEPRECATED_POLICY_BASE_URI/{policyID") ) } @@ -44,7 +46,7 @@ class RestDeletePolicyAction : BaseRestHandler() { val refreshPolicy = RefreshPolicy.parse(request.param(REFRESH, RefreshPolicy.IMMEDIATE.value)) return RestChannelConsumer { channel -> - val deleteRequest = DeleteRequest(INDEX_STATE_MANAGEMENT_INDEX, policyID) + val deleteRequest = DeleteRequest(INDEX_MANAGEMENT_INDEX, policyID) .setRefreshPolicy(refreshPolicy) client.delete(deleteRequest, RestStatusToXContentListener(channel)) } diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestExplainAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestExplainAction.kt similarity index 80% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestExplainAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestExplainAction.kt index 725477322..86b9a23ae 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestExplainAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestExplainAction.kt @@ -13,12 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getPolicyID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.DEPRECATED_ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getPolicyID +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse import org.elasticsearch.action.support.IndicesOptions @@ -39,13 +40,16 @@ import org.elasticsearch.rest.action.RestBuilderListener class RestExplainAction : BaseRestHandler() { companion object { - const val EXPLAIN_BASE_URI = "${IndexStateManagementPlugin.ISM_BASE_URI}/explain" + const val EXPLAIN_BASE_URI = "$ISM_BASE_URI/explain" + const val DEPRECATED_EXPLAIN_BASE_URI = "$DEPRECATED_ISM_BASE_URI/explain" } override fun routes(): List { return listOf( - Route(GET, EXPLAIN_BASE_URI), - Route(GET, "$EXPLAIN_BASE_URI/{index}") + Route(GET, EXPLAIN_BASE_URI), + Route(GET, "$EXPLAIN_BASE_URI/{index}"), + Route(GET, DEPRECATED_EXPLAIN_BASE_URI), + Route(GET, "$DEPRECATED_EXPLAIN_BASE_URI/{index}") ) } diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestGetPolicyAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestGetPolicyAction.kt similarity index 73% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestGetPolicyAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestGetPolicyAction.kt index a37639437..12eee77dc 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestGetPolicyAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestGetPolicyAction.kt @@ -13,17 +13,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.POLICY_BASE_URI -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy.Companion.POLICY_TYPE -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.XCONTENT_WITHOUT_TYPE -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._ID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._PRIMARY_TERM -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._SEQ_NO -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._VERSION +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.DEPRECATED_POLICY_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.POLICY_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy.Companion.POLICY_TYPE +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.XCONTENT_WITHOUT_TYPE +import com.amazon.opendistroforelasticsearch.indexmanagement.util._ID +import com.amazon.opendistroforelasticsearch.indexmanagement.util._PRIMARY_TERM +import com.amazon.opendistroforelasticsearch.indexmanagement.util._SEQ_NO +import com.amazon.opendistroforelasticsearch.indexmanagement.util._VERSION import org.elasticsearch.action.get.GetRequest import org.elasticsearch.action.get.GetResponse import org.elasticsearch.client.node.NodeClient @@ -47,8 +48,10 @@ class RestGetPolicyAction : BaseRestHandler() { override fun routes(): List { return listOf( - Route(GET, "$POLICY_BASE_URI/{policyID}"), - Route(HEAD, "$POLICY_BASE_URI/{policyID}") + Route(GET, "$POLICY_BASE_URI/{policyID}"), + Route(HEAD, "$POLICY_BASE_URI/{policyID}"), + Route(GET, "$DEPRECATED_POLICY_BASE_URI/{policyID}"), + Route(HEAD, "$DEPRECATED_POLICY_BASE_URI/{policyID}") ) } @@ -61,7 +64,7 @@ class RestGetPolicyAction : BaseRestHandler() { if (policyId == null || policyId.isEmpty()) { throw IllegalArgumentException("Missing policy ID") } - val getRequest = GetRequest(INDEX_STATE_MANAGEMENT_INDEX, policyId) + val getRequest = GetRequest(INDEX_MANAGEMENT_INDEX, policyId) .version(RestActions.parseVersion(request)) if (request.method() == HEAD) { diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestIndexPolicyAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestIndexPolicyAction.kt similarity index 76% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestIndexPolicyAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestIndexPolicyAction.kt index c1dc2ed43..40587e89a 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestIndexPolicyAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestIndexPolicyAction.kt @@ -13,23 +13,24 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementIndices -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.POLICY_BASE_URI -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy.Companion.POLICY_TYPE -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings.Companion.ALLOW_LIST -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.IF_PRIMARY_TERM -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.IF_SEQ_NO -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.IndexUtils -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.REFRESH -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._ID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._PRIMARY_TERM -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._SEQ_NO -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._VERSION -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.getDisallowedActions +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.DEPRECATED_POLICY_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.POLICY_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy.Companion.POLICY_TYPE +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings.Companion.ALLOW_LIST +import com.amazon.opendistroforelasticsearch.indexmanagement.util.IF_PRIMARY_TERM +import com.amazon.opendistroforelasticsearch.indexmanagement.util.IF_SEQ_NO +import com.amazon.opendistroforelasticsearch.indexmanagement.util.IndexUtils +import com.amazon.opendistroforelasticsearch.indexmanagement.util.REFRESH +import com.amazon.opendistroforelasticsearch.indexmanagement.util._ID +import com.amazon.opendistroforelasticsearch.indexmanagement.util._PRIMARY_TERM +import com.amazon.opendistroforelasticsearch.indexmanagement.util._SEQ_NO +import com.amazon.opendistroforelasticsearch.indexmanagement.util._VERSION +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.getDisallowedActions import org.apache.logging.log4j.LogManager import org.elasticsearch.action.ActionListener import org.elasticsearch.action.DocWriteRequest @@ -58,11 +59,11 @@ import java.time.Instant class RestIndexPolicyAction( settings: Settings, val clusterService: ClusterService, - indexStateManagementIndices: IndexStateManagementIndices + indexManagementIndices: IndexManagementIndices ) : BaseRestHandler() { private val log = LogManager.getLogger(javaClass) - private var ismIndices = indexStateManagementIndices + private var ismIndices = indexManagementIndices @Volatile private var allowList = ALLOW_LIST.get(settings) init { @@ -71,8 +72,10 @@ class RestIndexPolicyAction( override fun routes(): List { return listOf( - Route(PUT, POLICY_BASE_URI), - Route(PUT, "$POLICY_BASE_URI/{policyID}") + Route(PUT, POLICY_BASE_URI), + Route(PUT, "$POLICY_BASE_URI/{policyID}"), + Route(PUT, DEPRECATED_POLICY_BASE_URI), + Route(PUT, "$DEPRECATED_POLICY_BASE_URI/{policyID}") ) } @@ -128,10 +131,10 @@ class RestIndexPolicyAction( private fun onCreateMappingsResponse(response: AcknowledgedResponse) { if (response.isAcknowledged) { - log.info("Successfully created or updated $INDEX_STATE_MANAGEMENT_INDEX with newest mappings.") + log.info("Successfully created or updated $INDEX_MANAGEMENT_INDEX with newest mappings.") putPolicy() } else { - log.error("Unable to create or update $INDEX_STATE_MANAGEMENT_INDEX with newest mapping.") + log.error("Unable to create or update $INDEX_MANAGEMENT_INDEX with newest mapping.") channel.sendResponse( BytesRestResponse( RestStatus.INTERNAL_SERVER_ERROR, @@ -143,7 +146,7 @@ class RestIndexPolicyAction( private fun putPolicy() { newPolicy.copy(schemaVersion = IndexUtils.indexManagementConfigSchemaVersion) - val indexRequest = IndexRequest(INDEX_STATE_MANAGEMENT_INDEX) + val indexRequest = IndexRequest(INDEX_MANAGEMENT_INDEX) .setRefreshPolicy(refreshPolicy) .source(newPolicy.toXContent(channel.newBuilder())) .id(policyId) diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRemovePolicyAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRemovePolicyAction.kt similarity index 82% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRemovePolicyAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRemovePolicyAction.kt index 8c8154b93..a60d3c66d 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRemovePolicyAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRemovePolicyAction.kt @@ -13,14 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.ISM_BASE_URI -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getPolicyID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FailedIndex -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.buildInvalidIndexResponse +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.DEPRECATED_ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getPolicyID +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FailedIndex +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.buildInvalidIndexResponse import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsAction @@ -50,8 +51,10 @@ class RestRemovePolicyAction : BaseRestHandler() { override fun routes(): List { return listOf( - Route(POST, REMOVE_POLICY_BASE_URI), - Route(POST, "$REMOVE_POLICY_BASE_URI/{index}") + Route(POST, REMOVE_POLICY_BASE_URI), + Route(POST, "$REMOVE_POLICY_BASE_URI/{index}"), + Route(POST, DEPRECATED_REMOVE_POLICY_BASE_URI), + Route(POST, "$DEPRECATED_REMOVE_POLICY_BASE_URI/{index}") ) } @@ -100,7 +103,9 @@ class RestRemovePolicyAction : BaseRestHandler() { val updateSettingsRequest = UpdateSettingsRequest() .indices(*indicesToRemovePolicyFrom.map { it.name }.toTypedArray()) .settings( - Settings.builder().putNull(ManagedIndexSettings.POLICY_ID.key) + Settings.builder() + .putNull(ManagedIndexSettings.POLICY_ID.key) + .putNull(ManagedIndexSettings.DEPRECATED_POLICY_ID.key) ) try { @@ -155,5 +160,6 @@ class RestRemovePolicyAction : BaseRestHandler() { companion object { const val REMOVE_POLICY_BASE_URI = "$ISM_BASE_URI/remove" + const val DEPRECATED_REMOVE_POLICY_BASE_URI = "$DEPRECATED_ISM_BASE_URI/remove" } } diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt similarity index 82% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt index 74c144ed4..e6749b605 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexAction.kt @@ -13,20 +13,21 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getPolicyID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FailedIndex -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.buildInvalidIndexResponse -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.isFailed -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.updateEnableManagedIndexRequest +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.DEPRECATED_ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getPolicyID +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata.UpdateManagedIndexMetaDataRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FailedIndex +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.buildInvalidIndexResponse +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.isFailed +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.updateEnableManagedIndexRequest import org.apache.logging.log4j.LogManager import org.elasticsearch.action.ActionListener import org.elasticsearch.action.DocWriteRequest @@ -56,8 +57,10 @@ class RestRetryFailedManagedIndexAction : BaseRestHandler() { override fun routes(): List { return listOf( - Route(POST, RETRY_BASE_URI), - Route(POST, "$RETRY_BASE_URI/{index}") + Route(POST, RETRY_BASE_URI), + Route(POST, "$RETRY_BASE_URI/{index}"), + Route(POST, DEPRECATED_RETRY_BASE_URI), + Route(POST, "$DEPRECATED_RETRY_BASE_URI/{index}") ) } @@ -221,6 +224,7 @@ class RestRetryFailedManagedIndexAction : BaseRestHandler() { } companion object { - const val RETRY_BASE_URI = "${IndexStateManagementPlugin.ISM_BASE_URI}/retry" + const val RETRY_BASE_URI = "$ISM_BASE_URI/retry" + const val DEPRECATED_RETRY_BASE_URI = "$DEPRECATED_ISM_BASE_URI/retry" } } diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/settings/ManagedIndexSettings.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/settings/ManagedIndexSettings.kt new file mode 100644 index 000000000..359cc3495 --- /dev/null +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/settings/ManagedIndexSettings.kt @@ -0,0 +1,190 @@ +/* + * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import org.elasticsearch.common.settings.Setting +import org.elasticsearch.common.unit.TimeValue +import java.util.concurrent.TimeUnit +import java.util.function.Function + +class ManagedIndexSettings { + companion object { + const val DEFAULT_ISM_ENABLED = true + const val DEFAULT_JOB_INTERVAL = 5 + private val ALLOW_LIST_ALL = ActionConfig.ActionType.values().toList().map { it.type } + val ALLOW_LIST_NONE = emptyList() + + val DEPRECATED_INDEX_STATE_MANAGEMENT_ENABLED = Setting.boolSetting( + "opendistro.index_state_management.enabled", + DEFAULT_ISM_ENABLED, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val INDEX_STATE_MANAGEMENT_ENABLED: Setting = Setting.boolSetting( + "opendistro.index_management.index_state_management.enabled", + DEPRECATED_INDEX_STATE_MANAGEMENT_ENABLED, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val DEPRECATED_POLICY_ID: Setting = Setting.simpleString( + "index.opendistro.index_state_management.policy_id", + Setting.Property.IndexScope, + Setting.Property.Dynamic + ) + + val POLICY_ID: Setting = Setting.simpleString( + "index.opendistro.index_management.index_state_management.policy_id", + DEPRECATED_POLICY_ID, + Setting.Property.IndexScope, + Setting.Property.Dynamic + ) + + val DEPRECATED_ROLLOVER_ALIAS: Setting = Setting.simpleString( + "index.opendistro.index_state_management.rollover_alias", + Setting.Property.IndexScope, + Setting.Property.Dynamic + ) + + val ROLLOVER_ALIAS: Setting = Setting.simpleString( + "index.opendistro.index_management.index_state_management.rollover_alias", + DEPRECATED_ROLLOVER_ALIAS, + Setting.Property.IndexScope, + Setting.Property.Dynamic + ) + + val DEPRECATED_JOB_INTERVAL: Setting = Setting.intSetting( + "opendistro.index_state_management.job_interval", + DEFAULT_JOB_INTERVAL, + 1, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val JOB_INTERVAL: Setting = Setting.intSetting( + "opendistro.index_management.index_state_management.job_interval", + DEPRECATED_JOB_INTERVAL, + 1, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val DEPRECATED_SWEEP_PERIOD: Setting = Setting.timeSetting( + "opendistro.index_state_management.coordinator.sweep_period", + TimeValue.timeValueMinutes(10), + TimeValue.timeValueMinutes(5), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val SWEEP_PERIOD: Setting = Setting.timeSetting( + "opendistro.index_management.index_state_management.coordinator.sweep_period", + DEPRECATED_SWEEP_PERIOD, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val DEPRECATED_COORDINATOR_BACKOFF_MILLIS: Setting = Setting.positiveTimeSetting( + "opendistro.index_state_management.coordinator.backoff_millis", + TimeValue.timeValueMillis(50), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val COORDINATOR_BACKOFF_MILLIS: Setting = Setting.positiveTimeSetting( + "opendistro.index_management.index_state_management.coordinator.backoff_millis", + DEPRECATED_COORDINATOR_BACKOFF_MILLIS, + TimeValue.timeValueMillis(0), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val DEPRECATED_COORDINATOR_BACKOFF_COUNT: Setting = Setting.intSetting( + "opendistro.index_state_management.coordinator.backoff_count", + 2, + 0, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val COORDINATOR_BACKOFF_COUNT: Setting = Setting.intSetting( + "opendistro.index_management.index_state_management.coordinator.backoff_count", + DEPRECATED_COORDINATOR_BACKOFF_COUNT, + 0, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + // This setting is deprecated in favor of [IndexManagementSettings.HISTORY_ENABLED] + val DEPRECATED_HISTORY_ENABLED: Setting = Setting.boolSetting( + "opendistro.index_state_management.history.enabled", + true, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + // This setting is deprecated in favor of [IndexManagementSettings.HISTORY_MAX_DOCS] + val DEPRECATED_HISTORY_MAX_DOCS: Setting = Setting.longSetting( + "opendistro.index_state_management.history.max_docs", + 2500000L, // 1 doc is ~10kb or less. This many doc is roughly 25gb + 0L, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + // This setting is deprecated in favor of [IndexManagementSettings.HISTORY_INDEX_MAX_AGE] + val DEPRECATED_HISTORY_INDEX_MAX_AGE: Setting = Setting.positiveTimeSetting( + "opendistro.index_state_management.history.max_age", + TimeValue.timeValueHours(24), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + // This setting is deprecated in favor of [IndexManagementSettings.HISTORY_ROLLOVER_CHECK_PERIOD] + val DEPRECATED_HISTORY_ROLLOVER_CHECK_PERIOD: Setting = Setting.positiveTimeSetting( + "opendistro.index_state_management.history.rollover_check_period", + TimeValue.timeValueHours(8), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + // This setting is deprecated in favor of [IndexManagementSettings.HISTORY_RETENTION_PERIOD] + val DEPRECATED_HISTORY_RETENTION_PERIOD: Setting = Setting.positiveTimeSetting( + "opendistro.index_state_management.history.rollover_retention_period", + TimeValue(30, TimeUnit.DAYS), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val DEPRECATED_ALLOW_LIST: Setting> = Setting.listSetting( + "opendistro.index_state_management.allow_list", + ALLOW_LIST_ALL, + Function.identity(), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val ALLOW_LIST: Setting> = Setting.listSetting( + "opendistro.index_management.index_state_management.allow_list", + DEPRECATED_ALLOW_LIST, + Function.identity(), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + } +} diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/Step.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/Step.kt similarity index 91% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/Step.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/Step.kt index 81ddc9da8..1163cd54d 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/Step.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/Step.kt @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData import org.apache.logging.log4j.Logger import org.elasticsearch.common.io.stream.StreamInput import org.elasticsearch.common.io.stream.StreamOutput diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/allocation/AttemptAllocationStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/allocation/AttemptAllocationStep.kt similarity index 85% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/allocation/AttemptAllocationStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/allocation/AttemptAllocationStep.kt index 770c6b3e0..3be701da1 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/allocation/AttemptAllocationStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/allocation/AttemptAllocationStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.allocation +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.allocation -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.AllocationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.AllocationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest import org.elasticsearch.action.support.master.AcknowledgedResponse diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/close/AttemptCloseStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/close/AttemptCloseStep.kt similarity index 86% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/close/AttemptCloseStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/close/AttemptCloseStep.kt index ebe7bd71d..9bd345d57 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/close/AttemptCloseStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/close/AttemptCloseStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.close +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.close -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.CloseActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.CloseActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.indices.close.CloseIndexRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/delete/AttemptDeleteStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/delete/AttemptDeleteStep.kt similarity index 86% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/delete/AttemptDeleteStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/delete/AttemptDeleteStep.kt index b7bd75a1f..cfdcf1aad 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/delete/AttemptDeleteStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/delete/AttemptDeleteStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.delete +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.delete -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.DeleteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.DeleteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/forcemerge/AttemptCallForceMergeStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptCallForceMergeStep.kt similarity index 86% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/forcemerge/AttemptCallForceMergeStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptCallForceMergeStep.kt index 72544a395..851893d0f 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/forcemerge/AttemptCallForceMergeStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptCallForceMergeStep.kt @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getUsefulCauseString -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionProperties -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getUsefulCauseString +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionProperties +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt similarity index 86% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt index 0777d6fb6..46c8b267a 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/forcemerge/WaitForForceMergeStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/WaitForForceMergeStep.kt similarity index 89% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/forcemerge/WaitForForceMergeStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/WaitForForceMergeStep.kt index 7d12bc400..8a54decf0 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/forcemerge/WaitForForceMergeStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/WaitForForceMergeStep.kt @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getUsefulCauseString -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionProperties -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getUsefulCauseString +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionProperties +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.elasticsearch.client.Client import org.elasticsearch.cluster.service.ClusterService import org.apache.logging.log4j.LogManager diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt similarity index 85% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt index b4ab88943..0b81f4c3f 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/indexpriority/AttemptSetIndexPriorityStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.indexpriority +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.indexpriority -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.IndexPriorityActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.IndexPriorityActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/notification/AttemptNotificationStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/notification/AttemptNotificationStep.kt similarity index 83% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/notification/AttemptNotificationStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/notification/AttemptNotificationStep.kt index 39f8e5c63..526c4a09d 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/notification/AttemptNotificationStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/notification/AttemptNotificationStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.notification +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.notification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.convertToMap -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.NotificationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.convertToMap +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.NotificationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.apache.logging.log4j.LogManager diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/open/AttemptOpenStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/open/AttemptOpenStep.kt similarity index 83% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/open/AttemptOpenStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/open/AttemptOpenStep.kt index 38d378808..de565a9cd 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/open/AttemptOpenStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/open/AttemptOpenStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.open +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.open -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.OpenActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.OpenActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.indices.open.OpenIndexRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/readonly/SetReadOnlyStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/readonly/SetReadOnlyStep.kt similarity index 84% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/readonly/SetReadOnlyStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/readonly/SetReadOnlyStep.kt index a0441ab30..4d44a9f2d 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/readonly/SetReadOnlyStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/readonly/SetReadOnlyStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.readonly +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.readonly -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/readwrite/SetReadWriteStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/readwrite/SetReadWriteStep.kt similarity index 84% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/readwrite/SetReadWriteStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/readwrite/SetReadWriteStep.kt index 4fc64bae6..7fb2a567b 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/readwrite/SetReadWriteStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/readwrite/SetReadWriteStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.readwrite +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.readwrite -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadWriteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadWriteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/replicacount/AttemptSetReplicaCountStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/replicacount/AttemptSetReplicaCountStep.kt similarity index 85% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/replicacount/AttemptSetReplicaCountStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/replicacount/AttemptSetReplicaCountStep.kt index 7420f3fb5..5f06afe32 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/replicacount/AttemptSetReplicaCountStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/replicacount/AttemptSetReplicaCountStep.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.replicacount +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.replicacount -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReplicaCountActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReplicaCountActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/rollover/AttemptRolloverStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/rollover/AttemptRolloverStep.kt similarity index 90% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/rollover/AttemptRolloverStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/rollover/AttemptRolloverStep.kt index a5a38b694..789848f6b 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/rollover/AttemptRolloverStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/rollover/AttemptRolloverStep.kt @@ -13,16 +13,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.rollover - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getRolloverAlias -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getUsefulCauseString -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.RolloverActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.evaluateConditions +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.rollover + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getRolloverAlias +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getUsefulCauseString +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.RolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.evaluateConditions import org.apache.logging.log4j.LogManager import org.elasticsearch.action.admin.indices.rollover.RolloverRequest import org.elasticsearch.action.admin.indices.rollover.RolloverResponse diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/snapshot/AttemptSnapshotStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/snapshot/AttemptSnapshotStep.kt similarity index 87% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/snapshot/AttemptSnapshotStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/snapshot/AttemptSnapshotStep.kt index de5bf615f..64aa7af55 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/snapshot/AttemptSnapshotStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/snapshot/AttemptSnapshotStep.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.snapshot +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.snapshot -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.SnapshotActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionProperties -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.SnapshotActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionProperties +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/snapshot/WaitForSnapshotStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/snapshot/WaitForSnapshotStep.kt similarity index 87% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/snapshot/WaitForSnapshotStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/snapshot/WaitForSnapshotStep.kt index cf2261c4e..55453694b 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/snapshot/WaitForSnapshotStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/snapshot/WaitForSnapshotStep.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.snapshot +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.snapshot -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.SnapshotActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionProperties -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.SnapshotActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionProperties +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotStatus diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/transition/AttemptTransitionStep.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/transition/AttemptTransitionStep.kt similarity index 86% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/transition/AttemptTransitionStep.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/transition/AttemptTransitionStep.kt index f96018533..208b70bc1 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/transition/AttemptTransitionStep.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/transition/AttemptTransitionStep.kt @@ -13,16 +13,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step.transition +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.transition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.getUsefulCauseString -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.suspendUntil -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.TransitionsActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.evaluateConditions -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.hasStatsConditions +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.getUsefulCauseString +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.suspendUntil +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.TransitionsActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.evaluateConditions +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.hasStatsConditions import org.apache.logging.log4j.LogManager import org.elasticsearch.ExceptionsHelper import org.elasticsearch.action.admin.indices.stats.IndicesStatsRequest diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt similarity index 91% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt index 5e1de2563..3b0f7a710 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/transport/action/updateindexmetadata/TransportUpdateManagedIndexMetaDataAction.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.transport.action.updateindexmetadata +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.transport.action.updateindexmetadata -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementHistory -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementHistory +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -58,7 +58,7 @@ class TransportUpdateManagedIndexMetaDataAction : TransportMasterNodeAction ) { clusterService.submitStateUpdateTask( - IndexStateManagementPlugin.PLUGIN_NAME, + IndexManagementPlugin.PLUGIN_NAME, ManagedIndexMetaDataTask(request.indicesToAddManagedIndexMetaDataTo, request.indicesToRemoveManagedIndexMetaDataFrom), ClusterStateTaskConfig.build(Priority.NORMAL), executor, @@ -108,7 +108,7 @@ class TransportUpdateManagedIndexMetaDataAction : TransportMasterNodeAction = Setting.boolSetting( + "opendistro.index_management.history.enabled", + ManagedIndexSettings.DEPRECATED_HISTORY_ENABLED, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val HISTORY_MAX_DOCS: Setting = Setting.longSetting( + "opendistro.index_management.history.max_docs", + 2500000L, // 1 doc is ~10kb or less. This many doc is roughly 25gb + 0L, + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val HISTORY_INDEX_MAX_AGE: Setting = Setting.positiveTimeSetting( + "opendistro.index_management.history.max_age", + ManagedIndexSettings.DEPRECATED_HISTORY_INDEX_MAX_AGE, + TimeValue.timeValueSeconds(1), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val HISTORY_ROLLOVER_CHECK_PERIOD: Setting = Setting.positiveTimeSetting( + "opendistro.index_management.history.rollover_check_period", + ManagedIndexSettings.DEPRECATED_HISTORY_ROLLOVER_CHECK_PERIOD, + TimeValue.timeValueSeconds(1), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + + val HISTORY_RETENTION_PERIOD: Setting = Setting.positiveTimeSetting( + "opendistro.index_management.history.rollover_retention_period", + ManagedIndexSettings.DEPRECATED_HISTORY_RETENTION_PERIOD, + TimeValue.timeValueSeconds(1), + Setting.Property.NodeScope, + Setting.Property.Dynamic + ) + } +} diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/IndexUtils.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/util/IndexUtils.kt similarity index 91% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/IndexUtils.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/util/IndexUtils.kt index c2f1cc1bc..814392a54 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/IndexUtils.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/util/IndexUtils.kt @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.util +package com.amazon.opendistroforelasticsearch.indexmanagement.util -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementIndices -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin import org.apache.logging.log4j.LogManager import org.elasticsearch.action.ActionListener import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest @@ -44,8 +44,8 @@ class IndexUtils { private set init { - indexManagementConfigSchemaVersion = getSchemaVersion(IndexStateManagementIndices.indexStateManagementMappings) - indexManagementHistorySchemaVersion = getSchemaVersion(IndexStateManagementIndices.indexStateManagementHistoryMappings) + indexManagementConfigSchemaVersion = getSchemaVersion(IndexManagementIndices.indexManagementMappings) + indexManagementHistorySchemaVersion = getSchemaVersion(IndexManagementIndices.indexManagementHistoryMappings) } @Suppress("NestedBlockDepth") @@ -96,9 +96,9 @@ class IndexUtils { actionListener: ActionListener ) { checkAndUpdateIndexMapping( - IndexStateManagementPlugin.INDEX_STATE_MANAGEMENT_INDEX, + IndexManagementPlugin.INDEX_MANAGEMENT_INDEX, indexManagementConfigSchemaVersion, - IndexStateManagementIndices.indexStateManagementMappings, + IndexManagementIndices.indexManagementMappings, clusterState, client, actionListener @@ -111,9 +111,9 @@ class IndexUtils { actionListener: ActionListener ) { checkAndUpdateAliasMapping( - IndexStateManagementIndices.HISTORY_WRITE_INDEX_ALIAS, + IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS, indexManagementHistorySchemaVersion, - IndexStateManagementIndices.indexStateManagementHistoryMappings, + IndexManagementIndices.indexManagementHistoryMappings, clusterState, client, actionListener diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/OpenForTesting.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/util/OpenForTesting.kt similarity index 89% rename from src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/OpenForTesting.kt rename to src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/util/OpenForTesting.kt index f0329e896..cc35f6798 100644 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/OpenForTesting.kt +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/util/OpenForTesting.kt @@ -13,6 +13,6 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.util +package com.amazon.opendistroforelasticsearch.indexmanagement.util annotation class OpenForTesting diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/util/RestHandlerUtils.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/util/RestHandlerUtils.kt new file mode 100644 index 000000000..07b004461 --- /dev/null +++ b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/util/RestHandlerUtils.kt @@ -0,0 +1,26 @@ +/* + * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +@file:Suppress("TopLevelPropertyNaming", "MatchingDeclarationName") +package com.amazon.opendistroforelasticsearch.indexmanagement.util + +const val _DOC = "_doc" +const val _ID = "_id" +const val _VERSION = "_version" +const val _SEQ_NO = "_seq_no" +const val IF_SEQ_NO = "if_seq_no" +const val _PRIMARY_TERM = "_primary_term" +const val IF_PRIMARY_TERM = "if_primary_term" +const val REFRESH = "refresh" \ No newline at end of file diff --git a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/settings/ManagedIndexSettings.kt b/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/settings/ManagedIndexSettings.kt deleted file mode 100644 index 347a9d0b5..000000000 --- a/src/main/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/settings/ManagedIndexSettings.kt +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package com.amazon.opendistroforelasticsearch.indexstatemanagement.settings - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import org.elasticsearch.common.settings.Setting -import org.elasticsearch.common.unit.TimeValue -import java.util.concurrent.TimeUnit -import java.util.function.Function - -class ManagedIndexSettings { - companion object { - const val DEFAULT_ISM_ENABLED = true - const val DEFAULT_JOB_INTERVAL = 5 - val ALLOW_LIST_ALL = ActionConfig.ActionType.values().toList().map { it.type } - val ALLOW_LIST_NONE = emptyList() - - val INDEX_STATE_MANAGEMENT_ENABLED = Setting.boolSetting( - "opendistro.index_state_management.enabled", - DEFAULT_ISM_ENABLED, - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val POLICY_ID = Setting.simpleString( - "index.opendistro.index_state_management.policy_id", - Setting.Property.IndexScope, - Setting.Property.Dynamic - ) - - val ROLLOVER_ALIAS = Setting.simpleString( - "index.opendistro.index_state_management.rollover_alias", - Setting.Property.IndexScope, - Setting.Property.Dynamic - ) - - val JOB_INTERVAL = Setting.intSetting( - "opendistro.index_state_management.job_interval", - DEFAULT_JOB_INTERVAL, - 1, - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val SWEEP_PERIOD = Setting.timeSetting( - "opendistro.index_state_management.coordinator.sweep_period", - TimeValue.timeValueMinutes(10), - TimeValue.timeValueMinutes(5), - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val COORDINATOR_BACKOFF_MILLIS = Setting.positiveTimeSetting( - "opendistro.index_state_management.coordinator.backoff_millis", - TimeValue.timeValueMillis(50), - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val COORDINATOR_BACKOFF_COUNT = Setting.intSetting( - "opendistro.index_state_management.coordinator.backoff_count", - 2, - 0, - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val HISTORY_ENABLED = Setting.boolSetting( - "opendistro.index_state_management.history.enabled", - true, - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val HISTORY_MAX_DOCS = Setting.longSetting( - "opendistro.index_state_management.history.max_docs", - 2500000L, // 1 doc is ~10kb or less. This many doc is roughly 25gb - 0L, - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val HISTORY_INDEX_MAX_AGE = Setting.positiveTimeSetting( - "opendistro.index_state_management.history.max_age", - TimeValue.timeValueHours(24), - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val HISTORY_ROLLOVER_CHECK_PERIOD = Setting.positiveTimeSetting( - "opendistro.index_state_management.history.rollover_check_period", - TimeValue.timeValueHours(8), - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val HISTORY_RETENTION_PERIOD = Setting.positiveTimeSetting( - "opendistro.index_state_management.history.rollover_retention_period", - TimeValue(30, TimeUnit.DAYS), - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - - val ALLOW_LIST = Setting.listSetting( - "opendistro.index_state_management.allow_list", - ALLOW_LIST_ALL, - Function.identity(), - Setting.Property.NodeScope, - Setting.Property.Dynamic - ) - } -} diff --git a/src/main/resources/META-INF/services/com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension b/src/main/resources/META-INF/services/com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension index 0936e92ae..ce3d67264 100644 --- a/src/main/resources/META-INF/services/com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension +++ b/src/main/resources/META-INF/services/com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension @@ -1 +1 @@ -com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin +com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/IndexManagementIndicesIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/IndexManagementIndicesIT.kt new file mode 100644 index 000000000..f33723337 --- /dev/null +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/IndexManagementIndicesIT.kt @@ -0,0 +1,210 @@ +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices.Companion.HISTORY_INDEX_BASE +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices.Companion.HISTORY_WRITE_INDEX_ALIAS +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices.Companion.indexManagementHistoryMappings +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices.Companion.indexManagementMappings +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.POLICY_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ChangePolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.RolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestChangePolicyAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.rollover.AttemptRolloverStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILURES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES +import org.apache.http.entity.ContentType +import org.apache.http.entity.StringEntity +import org.elasticsearch.common.settings.Settings +import org.elasticsearch.rest.RestRequest +import org.elasticsearch.test.ESTestCase +import org.junit.Assert +import java.time.Instant +import java.time.temporal.ChronoUnit +import java.util.Locale + +class IndexManagementIndicesIT : IndexStateManagementRestTestCase() { + + private val testIndexName = javaClass.simpleName.toLowerCase(Locale.ROOT) + + /* + * If this test fails it means you changed the config mappings + * This test is to ensure you did not forget to increase the schema_version in the mappings _meta object + * The schema_version is used at runtime to check if the mappings need to be updated for the index + * Once you are sure you increased the schema_version or know it is not needed you can update the cached mappings with the new values + * */ + fun `test config mappings schema version number`() { + val cachedMappings = javaClass.classLoader.getResource("mappings/cached-opendistro-ism-config.json")!!.readText() + assertEquals("I see you updated the config mappings. Did you also update the schema_version?", cachedMappings, indexManagementMappings) + } + + /* + * If this test fails it means you changed the history mappings + * This test is to ensure you did not forget to increase the schema_version in the mappings _meta object + * The schema_version is used at runtime to check if the mappings need to be updated for the index + * Once you are sure you increased the schema_version or know it is not needed you can update the cached mappings with the new values + * */ + fun `test history mappings schema version number`() { + val cachedMappings = javaClass.classLoader.getResource("mappings/cached-opendistro-ism-history.json")!!.readText() + assertEquals("I see you updated the history mappings. Did you also update the schema_version?", cachedMappings, indexManagementHistoryMappings) + } + + fun `test create index management`() { + val policy = randomPolicy() + val policyId = ESTestCase.randomAlphaOfLength(10) + client().makeRequest("PUT", "$POLICY_BASE_URI/$policyId", emptyMap(), policy.toHttpEntity()) + assertIndexExists(INDEX_MANAGEMENT_INDEX) + verifyIndexSchemaVersion(INDEX_MANAGEMENT_INDEX, 4) + } + + fun `test update management index mapping with new schema version`() { + assertIndexDoesNotExist(INDEX_MANAGEMENT_INDEX) + + val mapping = indexManagementMappings.trim().trimStart('{').trimEnd('}') + .replace("\"schema_version\": 4", "\"schema_version\": 0") + + createIndex(INDEX_MANAGEMENT_INDEX, Settings.builder().put("index.hidden", true).build(), mapping) + assertIndexExists(INDEX_MANAGEMENT_INDEX) + verifyIndexSchemaVersion(INDEX_MANAGEMENT_INDEX, 0) + + val policy = randomPolicy() + val policyId = ESTestCase.randomAlphaOfLength(10) + client().makeRequest("PUT", "$POLICY_BASE_URI/$policyId", emptyMap(), policy.toHttpEntity()) + + assertIndexExists(INDEX_MANAGEMENT_INDEX) + verifyIndexSchemaVersion(INDEX_MANAGEMENT_INDEX, 4) + } + + fun `test update management index history mappings with new schema version`() { + assertIndexDoesNotExist("$HISTORY_WRITE_INDEX_ALIAS?allow_no_indices=false") + + val mapping = indexManagementHistoryMappings.trim().trimStart('{').trimEnd('}') + .replace("\"schema_version\": 2", "\"schema_version\": 0") + + val aliases = "\"$HISTORY_WRITE_INDEX_ALIAS\": { \"is_write_index\": true }" + createIndex("$HISTORY_INDEX_BASE-1", Settings.builder().put("index.hidden", true).build(), mapping, aliases) + assertIndexExists(HISTORY_WRITE_INDEX_ALIAS) + verifyIndexSchemaVersion(HISTORY_WRITE_INDEX_ALIAS, 0) + + val policy = createRandomPolicy() + val (index, policyID) = createIndex("history-schema", policy.id) + + val managedIndexConfig = getExistingManagedIndexConfig(index) + + // Change the start time so the job will trigger in 2 seconds. + updateManagedIndexConfigStartTime(managedIndexConfig) + + // wait for the policy to initialize which will add 1 history document to the history index + // this should update the history mappings to the new version + waitFor { assertEquals(policyID, getExplainManagedIndexMetaData(index).policyID) } + + waitFor { + assertIndexExists(HISTORY_WRITE_INDEX_ALIAS) + verifyIndexSchemaVersion(HISTORY_WRITE_INDEX_ALIAS, 2) + } + } + + fun `test changing policy on an index that hasn't initialized yet check schema version`() { + val policy = createRandomPolicy() + val newPolicy = createPolicy(randomPolicy(), "new_policy", true) + val indexName = "${testIndexName}_computer" + val (index) = createIndex(indexName, policy.id) + + val managedIndexConfig = getExistingManagedIndexConfig(index) + assertNull("Change policy is not null", managedIndexConfig.changePolicy) + assertNull("Policy has already initialized", managedIndexConfig.policy) + assertEquals("Policy id does not match", policy.id, managedIndexConfig.policyID) + + val mapping = "{" + indexManagementMappings.trimStart('{').trimEnd('}') + .replace("\"schema_version\": 4", "\"schema_version\": 0") + + val entity = StringEntity(mapping, ContentType.APPLICATION_JSON) + client().makeRequest(RestRequest.Method.PUT.toString(), + "/$INDEX_MANAGEMENT_INDEX/_mapping", emptyMap(), entity) + + verifyIndexSchemaVersion(INDEX_MANAGEMENT_INDEX, 0) + + // if we try to change policy now, it'll have no ManagedIndexMetaData yet and should succeed + val changePolicy = ChangePolicy(newPolicy.id, null, emptyList(), false) + val response = client().makeRequest( + RestRequest.Method.POST.toString(), + "${RestChangePolicyAction.CHANGE_POLICY_BASE_URI}/$index", emptyMap(), changePolicy.toHttpEntity()) + + verifyIndexSchemaVersion(INDEX_MANAGEMENT_INDEX, 4) + + assertAffectedIndicesResponseIsEqual(mapOf(FAILURES to false, FAILED_INDICES to emptyList(), UPDATED_INDICES to 1), response.asMap()) + + waitFor { assertEquals(newPolicy.id, getManagedIndexConfig(index)?.changePolicy?.policyID) } + } + + fun `test legacy policy ID creates config job`() { + val indexName = "legacy_settings_test" + val policy = createRandomPolicy() + createIndex(indexName, Settings.builder().put(ManagedIndexSettings.DEPRECATED_POLICY_ID.key, policy.id).build()) + + val managedIndexConfig = getExistingManagedIndexConfig(indexName) + assertEquals("Policy id does not match", policy.id, managedIndexConfig.policyID) + } + + fun `test removing policy correctly removes legacy policy ID`() { + val indexName = "legacy_settings_remove_test" + val policy = createRandomPolicy() + createIndex(indexName, Settings.builder().put(ManagedIndexSettings.DEPRECATED_POLICY_ID.key, policy.id).build()) + + val managedIndexConfig = getExistingManagedIndexConfig(indexName) + assertEquals("Policy id does not match", policy.id, managedIndexConfig.policyID) + + assertEquals("Setting doesn't have correct value", + getFlatSettings(indexName)[ManagedIndexSettings.DEPRECATED_POLICY_ID.key], policy.id) + + removePolicy(indexName) + waitFor { + val config = getManagedIndexConfig(indexName) + assertNull("ManagedIndexConfig was not removed", config) + } + + assertNull(getFlatSettings(indexName)[ManagedIndexSettings.DEPRECATED_POLICY_ID.key]) + } + + fun `test legacy rollover alias rolls over index`() { + val indexNameBase = "legacy_settings_rollover_test" + val firstIndex = "$indexNameBase-1" + val rolloverAlias = "some_rollover_alias" + val actionConfig = RolloverActionConfig(null, null, null, 0) + val states = listOf(State(name = "RolloverAction", actions = listOf(actionConfig), transitions = listOf())) + val policy = Policy( + id = "some_id", + description = "$testIndexName description", + schemaVersion = 1L, + lastUpdatedTime = Instant.now().truncatedTo(ChronoUnit.MILLIS), + errorNotification = randomErrorNotification(), + defaultState = states[0].name, + states = states + ) + + createPolicy(policy, policy.id) + createIndex(firstIndex, Settings.builder() + .put(ManagedIndexSettings.DEPRECATED_POLICY_ID.key, policy.id) + .put(ManagedIndexSettings.DEPRECATED_ROLLOVER_ALIAS.key, rolloverAlias) + .build(), null, "\"$rolloverAlias\":{}") + + val managedIndexConfig = getExistingManagedIndexConfig(firstIndex) + + // Change the start time so the job will trigger in 2 seconds, this will trigger the first initialization of the policy + updateManagedIndexConfigStartTime(managedIndexConfig) + waitFor { assertEquals(policy.id, getExplainManagedIndexMetaData(firstIndex).policyID) } + + // Need to speed up to second execution where it will trigger the first execution of the action + updateManagedIndexConfigStartTime(managedIndexConfig) + waitFor { + val info = getExplainManagedIndexMetaData(firstIndex).info as Map + assertEquals("Index did not rollover.", AttemptRolloverStep.getSuccessMessage(firstIndex), info["message"]) + assertNull("Should not have conditions if none specified", info["conditions"]) + } + + Assert.assertTrue("New rollover index does not exist.", indexExists("$indexNameBase-000002")) + } +} \ No newline at end of file diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementRestTestCase.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/IndexStateManagementRestTestCase.kt similarity index 90% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementRestTestCase.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/IndexStateManagementRestTestCase.kt index 6386443b9..f630457be 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementRestTestCase.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/IndexStateManagementRestTestCase.kt @@ -13,28 +13,30 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_HISTORY_TYPE -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.POLICY_BASE_URI -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ChangePolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy.Companion.POLICY_TYPE -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.StateFilter -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StateMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestExplainAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILURES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._ID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._PRIMARY_TERM -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._SEQ_NO +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_HISTORY_TYPE +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.POLICY_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.ISM_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ChangePolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy.Companion.POLICY_TYPE +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.StateFilter +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StateMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestExplainAction +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILURES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.util._ID +import com.amazon.opendistroforelasticsearch.indexmanagement.util._PRIMARY_TERM +import com.amazon.opendistroforelasticsearch.indexmanagement.util._SEQ_NO import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.IntervalSchedule import org.apache.http.HttpEntity import org.apache.http.HttpHeaders @@ -56,7 +58,6 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry import org.elasticsearch.common.xcontent.XContentParser.Token import org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken import org.elasticsearch.common.xcontent.XContentType -import org.elasticsearch.common.xcontent.json.JsonXContent import org.elasticsearch.common.xcontent.json.JsonXContent.jsonXContent import org.elasticsearch.index.seqno.SequenceNumbers import org.elasticsearch.rest.RestRequest @@ -91,7 +92,7 @@ abstract class IndexStateManagementRestTestCase : ESRestTestCase() { ): Policy { val response = createPolicyJson(policy.toJsonString(), policyId, refresh) - val policyJson = JsonXContent.jsonXContent + val policyJson = jsonXContent .createParser( NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, @@ -156,6 +157,13 @@ abstract class IndexStateManagementRestTestCase : ESRestTestCase() { return policy.copy(id = id, seqNo = seqNo, primaryTerm = primaryTerm) } + protected fun removePolicy(index: String): Response { + val response = client() + .makeRequest("POST", "$ISM_BASE_URI/remove/$index") + assertEquals("Request failed", RestStatus.OK, response.restStatus()) + return response + } + protected fun createIndex( index: String = randomAlphaOfLength(10).toLowerCase(Locale.ROOT), policyID: String? = randomAlphaOfLength(10), @@ -253,7 +261,7 @@ abstract class IndexStateManagementRestTestCase : ESRestTestCase() { } } """.trimIndent() - val response = client().makeRequest("POST", "$INDEX_STATE_MANAGEMENT_INDEX/_search", emptyMap(), + val response = client().makeRequest("POST", "$INDEX_MANAGEMENT_INDEX/_search", emptyMap(), StringEntity(request, APPLICATION_JSON)) assertEquals("Request failed", RestStatus.OK, response.restStatus()) val searchResponse = SearchResponse.fromXContent(createParser(jsonXContent, response.entity.content)) @@ -266,7 +274,7 @@ abstract class IndexStateManagementRestTestCase : ESRestTestCase() { } protected fun getManagedIndexConfigByDocId(id: String): ManagedIndexConfig? { - val response = client().makeRequest("GET", "$INDEX_STATE_MANAGEMENT_INDEX/_doc/$id") + val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$id") assertEquals("Request failed", RestStatus.OK, response.restStatus()) val getResponse = GetResponse.fromXContent(createParser(jsonXContent, response.entity.content)) assertTrue("Did not find managed index config", getResponse.isExists) @@ -291,7 +299,7 @@ abstract class IndexStateManagementRestTestCase : ESRestTestCase() { } } """.trimIndent() - val response = client().makeRequest("POST", "${IndexStateManagementIndices.HISTORY_ALL}/_search", emptyMap(), + val response = client().makeRequest("POST", "${IndexManagementIndices.HISTORY_ALL}/_search", emptyMap(), StringEntity(request, APPLICATION_JSON)) assertEquals("Request failed", RestStatus.OK, response.restStatus()) return SearchResponse.fromXContent(createParser(jsonXContent, response.entity.content)) @@ -319,7 +327,7 @@ abstract class IndexStateManagementRestTestCase : ESRestTestCase() { val millis = Duration.of(intervalSchedule.interval.toLong(), intervalSchedule.unit).minusSeconds(2).toMillis() val startTimeMillis = desiredStartTimeMillis ?: Instant.now().toEpochMilli() - millis val waitForActiveShards = if (isMultiNode) "all" else "1" - val response = client().makeRequest("POST", "$INDEX_STATE_MANAGEMENT_INDEX/_update/${update.id}?wait_for_active_shards=$waitForActiveShards", + val response = client().makeRequest("POST", "$INDEX_MANAGEMENT_INDEX/_update/${update.id}?wait_for_active_shards=$waitForActiveShards", StringEntity( "{\"doc\":{\"managed_index\":{\"schedule\":{\"interval\":{\"start_time\":" + "\"$startTimeMillis\"}}}}}", @@ -330,7 +338,7 @@ abstract class IndexStateManagementRestTestCase : ESRestTestCase() { } protected fun updateManagedIndexConfigPolicySeqNo(update: ManagedIndexConfig) { - val response = client().makeRequest("POST", "$INDEX_STATE_MANAGEMENT_INDEX/_update/${update.id}", + val response = client().makeRequest("POST", "$INDEX_MANAGEMENT_INDEX/_update/${update.id}", StringEntity( "{\"doc\":{\"managed_index\":{\"policy_seq_no\":\"${update.policySeqNo}\"}}}", APPLICATION_JSON diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/ManagedIndexConfigTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexConfigTests.kt similarity index 97% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/ManagedIndexConfigTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexConfigTests.kt index 10def70c3..0b868ec82 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/ManagedIndexConfigTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/ManagedIndexConfigTests.kt @@ -13,9 +13,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig import org.elasticsearch.common.xcontent.LoggingDeprecationHandler import org.elasticsearch.common.xcontent.XContentParser import org.elasticsearch.common.xcontent.XContentType diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/TestHelpers.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/TestHelpers.kt similarity index 82% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/TestHelpers.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/TestHelpers.kt index 921d64197..dd437c535 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/TestHelpers.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/TestHelpers.kt @@ -13,36 +13,36 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.elasticapi.string -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ChangePolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Conditions -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.StateFilter -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Transition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.AllocationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.DeleteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.NotificationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadWriteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReplicaCountActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.IndexPriorityActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.RolloverActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.SnapshotActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.coordinator.ClusterStateManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.coordinator.SweptManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.Chime -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.CustomWebhook -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.Destination -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.DestinationType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.Slack +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.elasticapi.string +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ChangePolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Conditions +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.StateFilter +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Transition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.AllocationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.DeleteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.NotificationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadWriteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReplicaCountActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.IndexPriorityActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.RolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.SnapshotActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.coordinator.ClusterStateManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.coordinator.SweptManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.Chime +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.CustomWebhook +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.Destination +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.DestinationType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.Slack import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.CronSchedule import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.IntervalSchedule import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.Schedule @@ -227,9 +227,9 @@ fun randomSize(size: ByteSizeValue = randomByteSizeValue()) = Conditions.MIN_SIZ fun randomCronSchedule(cron: CronSchedule = CronSchedule("0 * * * *", ZoneId.of("UTC"))) = Conditions.CRON_FIELD to cron -fun randomTimeValueObject() = TimeValue.parseTimeValue(ESRestTestCase.randomPositiveTimeValue(), "") +fun randomTimeValueObject(): TimeValue = TimeValue.parseTimeValue(ESRestTestCase.randomPositiveTimeValue(), "") -fun randomByteSizeValue() = +fun randomByteSizeValue(): ByteSizeValue = ByteSizeValue.parseBytesSizeValue( ESRestTestCase.randomIntBetween(1, 1000).toString() + ESRestTestCase.randomFrom(listOf("b", "kb", "mb", "gb")), "" diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ActionRetryIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ActionRetryIT.kt similarity index 88% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ActionRetryIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ActionRetryIT.kt index 4420faf93..b58b7ab27 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ActionRetryIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ActionRetryIT.kt @@ -13,16 +13,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StateMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.rollover.AttemptRolloverStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StateMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.rollover.AttemptRolloverStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import java.time.Instant import java.util.Locale diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ActionTimeoutIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ActionTimeoutIT.kt similarity index 86% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ActionTimeoutIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ActionTimeoutIT.kt index 24b10d35b..50ddaf661 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ActionTimeoutIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ActionTimeoutIT.kt @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.open.AttemptOpenStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.rollover.AttemptRolloverStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.open.AttemptOpenStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.rollover.AttemptRolloverStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.hamcrest.collection.IsMapContaining import java.time.Instant import java.util.Locale diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/AllocationActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/AllocationActionIT.kt similarity index 92% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/AllocationActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/AllocationActionIT.kt index ce3a97623..62f4a5504 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/AllocationActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/AllocationActionIT.kt @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.AllocationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.allocation.AttemptAllocationStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.AllocationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.allocation.AttemptAllocationStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.junit.Assume import java.time.Instant import java.time.temporal.ChronoUnit diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/CloseActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/CloseActionIT.kt similarity index 87% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/CloseActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/CloseActionIT.kt index 6399c1421..4f38ceb0d 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/CloseActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/CloseActionIT.kt @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Transition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.CloseActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Transition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.CloseActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import java.time.Instant import java.time.temporal.ChronoUnit import java.util.Locale diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ForceMergeActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ForceMergeActionIT.kt similarity index 86% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ForceMergeActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ForceMergeActionIT.kt index 43ef6df6a..340b6cce9 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ForceMergeActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ForceMergeActionIT.kt @@ -13,17 +13,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge.AttemptCallForceMergeStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge.AttemptSetReadOnlyStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge.WaitForForceMergeStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge.AttemptCallForceMergeStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge.AttemptSetReadOnlyStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge.WaitForForceMergeStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.elasticsearch.cluster.metadata.IndexMetadata import org.elasticsearch.common.settings.Settings import java.time.Instant diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/IndexStateManagementHistoryIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/IndexManagementHistoryIT.kt similarity index 82% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/IndexStateManagementHistoryIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/IndexManagementHistoryIT.kt index 3b28dda8a..ced8e7e06 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/IndexStateManagementHistoryIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/IndexManagementHistoryIT.kt @@ -13,28 +13,28 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementIndices -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StateMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.readonly.SetReadOnlyStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StateMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.readonly.SetReadOnlyStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor +import com.amazon.opendistroforelasticsearch.indexmanagement.settings.IndexManagementSettings import org.elasticsearch.action.search.SearchResponse import java.time.Instant import java.time.temporal.ChronoUnit import java.util.Locale -class IndexStateManagementHistoryIT : IndexStateManagementRestTestCase() { +class IndexManagementHistoryIT : IndexStateManagementRestTestCase() { private val testIndexName = javaClass.simpleName.toLowerCase(Locale.ROOT) @@ -122,9 +122,9 @@ class IndexStateManagementHistoryIT : IndexStateManagementRestTestCase() { createIndex(indexName, policyID) restAdminSettings() - updateClusterSetting(ManagedIndexSettings.HISTORY_ENABLED.key, "true") - updateClusterSetting(ManagedIndexSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "5s") - updateClusterSetting(ManagedIndexSettings.HISTORY_RETENTION_PERIOD.key, "5s") + updateClusterSetting(IndexManagementSettings.HISTORY_ENABLED.key, "true") + updateClusterSetting(IndexManagementSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "5s") + updateClusterSetting(IndexManagementSettings.HISTORY_RETENTION_PERIOD.key, "5s") val managedIndexConfig = getExistingManagedIndexConfig(indexName) @@ -188,9 +188,9 @@ class IndexStateManagementHistoryIT : IndexStateManagementRestTestCase() { createIndex(indexName, policyID) restAdminSettings() - updateClusterSetting(ManagedIndexSettings.HISTORY_ENABLED.key, "true") - updateClusterSetting(ManagedIndexSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "5s") - updateClusterSetting(ManagedIndexSettings.HISTORY_MAX_DOCS.key, "1") + updateClusterSetting(IndexManagementSettings.HISTORY_ENABLED.key, "true") + updateClusterSetting(IndexManagementSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "5s") + updateClusterSetting(IndexManagementSettings.HISTORY_MAX_DOCS.key, "1") val managedIndexConfig = getExistingManagedIndexConfig(indexName) @@ -256,7 +256,7 @@ class IndexStateManagementHistoryIT : IndexStateManagementRestTestCase() { restAdminSettings() resetHistorySetting() - updateClusterSetting(ManagedIndexSettings.HISTORY_ENABLED.key, "true") + updateClusterSetting(IndexManagementSettings.HISTORY_ENABLED.key, "true") val managedIndexConfig = getExistingManagedIndexConfig(indexName) @@ -319,9 +319,9 @@ class IndexStateManagementHistoryIT : IndexStateManagementRestTestCase() { assertEquals(expectedHistory1, actualHistory1) - updateClusterSetting(ManagedIndexSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "2s") - updateClusterSetting(ManagedIndexSettings.HISTORY_MAX_DOCS.key, "1") - updateClusterSetting(ManagedIndexSettings.HISTORY_RETENTION_PERIOD.key, "1s") + updateClusterSetting(IndexManagementSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "2s") + updateClusterSetting(IndexManagementSettings.HISTORY_MAX_DOCS.key, "1") + updateClusterSetting(IndexManagementSettings.HISTORY_RETENTION_PERIOD.key, "1s") // After updating settings, ensure all the histories are deleted. waitFor { @@ -387,21 +387,21 @@ class IndexStateManagementHistoryIT : IndexStateManagementRestTestCase() { assertEquals(expectedHistory, actualHistory) - updateClusterSetting(ManagedIndexSettings.HISTORY_ENABLED.key, "false") - updateClusterSetting(ManagedIndexSettings.HISTORY_RETENTION_PERIOD.key, "1s") - updateClusterSetting(ManagedIndexSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "2s") + updateClusterSetting(IndexManagementSettings.HISTORY_ENABLED.key, "false") + updateClusterSetting(IndexManagementSettings.HISTORY_RETENTION_PERIOD.key, "1s") + updateClusterSetting(IndexManagementSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "2s") // Need to wait two cycles. // Change the start time so the job will trigger in 2 seconds. updateManagedIndexConfigStartTime(managedIndexConfig) - waitFor { assertFalse("History index does exist.", aliasExists(IndexStateManagementIndices.HISTORY_WRITE_INDEX_ALIAS)) } + waitFor { assertFalse("History index does exist.", aliasExists(IndexManagementIndices.HISTORY_WRITE_INDEX_ALIAS)) } waitFor { assertEquals("true", getIndexBlocksWriteSetting(indexName)) } } private fun resetHistorySetting() { - updateClusterSetting(ManagedIndexSettings.HISTORY_ENABLED.key, "true") - updateClusterSetting(ManagedIndexSettings.HISTORY_RETENTION_PERIOD.key, "60s") - updateClusterSetting(ManagedIndexSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "60s") + updateClusterSetting(IndexManagementSettings.HISTORY_ENABLED.key, "true") + updateClusterSetting(IndexManagementSettings.HISTORY_RETENTION_PERIOD.key, "60s") + updateClusterSetting(IndexManagementSettings.HISTORY_ROLLOVER_CHECK_PERIOD.key, "60s") } } diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/IndexPriorityActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/IndexPriorityActionIT.kt similarity index 75% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/IndexPriorityActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/IndexPriorityActionIT.kt index b4d51a393..17c627279 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/IndexPriorityActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/IndexPriorityActionIT.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.IndexPriorityActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.IndexPriorityActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import java.time.Instant import java.time.temporal.ChronoUnit import java.util.Locale diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/NotificationActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/NotificationActionIT.kt similarity index 77% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/NotificationActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/NotificationActionIT.kt index b9fc8e4c6..467bbc6ad 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/NotificationActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/NotificationActionIT.kt @@ -13,17 +13,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.NotificationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.CustomWebhook -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.Destination -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.DestinationType -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.NotificationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.CustomWebhook +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.Destination +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.DestinationType +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.elasticsearch.script.Script import org.elasticsearch.script.ScriptType import java.time.Instant diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/OpenActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/OpenActionIT.kt similarity index 83% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/OpenActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/OpenActionIT.kt index 7b70d25c1..124602ecd 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/OpenActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/OpenActionIT.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.OpenActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.OpenActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import java.time.Instant import java.time.temporal.ChronoUnit import java.util.Locale diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadOnlyActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadOnlyActionIT.kt similarity index 75% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadOnlyActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadOnlyActionIT.kt index fb2aa49b7..9e7f29a30 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadOnlyActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadOnlyActionIT.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import java.time.Instant import java.time.temporal.ChronoUnit import java.util.Locale diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadWriteActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadWriteActionIT.kt similarity index 77% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadWriteActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadWriteActionIT.kt index b4ab3fc19..5b4a6dc11 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReadWriteActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReadWriteActionIT.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadWriteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadWriteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.elasticsearch.common.settings.Settings import java.time.Instant import java.time.temporal.ChronoUnit diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReplicaCountActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReplicaCountActionIT.kt similarity index 78% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReplicaCountActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReplicaCountActionIT.kt index 586b0a3fd..9c6591d2e 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/ReplicaCountActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/ReplicaCountActionIT.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReplicaCountActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReplicaCountActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import java.time.Instant import java.time.temporal.ChronoUnit import java.util.Locale diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/RolloverActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/RolloverActionIT.kt similarity index 93% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/RolloverActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/RolloverActionIT.kt index 3f4d11969..8cff19964 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/RolloverActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/RolloverActionIT.kt @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.RolloverActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.rollover.AttemptRolloverStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.RolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.rollover.AttemptRolloverStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.elasticsearch.common.unit.ByteSizeUnit import org.elasticsearch.common.unit.ByteSizeValue import org.elasticsearch.common.unit.TimeValue diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/SnapshotActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/SnapshotActionIT.kt similarity index 88% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/SnapshotActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/SnapshotActionIT.kt index b771cc1d6..4eba8c007 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/SnapshotActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/SnapshotActionIT.kt @@ -13,16 +13,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.SnapshotActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.snapshot.AttemptSnapshotStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.snapshot.WaitForSnapshotStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.SnapshotActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.snapshot.AttemptSnapshotStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.snapshot.WaitForSnapshotStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import java.time.Instant import java.time.temporal.ChronoUnit import java.util.Locale diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/TransitionActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/TransitionActionIT.kt similarity index 69% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/TransitionActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/TransitionActionIT.kt index e6a35d5b6..7b6c8b38e 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/action/TransitionActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/action/TransitionActionIT.kt @@ -1,13 +1,13 @@ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.action - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Conditions -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Transition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.transition.AttemptTransitionStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.action + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Conditions +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Transition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.transition.AttemptTransitionStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import java.time.Instant import java.time.temporal.ChronoUnit import java.util.Locale diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/coordinator/ManagedIndexCoordinatorIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/coordinator/ManagedIndexCoordinatorIT.kt similarity index 87% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/coordinator/ManagedIndexCoordinatorIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/coordinator/ManagedIndexCoordinatorIT.kt index 42846e596..4e69f932e 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/coordinator/ManagedIndexCoordinatorIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/coordinator/ManagedIndexCoordinatorIT.kt @@ -13,24 +13,24 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.coordinator - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.makeRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Transition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.DeleteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.RolloverActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.forcemerge.WaitForForceMergeStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.rollover.AttemptRolloverStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.coordinator + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.makeRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Transition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.DeleteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.RolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.forcemerge.WaitForForceMergeStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.rollover.AttemptRolloverStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.elasticsearch.common.settings.Settings import org.elasticsearch.common.xcontent.XContentType import java.time.Instant @@ -55,10 +55,10 @@ class ManagedIndexCoordinatorIT : IndexStateManagementRestTestCase() { fun `test creating index with valid policy_id creates ism index with correct mappings`() { createIndex() waitFor { - val response = client().makeRequest("GET", "/$INDEX_STATE_MANAGEMENT_INDEX/_mapping") + val response = client().makeRequest("GET", "/$INDEX_MANAGEMENT_INDEX/_mapping") val parserMap = createParser(XContentType.JSON.xContent(), response.entity.content).map() as Map>> - val mappingsMap = parserMap[INDEX_STATE_MANAGEMENT_INDEX]?.getValue("mappings")!! + val mappingsMap = parserMap[INDEX_MANAGEMENT_INDEX]?.getValue("mappings")!! val expected = createParser( XContentType.JSON.xContent(), @@ -79,7 +79,7 @@ class ManagedIndexCoordinatorIT : IndexStateManagementRestTestCase() { createIndex(indexThree, Settings.builder().putNull(ManagedIndexSettings.POLICY_ID.key).build()) waitFor { - assertFalse("ISM index created for invalid policies", indexExists(INDEX_STATE_MANAGEMENT_INDEX)) + assertFalse("ISM index created for invalid policies", indexExists(INDEX_MANAGEMENT_INDEX)) } } diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/coordinator/ManagedIndexCoordinatorTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/coordinator/ManagedIndexCoordinatorTests.kt similarity index 92% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/coordinator/ManagedIndexCoordinatorTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/coordinator/ManagedIndexCoordinatorTests.kt index a29d1f88e..0de963e26 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/coordinator/ManagedIndexCoordinatorTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/coordinator/ManagedIndexCoordinatorTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.coordinator +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.coordinator -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementIndices -import com.amazon.opendistroforelasticsearch.indexstatemanagement.ManagedIndexCoordinator -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementIndices +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.ManagedIndexCoordinator +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings import org.elasticsearch.Version import org.elasticsearch.client.Client import org.elasticsearch.cluster.ClusterName @@ -47,7 +47,7 @@ class ManagedIndexCoordinatorTests : ESAllocationTestCase() { private lateinit var threadPool: ThreadPool private lateinit var settings: Settings - private lateinit var indexStateManagementIndices: IndexStateManagementIndices + private lateinit var indexManagementIndices: IndexManagementIndices private lateinit var coordinator: ManagedIndexCoordinator private lateinit var discoveryNode: DiscoveryNode @@ -57,7 +57,7 @@ class ManagedIndexCoordinatorTests : ESAllocationTestCase() { fun setup() { client = Mockito.mock(Client::class.java) threadPool = Mockito.mock(ThreadPool::class.java) - indexStateManagementIndices = Mockito.mock(IndexStateManagementIndices::class.java) + indexManagementIndices = Mockito.mock(IndexManagementIndices::class.java) val namedXContentRegistryEntries = arrayListOf() xContentRegistry = NamedXContentRegistry(namedXContentRegistryEntries) @@ -78,7 +78,7 @@ class ManagedIndexCoordinatorTests : ESAllocationTestCase() { val originClusterService: ClusterService = ClusterServiceUtils.createClusterService(threadPool, discoveryNode, clusterSettings) clusterService = Mockito.spy(originClusterService) - coordinator = ManagedIndexCoordinator(settings, client, clusterService, threadPool, indexStateManagementIndices) + coordinator = ManagedIndexCoordinator(settings, client, clusterService, threadPool, indexManagementIndices) } fun `test after start`() { diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ActionConfigTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ActionConfigTests.kt similarity index 79% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ActionConfigTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ActionConfigTests.kt index acb3a5c17..9a4a3ea70 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ActionConfigTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ActionConfigTests.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionRetry -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionTimeout -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomAllocationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomRolloverActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomSnapshotActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionRetry +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionTimeout +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomAllocationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomRolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomSnapshotActionConfig import org.elasticsearch.common.unit.ByteSizeValue import org.elasticsearch.common.unit.TimeValue import org.elasticsearch.test.ESTestCase diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ActionPropertiesTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ActionPropertiesTests.kt similarity index 86% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ActionPropertiesTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ActionPropertiesTests.kt index 72b3ef05d..d6816abcc 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ActionPropertiesTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ActionPropertiesTests.kt @@ -1,6 +1,6 @@ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionProperties +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionProperties import org.elasticsearch.common.xcontent.XContentType import org.elasticsearch.test.ESTestCase diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ConditionsTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ConditionsTests.kt similarity index 84% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ConditionsTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ConditionsTests.kt index c72aca002..0de070cfd 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ConditionsTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ConditionsTests.kt @@ -13,10 +13,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomByteSizeValue -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomTimeValueObject +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomByteSizeValue +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomTimeValueObject import org.elasticsearch.common.unit.ByteSizeValue import org.elasticsearch.test.ESTestCase import kotlin.test.assertFailsWith diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/DestinationTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/DestinationTests.kt similarity index 88% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/DestinationTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/DestinationTests.kt index 89f1af3f2..62e54248c 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/DestinationTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/DestinationTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.Chime -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.CustomWebhook -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.Slack +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.Chime +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.CustomWebhook +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.Slack import org.elasticsearch.test.ESTestCase /** diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ManagedIndexMetaDataTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ManagedIndexMetaDataTests.kt similarity index 85% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ManagedIndexMetaDataTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ManagedIndexMetaDataTests.kt index b5ef1c85a..dca40c7d2 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/ManagedIndexMetaDataTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/ManagedIndexMetaDataTests.kt @@ -13,14 +13,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionProperties -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StateMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StepMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.Step +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionProperties +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StateMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StepMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.Step import org.elasticsearch.common.io.stream.InputStreamStreamInput import org.elasticsearch.common.io.stream.OutputStreamStreamOutput import org.elasticsearch.test.ESTestCase diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/PolicyTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/PolicyTests.kt similarity index 83% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/PolicyTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/PolicyTests.kt index 2e8651b93..4e9c56450 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/PolicyTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/PolicyTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomPolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomState -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomTransition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomPolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomState +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomTransition import org.elasticsearch.test.ESTestCase import kotlin.test.assertFailsWith diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/StateTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/StateTests.kt similarity index 77% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/StateTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/StateTests.kt index 7b9d2e19c..12bc96bad 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/StateTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/StateTests.kt @@ -13,12 +13,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomDeleteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomReplicaCountActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomState -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomTransition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomDeleteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomReplicaCountActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomState +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomTransition import org.elasticsearch.test.ESTestCase import kotlin.test.assertFailsWith diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/XContentTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/XContentTests.kt similarity index 83% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/XContentTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/XContentTests.kt index 8cd671d87..fe158cdc7 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/model/XContentTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/model/XContentTests.kt @@ -13,28 +13,28 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.model - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.nonNullRandomConditions -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomAllocationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomChangePolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomDeleteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomDestination -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomNotificationActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomPolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomReadWriteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomReplicaCountActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomIndexPriorityActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomRolloverActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomSnapshotActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomState -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomTransition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.toJsonString -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.destination.DestinationType +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.nonNullRandomConditions +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomAllocationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomChangePolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomDeleteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomDestination +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomNotificationActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomPolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomReadWriteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomReplicaCountActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomIndexPriorityActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomRolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomSnapshotActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomState +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomTransition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.toJsonString +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.destination.DestinationType import org.elasticsearch.common.xcontent.LoggingDeprecationHandler import org.elasticsearch.common.xcontent.XContentParser import org.elasticsearch.common.xcontent.XContentType diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt similarity index 87% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt index 6ad05f6d8..7243b84ee 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt @@ -13,21 +13,21 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.POLICY_BASE_URI -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.makeRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomPolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomState -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._ID -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._PRIMARY_TERM -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util._SEQ_NO +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.POLICY_BASE_URI +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.makeRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomPolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomState +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.util._ID +import com.amazon.opendistroforelasticsearch.indexmanagement.util._PRIMARY_TERM +import com.amazon.opendistroforelasticsearch.indexmanagement.util._SEQ_NO import org.apache.http.entity.ContentType.APPLICATION_JSON import org.apache.http.entity.StringEntity import org.elasticsearch.action.search.SearchResponse @@ -149,9 +149,9 @@ class IndexStateManagementRestApiIT : IndexStateManagementRestTestCase() { fun `test mappings after policy creation`() { createRandomPolicy() - val response = client().makeRequest("GET", "/$INDEX_STATE_MANAGEMENT_INDEX/_mapping") + val response = client().makeRequest("GET", "/$INDEX_MANAGEMENT_INDEX/_mapping") val parserMap = createParser(XContentType.JSON.xContent(), response.entity.content).map() as Map> - val mappingsMap = parserMap[INDEX_STATE_MANAGEMENT_INDEX]!!["mappings"] as Map + val mappingsMap = parserMap[INDEX_MANAGEMENT_INDEX]!!["mappings"] as Map val expected = createParser( XContentType.JSON.xContent(), javaClass.classLoader.getResource("mappings/opendistro-ism-config.json").readText()) @@ -260,7 +260,7 @@ class IndexStateManagementRestApiIT : IndexStateManagementRestTestCase() { } } """.trimIndent() - val response = client().makeRequest("POST", "$INDEX_STATE_MANAGEMENT_INDEX/_search", emptyMap(), + val response = client().makeRequest("POST", "$INDEX_MANAGEMENT_INDEX/_search", emptyMap(), StringEntity(request, APPLICATION_JSON)) assertEquals("Request failed", RestStatus.OK, response.restStatus()) val searchResponse = SearchResponse.fromXContent(createParser(jsonXContent, response.entity.content)) diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestAddPolicyActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestAddPolicyActionIT.kt similarity index 91% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestAddPolicyActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestAddPolicyActionIT.kt index 331137bfb..40fccf921 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestAddPolicyActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestAddPolicyActionIT.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.makeRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILURES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.makeRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILURES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES import org.apache.http.entity.ContentType.APPLICATION_JSON import org.apache.http.entity.StringEntity import org.elasticsearch.client.ResponseException diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestChangePolicyActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestChangePolicyActionIT.kt similarity index 92% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestChangePolicyActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestChangePolicyActionIT.kt index a6332e621..e9c6990e9 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestChangePolicyActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestChangePolicyActionIT.kt @@ -13,32 +13,32 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.makeRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ChangePolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.StateFilter -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Transition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.DeleteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.OpenActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.RolloverActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StateMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomPolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomReplicaCountActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomState -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestChangePolicyAction.Companion.INDEX_NOT_MANAGED -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.rollover.AttemptRolloverStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILURES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.makeRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ChangePolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.StateFilter +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Transition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.DeleteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.OpenActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.RolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StateMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomPolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomReplicaCountActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomState +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler.RestChangePolicyAction.Companion.INDEX_NOT_MANAGED +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.rollover.AttemptRolloverStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILURES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.elasticsearch.client.ResponseException import org.elasticsearch.common.settings.Settings import org.elasticsearch.rest.RestRequest diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestExplainActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestExplainActionIT.kt similarity index 88% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestExplainActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestExplainActionIT.kt index 3545c5ef2..69742c925 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestExplainActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestExplainActionIT.kt @@ -13,15 +13,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.makeRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.StateMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.makeRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.StateMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.elasticsearch.client.ResponseException import org.elasticsearch.rest.RestRequest import org.elasticsearch.rest.RestStatus diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRemovePolicyActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRemovePolicyActionIT.kt similarity index 90% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRemovePolicyActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRemovePolicyActionIT.kt index 60c07dde2..a8bc279b7 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRemovePolicyActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRemovePolicyActionIT.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.makeRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILURES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.makeRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILURES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES import org.elasticsearch.client.ResponseException import org.elasticsearch.rest.RestRequest.Method.POST import org.elasticsearch.rest.RestStatus diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRetryFailedManagedIndexActionIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexActionIT.kt similarity index 91% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRetryFailedManagedIndexActionIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexActionIT.kt index 94a6d0cd3..d9ba65f13 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/resthandler/RestRetryFailedManagedIndexActionIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/resthandler/RestRetryFailedManagedIndexActionIT.kt @@ -13,19 +13,19 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.resthandler -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.makeRequest -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomForceMergeActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomPolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomState -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILURES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.makeRequest +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomForceMergeActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomPolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomState +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.FAILURES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util.UPDATED_INDICES +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import org.elasticsearch.client.ResponseException import org.elasticsearch.rest.RestRequest import org.elasticsearch.rest.RestStatus diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/runner/ManagedIndexRunnerIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/runner/ManagedIndexRunnerIT.kt similarity index 77% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/runner/ManagedIndexRunnerIT.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/runner/ManagedIndexRunnerIT.kt index 1b4ff7341..c5173c82d 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/runner/ManagedIndexRunnerIT.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/runner/ManagedIndexRunnerIT.kt @@ -13,26 +13,26 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.runner - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementRestTestCase -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Policy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.State -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.OpenActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomErrorNotification -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomPolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomReadWriteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomState -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomTransition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.settings.ManagedIndexSettings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.readonly.SetReadOnlyStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.readwrite.SetReadWriteStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.transition.AttemptTransitionStep -import com.amazon.opendistroforelasticsearch.indexstatemanagement.waitFor +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.runner + +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.IndexStateManagementRestTestCase +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Policy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.State +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.OpenActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.PolicyRetryInfoMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomErrorNotification +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomPolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomReadWriteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomState +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomTransition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.readonly.SetReadOnlyStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.readwrite.SetReadWriteStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.transition.AttemptTransitionStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.waitFor import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.IntervalSchedule import java.time.Instant import java.time.temporal.ChronoUnit diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptCloseStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptCloseStepTests.kt similarity index 94% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptCloseStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptCloseStepTests.kt index 1d94d83d3..973146cfd 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptCloseStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptCloseStepTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.CloseActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.close.AttemptCloseStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.CloseActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.close.AttemptCloseStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptDeleteStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt similarity index 93% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptDeleteStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt index e00a7f119..ad49f6037 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptDeleteStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.DeleteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.delete.AttemptDeleteStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.DeleteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.delete.AttemptDeleteStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptOpenStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptOpenStepTests.kt similarity index 92% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptOpenStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptOpenStepTests.kt index 05b105886..90479b121 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptOpenStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptOpenStepTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.OpenActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.open.AttemptOpenStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.OpenActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.open.AttemptOpenStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt similarity index 93% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt index 47de6a337..e8ab42a29 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.IndexPriorityActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.indexpriority.AttemptSetIndexPriorityStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.IndexPriorityActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.indexpriority.AttemptSetIndexPriorityStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt similarity index 92% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt index 87764bfbd..9062b9c9f 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReplicaCountActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.replicacount.AttemptSetReplicaCountStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReplicaCountActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.replicacount.AttemptSetReplicaCountStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptSnapshotStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptSnapshotStepTests.kt similarity index 90% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptSnapshotStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptSnapshotStepTests.kt index 423c6d31d..52a411818 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptSnapshotStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptSnapshotStepTests.kt @@ -1,10 +1,10 @@ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.SnapshotActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionProperties -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.snapshot.AttemptSnapshotStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.SnapshotActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionProperties +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.snapshot.AttemptSnapshotStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptTransitionStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt similarity index 91% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptTransitionStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt index 9bc19774e..99e125e04 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/AttemptTransitionStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Conditions -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Transition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.TransitionsActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.transition.AttemptTransitionStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Conditions +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Transition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.TransitionsActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.transition.AttemptTransitionStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/SetReadOnlyStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt similarity index 92% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/SetReadOnlyStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt index 1856c6317..9fd01da1d 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/SetReadOnlyStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadOnlyActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.readonly.SetReadOnlyStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadOnlyActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.readonly.SetReadOnlyStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/SetReadWriteStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt similarity index 92% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/SetReadWriteStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt index f917494b9..c6135ea3e 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/SetReadWriteStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt @@ -13,11 +13,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.ReadWriteActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.readwrite.SetReadWriteStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.ReadWriteActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.readwrite.SetReadWriteStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/WaitForSnapshotStepTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/WaitForSnapshotStepTests.kt similarity index 95% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/WaitForSnapshotStepTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/WaitForSnapshotStepTests.kt index eb8574ca7..ce41cea1a 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/step/WaitForSnapshotStepTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/WaitForSnapshotStepTests.kt @@ -13,13 +13,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.step +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.SnapshotActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionMetaData -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.managedindexmetadata.ActionProperties -import com.amazon.opendistroforelasticsearch.indexstatemanagement.step.snapshot.WaitForSnapshotStep +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.SnapshotActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionMetaData +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.managedindexmetadata.ActionProperties +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.step.snapshot.WaitForSnapshotStep import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.doAnswer import com.nhaarman.mockitokotlin2.doReturn diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/IndexUtilsTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/util/IndexUtilsTests.kt similarity index 95% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/IndexUtilsTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/util/IndexUtilsTests.kt index 82b35a663..6b8663e24 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/IndexUtilsTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/util/IndexUtilsTests.kt @@ -1,5 +1,6 @@ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.util +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util +import com.amazon.opendistroforelasticsearch.indexmanagement.util.IndexUtils import org.elasticsearch.cluster.metadata.IndexMetadata import org.elasticsearch.common.xcontent.XContentType import org.elasticsearch.test.ESTestCase diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/ManagedIndexUtilsTests.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/util/ManagedIndexUtilsTests.kt similarity index 92% rename from src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/ManagedIndexUtilsTests.kt rename to src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/util/ManagedIndexUtilsTests.kt index 375873927..14d84d333 100644 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/util/ManagedIndexUtilsTests.kt +++ b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/util/ManagedIndexUtilsTests.kt @@ -13,17 +13,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.indexstatemanagement.util - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Conditions -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.Transition -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.action.RolloverActionConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.coordinator.SweptManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomChangePolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomClusterStateManagedIndexConfig -import com.amazon.opendistroforelasticsearch.indexstatemanagement.randomSweptManagedIndexConfig +package com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.util + +import com.amazon.opendistroforelasticsearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Conditions +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.ManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.Transition +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.action.RolloverActionConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.model.coordinator.SweptManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomChangePolicy +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomClusterStateManagedIndexConfig +import com.amazon.opendistroforelasticsearch.indexmanagement.indexstatemanagement.randomSweptManagedIndexConfig import org.elasticsearch.action.delete.DeleteRequest import org.elasticsearch.action.index.IndexRequest import org.elasticsearch.common.bytes.BytesReference @@ -45,7 +45,7 @@ class ManagedIndexUtilsTests : ESTestCase() { val createRequest = managedIndexConfigIndexRequest(index, uuid, policyID, 5) assertNotNull("IndexRequest not created", createRequest) - assertEquals("Incorrect ism index used in request", INDEX_STATE_MANAGEMENT_INDEX, createRequest.index()) + assertEquals("Incorrect ism index used in request", INDEX_MANAGEMENT_INDEX, createRequest.index()) assertEquals("Incorrect uuid used as document id on request", uuid, createRequest.id()) val source = createRequest.source() @@ -61,7 +61,7 @@ class ManagedIndexUtilsTests : ESTestCase() { val deleteRequest = deleteManagedIndexRequest(uuid) assertNotNull("deleteRequest not created", deleteRequest) - assertEquals("Incorrect ism index used in request", INDEX_STATE_MANAGEMENT_INDEX, deleteRequest.index()) + assertEquals("Incorrect ism index used in request", INDEX_MANAGEMENT_INDEX, deleteRequest.index()) assertEquals("Incorrect uuid used as document id on request", uuid, deleteRequest.id()) } @@ -75,7 +75,7 @@ class ManagedIndexUtilsTests : ESTestCase() { val updateRequest = updateManagedIndexRequest(sweptManagedIndexConfig) assertNotNull("UpdateRequest not created", updateRequest) - assertEquals("Incorrect ism index used in request", INDEX_STATE_MANAGEMENT_INDEX, updateRequest.index()) + assertEquals("Incorrect ism index used in request", INDEX_MANAGEMENT_INDEX, updateRequest.index()) assertEquals("Incorrect uuid used as document id on request", uuid, updateRequest.id()) val source = updateRequest.doc().sourceAsMap() @@ -176,7 +176,7 @@ class ManagedIndexUtilsTests : ESTestCase() { val builder = searchRequest.source() val indices = searchRequest.indices().toList() assertTrue("Does not return seqNo and PrimaryTerm", builder.seqNoAndPrimaryTerm()) - assertEquals("Wrong index being searched", listOf(INDEX_STATE_MANAGEMENT_INDEX), indices) + assertEquals("Wrong index being searched", listOf(INDEX_MANAGEMENT_INDEX), indices) } fun `test rollover action config evaluate conditions`() { diff --git a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementIndicesIT.kt b/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementIndicesIT.kt deleted file mode 100644 index 422bcb701..000000000 --- a/src/test/kotlin/com/amazon/opendistroforelasticsearch/indexstatemanagement/IndexStateManagementIndicesIT.kt +++ /dev/null @@ -1,134 +0,0 @@ -package com.amazon.opendistroforelasticsearch.indexstatemanagement - -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementIndices.Companion.HISTORY_INDEX_BASE -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementIndices.Companion.HISTORY_WRITE_INDEX_ALIAS -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementIndices.Companion.indexStateManagementHistoryMappings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementIndices.Companion.indexStateManagementMappings -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.INDEX_STATE_MANAGEMENT_INDEX -import com.amazon.opendistroforelasticsearch.indexstatemanagement.IndexStateManagementPlugin.Companion.POLICY_BASE_URI -import com.amazon.opendistroforelasticsearch.indexstatemanagement.model.ChangePolicy -import com.amazon.opendistroforelasticsearch.indexstatemanagement.resthandler.RestChangePolicyAction -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILED_INDICES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.FAILURES -import com.amazon.opendistroforelasticsearch.indexstatemanagement.util.UPDATED_INDICES -import org.apache.http.entity.ContentType -import org.apache.http.entity.StringEntity -import org.elasticsearch.common.settings.Settings -import org.elasticsearch.rest.RestRequest -import org.elasticsearch.test.ESTestCase -import java.util.Locale - -class IndexStateManagementIndicesIT : IndexStateManagementRestTestCase() { - - private val testIndexName = javaClass.simpleName.toLowerCase(Locale.ROOT) - - /* - * If this test fails it means you changed the config mappings - * This test is to ensure you did not forget to increase the schema_version in the mappings _meta object - * The schema_version is used at runtime to check if the mappings need to be updated for the index - * Once you are sure you increased the schema_version or know it is not needed you can update the cached mappings with the new values - * */ - fun `test config mappings schema version number`() { - val cachedMappings = javaClass.classLoader.getResource("mappings/cached-opendistro-ism-config.json")!!.readText() - assertEquals("I see you updated the config mappings. Did you also update the schema_version?", cachedMappings, indexStateManagementMappings) - } - - /* - * If this test fails it means you changed the history mappings - * This test is to ensure you did not forget to increase the schema_version in the mappings _meta object - * The schema_version is used at runtime to check if the mappings need to be updated for the index - * Once you are sure you increased the schema_version or know it is not needed you can update the cached mappings with the new values - * */ - fun `test history mappings schema version number`() { - val cachedMappings = javaClass.classLoader.getResource("mappings/cached-opendistro-ism-history.json")!!.readText() - assertEquals("I see you updated the history mappings. Did you also update the schema_version?", cachedMappings, indexStateManagementHistoryMappings) - } - - fun `test create index management`() { - val policy = randomPolicy() - val policyId = ESTestCase.randomAlphaOfLength(10) - client().makeRequest("PUT", "$POLICY_BASE_URI/$policyId", emptyMap(), policy.toHttpEntity()) - assertIndexExists(INDEX_STATE_MANAGEMENT_INDEX) - verifyIndexSchemaVersion(INDEX_STATE_MANAGEMENT_INDEX, 4) - } - - fun `test update management index mapping with new schema version`() { - assertIndexDoesNotExist(INDEX_STATE_MANAGEMENT_INDEX) - - val mapping = indexStateManagementMappings.trim().trimStart('{').trimEnd('}') - .replace("\"schema_version\": 4", "\"schema_version\": 0") - - createIndex(INDEX_STATE_MANAGEMENT_INDEX, Settings.builder().put("index.hidden", true).build(), mapping) - assertIndexExists(INDEX_STATE_MANAGEMENT_INDEX) - verifyIndexSchemaVersion(INDEX_STATE_MANAGEMENT_INDEX, 0) - - val policy = randomPolicy() - val policyId = ESTestCase.randomAlphaOfLength(10) - client().makeRequest("PUT", "$POLICY_BASE_URI/$policyId", emptyMap(), policy.toHttpEntity()) - - assertIndexExists(INDEX_STATE_MANAGEMENT_INDEX) - verifyIndexSchemaVersion(INDEX_STATE_MANAGEMENT_INDEX, 4) - } - - fun `test update management index history mappings with new schema version`() { - assertIndexDoesNotExist("$HISTORY_WRITE_INDEX_ALIAS?allow_no_indices=false") - - val mapping = indexStateManagementHistoryMappings.trim().trimStart('{').trimEnd('}') - .replace("\"schema_version\": 2", "\"schema_version\": 0") - - val aliases = "\"$HISTORY_WRITE_INDEX_ALIAS\": { \"is_write_index\": true }" - createIndex("$HISTORY_INDEX_BASE-1", Settings.builder().put("index.hidden", true).build(), mapping, aliases) - assertIndexExists(HISTORY_WRITE_INDEX_ALIAS) - verifyIndexSchemaVersion(HISTORY_WRITE_INDEX_ALIAS, 0) - - val policy = createRandomPolicy() - val (index, policyID) = createIndex("history-schema", policy.id) - - val managedIndexConfig = getExistingManagedIndexConfig(index) - - // Change the start time so the job will trigger in 2 seconds. - updateManagedIndexConfigStartTime(managedIndexConfig) - - // wait for the policy to initialize which will add 1 history document to the history index - // this should update the history mappings to the new version - waitFor { assertEquals(policyID, getExplainManagedIndexMetaData(index).policyID) } - - waitFor { - assertIndexExists(HISTORY_WRITE_INDEX_ALIAS) - verifyIndexSchemaVersion(HISTORY_WRITE_INDEX_ALIAS, 2) - } - } - - fun `test changing policy on an index that hasn't initialized yet check schema version`() { - val policy = createRandomPolicy() - val newPolicy = createPolicy(randomPolicy(), "new_policy", true) - val indexName = "${testIndexName}_computer" - val (index) = createIndex(indexName, policy.id) - - val managedIndexConfig = getExistingManagedIndexConfig(index) - assertNull("Change policy is not null", managedIndexConfig.changePolicy) - assertNull("Policy has already initialized", managedIndexConfig.policy) - assertEquals("Policy id does not match", policy.id, managedIndexConfig.policyID) - - val mapping = "{" + indexStateManagementMappings.trimStart('{').trimEnd('}') - .replace("\"schema_version\": 4", "\"schema_version\": 0") - - val entity = StringEntity(mapping, ContentType.APPLICATION_JSON) - client().makeRequest(RestRequest.Method.PUT.toString(), - "/$INDEX_STATE_MANAGEMENT_INDEX/_mapping", emptyMap(), entity) - - verifyIndexSchemaVersion(INDEX_STATE_MANAGEMENT_INDEX, 0) - - // if we try to change policy now, it'll have no ManagedIndexMetaData yet and should succeed - val changePolicy = ChangePolicy(newPolicy.id, null, emptyList(), false) - val response = client().makeRequest( - RestRequest.Method.POST.toString(), - "${RestChangePolicyAction.CHANGE_POLICY_BASE_URI}/$index", emptyMap(), changePolicy.toHttpEntity()) - - verifyIndexSchemaVersion(INDEX_STATE_MANAGEMENT_INDEX, 4) - - assertAffectedIndicesResponseIsEqual(mapOf(FAILURES to false, FAILED_INDICES to emptyList(), UPDATED_INDICES to 1), response.asMap()) - - waitFor { assertEquals(newPolicy.id, getManagedIndexConfig(index)?.changePolicy?.policyID) } - } -} \ No newline at end of file