diff --git a/build.gradle b/build.gradle index 335d5baa5..037a8450f 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit buildscript { ext { isSnapshot = "true" == System.getProperty("build.snapshot", "true") - opensearch_version = System.getProperty("opensearch.version", "3.3.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "3.4.0-SNAPSHOT") buildVersionQualifier = System.getProperty("build.version_qualifier", "") // 2.2.0-SNAPSHOT -> 2.2.0.0-SNAPSHOT version_tokens = opensearch_version.tokenize('-') diff --git a/src/main/kotlin/org/opensearch/indexmanagement/controlcenter/notification/filter/IndexOperationActionFilter.kt b/src/main/kotlin/org/opensearch/indexmanagement/controlcenter/notification/filter/IndexOperationActionFilter.kt index cfa53ab47..80bc2f947 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/controlcenter/notification/filter/IndexOperationActionFilter.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/controlcenter/notification/filter/IndexOperationActionFilter.kt @@ -9,6 +9,7 @@ import org.apache.logging.log4j.LogManager import org.opensearch.action.ActionRequest import org.opensearch.action.support.ActionFilter import org.opensearch.action.support.ActionFilterChain +import org.opensearch.action.support.ActionRequestMetadata import org.opensearch.action.support.ActiveShardsObserver import org.opensearch.cluster.metadata.IndexNameExpressionResolver import org.opensearch.cluster.service.ClusterService @@ -33,6 +34,7 @@ class IndexOperationActionFilter( task: Task, action: String, request: Request, + actionRequestMetadata: ActionRequestMetadata, listener: ActionListener, chain: ActionFilterChain, ) { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/rollup/actionfilter/FieldCapsFilter.kt b/src/main/kotlin/org/opensearch/indexmanagement/rollup/actionfilter/FieldCapsFilter.kt index 621281ea3..a5ce07e6d 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/rollup/actionfilter/FieldCapsFilter.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/rollup/actionfilter/FieldCapsFilter.kt @@ -12,6 +12,7 @@ import org.opensearch.action.fieldcaps.FieldCapabilitiesRequest import org.opensearch.action.fieldcaps.FieldCapabilitiesResponse import org.opensearch.action.support.ActionFilter import org.opensearch.action.support.ActionFilterChain +import org.opensearch.action.support.ActionRequestMetadata import org.opensearch.action.support.IndicesOptions import org.opensearch.cluster.metadata.IndexNameExpressionResolver import org.opensearch.cluster.service.ClusterService @@ -49,6 +50,7 @@ class FieldCapsFilter( task: Task, action: String, request: Request, + actionRequestMetadata: ActionRequestMetadata, listener: ActionListener, chain: ActionFilterChain, ) { diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/coordinator/SkipExecutionTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/coordinator/SkipExecutionTests.kt index d41de106a..ebff343b1 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/coordinator/SkipExecutionTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/coordinator/SkipExecutionTests.kt @@ -16,6 +16,7 @@ import org.opensearch.cluster.service.ClusterService import org.opensearch.core.common.transport.TransportAddress import org.opensearch.indexmanagement.indexstatemanagement.SkipExecution import org.opensearch.test.OpenSearchTestCase +import kotlin.test.Ignore class SkipExecutionTests : OpenSearchTestCase() { private var clusterService: ClusterService = mock() @@ -57,6 +58,7 @@ class SkipExecutionTests : OpenSearchTestCase() { assertFalse(skip.hasLegacyPlugin) } + @Ignore("Legacy version was remove https://github.com/opensearch-project/OpenSearch/pull/19793") fun `test sweepISMPluginVersion should set flag to true and hasLegacyPlugin to true when there are different versions including current version`() { val minVersion = Version.fromString("7.10.0") val maxVersion = Version.CURRENT @@ -73,6 +75,7 @@ class SkipExecutionTests : OpenSearchTestCase() { assertTrue(skip.hasLegacyPlugin) } + @Ignore("Legacy version was remove https://github.com/opensearch-project/OpenSearch/pull/19793") fun `test sweepISMPluginVersion should set flag to true and hasLegacyPlugin to true with different versions`() { val minVersion = Version.fromString("7.10.0") val maxVersion = Version.V_2_0_0 diff --git a/src/test/kotlin/org/opensearch/indexmanagement/util/IndexUtilsTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/util/IndexUtilsTests.kt index add9a191d..a400ef572 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/util/IndexUtilsTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/util/IndexUtilsTests.kt @@ -59,7 +59,7 @@ class IndexUtilsTests : OpenSearchTestCase() { "number_of_shards": "1", "number_of_replicas": "1", "uuid": "t-VBBW6aR6KpJ3XP5iISOA", - "version": { "created": "6040399" }, + "version": { "created": "136217927" }, "provided_name": "data_test" } }, @@ -89,7 +89,7 @@ class IndexUtilsTests : OpenSearchTestCase() { "number_of_shards": "1", "number_of_replicas": "1", "uuid": "t-VBBW6aR6KpJ3XP5iISOA", - "version": { "created": "6040399" }, + "version": { "created": "136217927" }, "provided_name": "data_test" } }, @@ -124,7 +124,7 @@ class IndexUtilsTests : OpenSearchTestCase() { "number_of_shards": "1", "number_of_replicas": "1", "uuid": "t-VBBW6aR6KpJ3XP5iISOA", - "version": { "created": "6040399" }, + "version": { "created": "136217927" }, "provided_name": "data_test" } },