Skip to content

Increments version to 3.4.0 and adds ActionFilter interface #1536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hailong-am merged 2 commits into from
Dec 3, 2025
+11 −4
Merged

Increments version to 3.4.0 and adds ActionFilter interface #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4326c74
Merge changes
Divyaasm Dec 2, 2025
dfa343b
fix test cases
Hailong-am Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('-')
Expand Down
2 changes: 2 additions & 0 deletions ...pensearch/indexmanagement/controlcenter/notification/filter/IndexOperationActionFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,6 +34,7 @@ class IndexOperationActionFilter(
task: Task,
action: String,
request: Request,
actionRequestMetadata: ActionRequestMetadata<Request, Response>,
listener: ActionListener<Response>,
chain: ActionFilterChain<Request, Response>,
) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/org/opensearch/indexmanagement/rollup/actionfilter/FieldCapsFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -49,6 +50,7 @@ class FieldCapsFilter(
task: Task,
action: String,
request: Request,
actionRequestMetadata: ActionRequestMetadata<Request, Response>,
listener: ActionListener<Response>,
chain: ActionFilterChain<Request, Response>,
) {
Expand Down
3 changes: 3 additions & 0 deletions ...lin/org/opensearch/indexmanagement/indexstatemanagement/coordinator/SkipExecutionTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/test/kotlin/org/opensearch/indexmanagement/util/IndexUtilsTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
Expand Down Expand Up @@ -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"
}
},
Expand Down Expand Up @@ -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"
}
},
Expand Down
Loading