Fix the build (#1491)

bowenlan-amzn · web-flow · commit f67a308775ce · 2025-09-25T16:51:58.000-07:00
diff --git 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/TestHelpers.kt b/src/test/kotlin/org/opensearch/indexmanagement/TestHelpers.kt
@@ -56,7 +56,16 @@ private fun randomStringList(): List<String> {
     return data
 }
 
-fun randomUser(): User = User(OpenSearchRestTestCase.randomAlphaOfLength(10), randomStringList(), randomStringList(), randomStringList())
+private fun randomCustomAttNamesList(): List<String> {
+    val data = mutableListOf<String>()
+    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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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())

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ configurations.configureEach {`
`58`	`58`	`resolutionStrategy {`
`59`	`59`	`force "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"`
`60`	`60`	`force "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"`
	`61`	`+ force "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}"`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`
`@@ -71,7 +72,6 @@ dependencies {`
`71`	`72`	`compileOnly "org.opensearch:common-utils:${common_utils_version}"`
`72`	`73`
`73`	`74`	`testImplementation "org.opensearch.test:framework:${opensearch_version}"`
`74`		`- testImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`idea.module {`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class AttemptRestoreStepTests : OpenSearchTestCase() {`
`74`	`74`	`null,`
`75`	`75`	`null,`
`76`	`76`	`)`
`77`		`- private val lockService: LockService = LockService(mock(), clusterService)`
	`77`	`+ private val lockService: LockService = mock()`
`78`	`78`
`79`	`79`	`@Before`
`80`	`80`	`fun setup() {`