From dde6210ff6d9a7f1d4b421e4f336106f9ddd2cb5 Mon Sep 17 00:00:00 2001 From: bowenlan-amzn Date: Thu, 25 Sep 2025 22:47:09 +0800 Subject: [PATCH 1/2] fix compile Signed-off-by: bowenlan-amzn --- spi/build.gradle | 2 +- .../indexstatemanagement/step/AttemptCloseStepTests.kt | 2 +- .../indexstatemanagement/step/AttemptDeleteStepTests.kt | 2 +- .../indexstatemanagement/step/AttemptOpenStepTests.kt | 2 +- .../indexstatemanagement/step/AttemptRestoreStepTests.kt | 2 +- .../indexstatemanagement/step/AttemptRolloverStepTests.kt | 2 +- .../step/AttemptSetIndexPriorityStepTests.kt | 2 +- .../step/AttemptSetReplicaCountStepTests.kt | 2 +- .../indexstatemanagement/step/AttemptSnapshotStepTests.kt | 2 +- .../step/AttemptStopReplicationStepTests.kt | 2 +- .../indexstatemanagement/step/AttemptTransitionStepTests.kt | 2 +- .../indexstatemanagement/step/SetReadOnlyStepTests.kt | 2 +- .../indexstatemanagement/step/SetReadWriteStepTests.kt | 2 +- .../step/WaitForRollupCompletionStepTests.kt | 2 +- .../indexstatemanagement/step/WaitForShrinkStepTests.kt | 2 +- .../indexstatemanagement/step/WaitForSnapshotStepTests.kt | 2 +- .../step/WaitForTransformCompletionStepTests.kt | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spi/build.gradle b/spi/build.gradle index c4e6195ed..36af96e65 100644 --- a/spi/build.gradle +++ b/spi/build.gradle @@ -58,6 +58,7 @@ configurations.configureEach { resolutionStrategy { force "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" force "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}" + force "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}" } } @@ -71,7 +72,6 @@ dependencies { compileOnly "org.opensearch:common-utils:${common_utils_version}" testImplementation "org.opensearch.test:framework:${opensearch_version}" - testImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}" } idea.module { diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptCloseStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptCloseStepTests.kt index 8ed6ab8d8..0eeae695f 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptCloseStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptCloseStepTests.kt @@ -45,7 +45,7 @@ class AttemptCloseStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private lateinit var metricsRegistry: MetricsRegistry private lateinit var closeActionMetrics: CloseActionMetrics diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt index 4a2499018..3b05f3151 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptDeleteStepTests.kt @@ -43,7 +43,7 @@ class AttemptDeleteStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private lateinit var metricsRegistry: MetricsRegistry private lateinit var deleteActionMetrics: DeleteActionMetrics diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptOpenStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptOpenStepTests.kt index 1ea306f34..6f5910db0 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptOpenStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptOpenStepTests.kt @@ -43,7 +43,7 @@ class AttemptOpenStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private lateinit var metricsRegistry: MetricsRegistry private lateinit var openActionMetrics: OpenActionMetrics diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptRestoreStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptRestoreStepTests.kt index 1cd70e532..ac8f8aaaf 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptRestoreStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptRestoreStepTests.kt @@ -74,7 +74,7 @@ class AttemptRestoreStepTests : OpenSearchTestCase() { null, null, ) - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() @Before fun setup() { diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptRolloverStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptRolloverStepTests.kt index 97e6f4aa6..5c65f60eb 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptRolloverStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptRolloverStepTests.kt @@ -49,7 +49,7 @@ class AttemptRolloverStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private val oldIndexName = "old_index" private val newIndexName = "new_index" val alias = "alias" diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt index e9d1e5972..79671344f 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetIndexPriorityStepTests.kt @@ -41,7 +41,7 @@ class AttemptSetIndexPriorityStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private lateinit var metricsRegistry: MetricsRegistry private lateinit var setIndexPriorityActionMetrics: SetIndexPriorityActionMetrics diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt index f0fcc66a4..ef9f54072 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSetReplicaCountStepTests.kt @@ -44,7 +44,7 @@ class AttemptSetReplicaCountStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private lateinit var metricsRegistry: MetricsRegistry private lateinit var replicaCountActionMetrics: ReplicaCountActionMetrics diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSnapshotStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSnapshotStepTests.kt index cb2633a12..0521e4b23 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSnapshotStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptSnapshotStepTests.kt @@ -54,7 +54,7 @@ class AttemptSnapshotStepTests : OpenSearchTestCase() { private val settings: Settings = Settings.EMPTY private val snapshotAction = randomSnapshotActionConfig("repo", "snapshot-name") private val metadata = ManagedIndexMetaData("test", "indexUuid", "policy_id", null, null, null, null, null, null, null, ActionMetaData("snapshot", 1, 0, false, 0, null, ActionProperties(snapshotName = "snapshot-name")), null, null, null) - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private lateinit var metricsRegistry: MetricsRegistry private lateinit var snapshotActionMetrics: SnapshotActionMetrics diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptStopReplicationStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptStopReplicationStepTests.kt index ee90923e6..70bd7d045 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptStopReplicationStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptStopReplicationStepTests.kt @@ -28,7 +28,7 @@ class AttemptStopReplicationStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() fun `test stop replication step sets step status to completed when successful`() { val client = getClient(true, false) // Simulate a successful response diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt index ee50e3925..aaf4c2671 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/AttemptTransitionStepTests.kt @@ -74,7 +74,7 @@ class AttemptTransitionStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock { on { state() } doReturn clusterState } private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private val docsStats: DocsStats = mock() private val primaries: CommonStats = mock { on { getDocs() } doReturn docsStats } diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt index c1f1499fb..bc0072fa1 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadOnlyStepTests.kt @@ -43,7 +43,7 @@ class SetReadOnlyStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private lateinit var metricsRegistry: MetricsRegistry private lateinit var setReadOnlyActionMetrics: SetReadOnlyActionMetrics diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt index 1810b9c45..4161882fd 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/SetReadWriteStepTests.kt @@ -31,7 +31,7 @@ class SetReadWriteStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() fun `test read write step sets step status to failed when not acknowledged`() { val setReadWriteResponse = AcknowledgedResponse(false) diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForRollupCompletionStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForRollupCompletionStepTests.kt index 442b51fdf..7ccad74a0 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForRollupCompletionStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForRollupCompletionStepTests.kt @@ -43,7 +43,7 @@ class WaitForRollupCompletionStepTests : OpenSearchTestCase() { ) private val client: Client = mock() private val step = WaitForRollupCompletionStep() - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() fun `test wait for rollup when missing rollup id`() { val actionMetadata = metadata.actionMetaData!!.copy(actionProperties = ActionProperties()) diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForShrinkStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForShrinkStepTests.kt index 814d76b1d..f69f206fa 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForShrinkStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForShrinkStepTests.kt @@ -42,7 +42,7 @@ class WaitForShrinkStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock { on { state() } doReturn clusterState } private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() private val ackedResponse = AcknowledgedResponse(true) private val unAckedResponse = AcknowledgedResponse(false) diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForSnapshotStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForSnapshotStepTests.kt index 75aae20cb..5873960a5 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForSnapshotStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForSnapshotStepTests.kt @@ -38,7 +38,7 @@ class WaitForSnapshotStepTests : OpenSearchTestCase() { private val clusterService: ClusterService = mock() private val scriptService: ScriptService = mock() private val settings: Settings = Settings.EMPTY - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() val snapshot = "snapshot-name" fun `test snapshot missing snapshot name in action properties`() { diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForTransformCompletionStepTests.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForTransformCompletionStepTests.kt index 4568646c5..de0b48e1e 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForTransformCompletionStepTests.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/step/WaitForTransformCompletionStepTests.kt @@ -62,7 +62,7 @@ class WaitForTransformCompletionStepTests : OpenSearchTestCase() { ) private val client: Client = mock() private val step = WaitForTransformCompletionStep() - private val lockService: LockService = LockService(mock(), clusterService) + private val lockService: LockService = mock() fun `test wait for transform when missing transform id`() { val actionMetadata = metadata.actionMetaData!!.copy(actionProperties = ActionProperties()) From 5651182a6e5b48be16b397a0bc31da1c2f669343 Mon Sep 17 00:00:00 2001 From: bowenlan-amzn Date: Thu, 25 Sep 2025 23:34:15 +0800 Subject: [PATCH 2/2] fix text Signed-off-by: bowenlan-amzn --- .../org/opensearch/indexmanagement/TestHelpers.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/test/kotlin/org/opensearch/indexmanagement/TestHelpers.kt b/src/test/kotlin/org/opensearch/indexmanagement/TestHelpers.kt index 30de0cc2d..c193710be 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/TestHelpers.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/TestHelpers.kt @@ -56,7 +56,16 @@ private fun randomStringList(): List { return data } -fun randomUser(): User = User(OpenSearchRestTestCase.randomAlphaOfLength(10), randomStringList(), randomStringList(), randomStringList()) +private fun randomCustomAttNamesList(): List { + val data = mutableListOf() + repeat(OpenSearchRestTestCase.randomIntBetween(1, 10)) { + data.add("${OpenSearchRestTestCase.randomAlphaOfLength(10)}=${OpenSearchRestTestCase.randomAlphaOfLength(10)}") + } + + return data +} + +fun randomUser(): User = User(OpenSearchRestTestCase.randomAlphaOfLength(10), randomStringList(), randomStringList(), randomCustomAttNamesList()) /** * Wrapper for [RestClient.performRequest] which was deprecated in ES 6.5 and is used in tests. This provides