Skip to content

Commit 4c2f6f5

Browse files
DivyaasmHailong-am
andauthored
Increments version to 3.4.0 and adds ActionFilter interface (#1536)
* Merge changes Signed-off-by: Divya Madala <[email protected]> * fix test cases Signed-off-by: Hailong Cui <[email protected]> --------- Signed-off-by: Divya Madala <[email protected]> Signed-off-by: Hailong Cui <[email protected]> Co-authored-by: Hailong Cui <[email protected]>
1 parent 143bf54 commit 4c2f6f5

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit
2727
buildscript {
2828
ext {
2929
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
30-
opensearch_version = System.getProperty("opensearch.version", "3.3.0-SNAPSHOT")
30+
opensearch_version = System.getProperty("opensearch.version", "3.4.0-SNAPSHOT")
3131
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
3232
// 2.2.0-SNAPSHOT -> 2.2.0.0-SNAPSHOT
3333
version_tokens = opensearch_version.tokenize('-')

src/main/kotlin/org/opensearch/indexmanagement/controlcenter/notification/filter/IndexOperationActionFilter.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.apache.logging.log4j.LogManager
99
import org.opensearch.action.ActionRequest
1010
import org.opensearch.action.support.ActionFilter
1111
import org.opensearch.action.support.ActionFilterChain
12+
import org.opensearch.action.support.ActionRequestMetadata
1213
import org.opensearch.action.support.ActiveShardsObserver
1314
import org.opensearch.cluster.metadata.IndexNameExpressionResolver
1415
import org.opensearch.cluster.service.ClusterService
@@ -33,6 +34,7 @@ class IndexOperationActionFilter(
3334
task: Task,
3435
action: String,
3536
request: Request,
37+
actionRequestMetadata: ActionRequestMetadata<Request, Response>,
3638
listener: ActionListener<Response>,
3739
chain: ActionFilterChain<Request, Response>,
3840
) {

src/main/kotlin/org/opensearch/indexmanagement/rollup/actionfilter/FieldCapsFilter.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.opensearch.action.fieldcaps.FieldCapabilitiesRequest
1212
import org.opensearch.action.fieldcaps.FieldCapabilitiesResponse
1313
import org.opensearch.action.support.ActionFilter
1414
import org.opensearch.action.support.ActionFilterChain
15+
import org.opensearch.action.support.ActionRequestMetadata
1516
import org.opensearch.action.support.IndicesOptions
1617
import org.opensearch.cluster.metadata.IndexNameExpressionResolver
1718
import org.opensearch.cluster.service.ClusterService
@@ -49,6 +50,7 @@ class FieldCapsFilter(
4950
task: Task,
5051
action: String,
5152
request: Request,
53+
actionRequestMetadata: ActionRequestMetadata<Request, Response>,
5254
listener: ActionListener<Response>,
5355
chain: ActionFilterChain<Request, Response>,
5456
) {

src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/coordinator/SkipExecutionTests.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.opensearch.cluster.service.ClusterService
1616
import org.opensearch.core.common.transport.TransportAddress
1717
import org.opensearch.indexmanagement.indexstatemanagement.SkipExecution
1818
import org.opensearch.test.OpenSearchTestCase
19+
import kotlin.test.Ignore
1920

2021
class SkipExecutionTests : OpenSearchTestCase() {
2122
private var clusterService: ClusterService = mock()
@@ -57,6 +58,7 @@ class SkipExecutionTests : OpenSearchTestCase() {
5758
assertFalse(skip.hasLegacyPlugin)
5859
}
5960

61+
@Ignore("Legacy version was remove https://github.com/opensearch-project/OpenSearch/pull/19793")
6062
fun `test sweepISMPluginVersion should set flag to true and hasLegacyPlugin to true when there are different versions including current version`() {
6163
val minVersion = Version.fromString("7.10.0")
6264
val maxVersion = Version.CURRENT
@@ -73,6 +75,7 @@ class SkipExecutionTests : OpenSearchTestCase() {
7375
assertTrue(skip.hasLegacyPlugin)
7476
}
7577

78+
@Ignore("Legacy version was remove https://github.com/opensearch-project/OpenSearch/pull/19793")
7679
fun `test sweepISMPluginVersion should set flag to true and hasLegacyPlugin to true with different versions`() {
7780
val minVersion = Version.fromString("7.10.0")
7881
val maxVersion = Version.V_2_0_0

src/test/kotlin/org/opensearch/indexmanagement/util/IndexUtilsTests.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class IndexUtilsTests : OpenSearchTestCase() {
5959
"number_of_shards": "1",
6060
"number_of_replicas": "1",
6161
"uuid": "t-VBBW6aR6KpJ3XP5iISOA",
62-
"version": { "created": "6040399" },
62+
"version": { "created": "136217927" },
6363
"provided_name": "data_test"
6464
}
6565
},
@@ -89,7 +89,7 @@ class IndexUtilsTests : OpenSearchTestCase() {
8989
"number_of_shards": "1",
9090
"number_of_replicas": "1",
9191
"uuid": "t-VBBW6aR6KpJ3XP5iISOA",
92-
"version": { "created": "6040399" },
92+
"version": { "created": "136217927" },
9393
"provided_name": "data_test"
9494
}
9595
},
@@ -124,7 +124,7 @@ class IndexUtilsTests : OpenSearchTestCase() {
124124
"number_of_shards": "1",
125125
"number_of_replicas": "1",
126126
"uuid": "t-VBBW6aR6KpJ3XP5iISOA",
127-
"version": { "created": "6040399" },
127+
"version": { "created": "136217927" },
128128
"provided_name": "data_test"
129129
}
130130
},

0 commit comments

Comments
 (0)