merge from main

Signed-off-by: Petar Dzepina <[email protected]>

Author: petardz

src/test/kotlin/org/opensearch/indexmanagement/security/IndexStateManagementSecurityBehaviorIT.kt

@@ -25,6 +25,7 @@ import org.opensearch.indexmanagement.indexstatemanagement.randomErrorNotificati
 import org.opensearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings
 import org.opensearch.indexmanagement.indexstatemanagement.step.rollup.AttemptCreateRollupJobStep
 import org.opensearch.indexmanagement.indexstatemanagement.step.rollup.WaitForRollupCompletionStep
+import org.opensearch.indexmanagement.makeRequest
 import org.opensearch.indexmanagement.rollup.model.ISMRollup
 import org.opensearch.indexmanagement.rollup.model.RollupMetadata
 import org.opensearch.indexmanagement.rollup.model.RollupMetrics
@@ -183,7 +184,7 @@ class IndexStateManagementSecurityBehaviorIT : SecurityRestTestCase() {
         try {
             val testPolicyJson = createReplicaCountTestPolicyRequest(10, "")
             createPolicyJson(testPolicyJson, AIRLINE_POLICY, true, superUserClient!!)
-            client().makeRequest("PUT", "/$AIRLINE_INDEX")
+            client().makeRequest("PUT", "/$AIRLINE_INDEX", emptyMap())
 
             checkPolicyGet(AIRLINE_POLICY, testClient!!, RestStatus.OK)
             checkPolicyGet(AIRLINE_POLICY, superUserClient!!, RestStatus.OK)
@@ -205,7 +206,7 @@ class IndexStateManagementSecurityBehaviorIT : SecurityRestTestCase() {
         try {
             val testPolicyJson = createReplicaCountTestPolicyRequest(10, AIRLINE_INDEX_PATTERN)
             createPolicyJson(testPolicyJson, AIRLINE_POLICY, true, client())
-            client().makeRequest("PUT", "/$AIRLINE_INDEX")
+            client().makeRequest("PUT", "/$AIRLINE_INDEX", emptyMap())
 
             val testIndexConfig = getExistingManagedIndexConfig(AIRLINE_INDEX)
             updateManagedIndexConfigStartTime(testIndexConfig)

src/test/kotlin/org/opensearch/indexmanagement/controlcenter/notification/LRONConfigSecurityBehaviorIT.kt renamed to src/test/kotlin/org/opensearch/indexmanagement/security/LRONConfigSecurityBehaviorIT.kt

@@ -3,18 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.indexmanagement.controlcenter.notification
+package org.opensearch.indexmanagement.security
 
 import org.junit.After
 import org.junit.Before
 import org.opensearch.client.Request
 import org.opensearch.client.RestClient
 import org.opensearch.commons.rest.SecureRestClientBuilder
-import org.opensearch.indexmanagement.DELETE_LRON_CONFIG
-import org.opensearch.indexmanagement.GET_LRON_CONFIG
-import org.opensearch.indexmanagement.INDEX_LRON_CONFIG
 import org.opensearch.indexmanagement.IndexManagementPlugin
 import org.opensearch.indexmanagement.SecurityRestTestCase
+import org.opensearch.indexmanagement.controlcenter.notification.getResourceURI
+import org.opensearch.indexmanagement.controlcenter.notification.initNodeIdsInRestIT
+import org.opensearch.indexmanagement.controlcenter.notification.nodeIdsInRestIT
+import org.opensearch.indexmanagement.controlcenter.notification.randomLRONConfig
+import org.opensearch.indexmanagement.controlcenter.notification.randomTaskId
+import org.opensearch.indexmanagement.controlcenter.notification.toJsonString
 import org.opensearch.rest.RestStatus
 
 @Suppress("UNCHECKED_CAST")