Skip to content

Commit fd7df16

Browse files
petardzpetardz
committed
compile fixes from main
Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
1 parent 95d4c8c commit fd7df16

File tree

6 files changed

+12
-68
lines changed

6 files changed

+12
-68
lines changed

‎src/test/kotlin/org/opensearch/indexmanagement/security/ExplainSecurityBehaviorIT.kt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest
1111
import org.opensearch.client.ResponseException
1212
import org.opensearch.client.RestClient
1313
import org.opensearch.commons.rest.SecureRestClientBuilder
14-
import org.opensearch.indexmanagement.BULK_WRITE_INDEX
15-
import org.opensearch.indexmanagement.CREATE_INDEX
16-
import org.opensearch.indexmanagement.GET_INDEX_MAPPING
17-
import org.opensearch.indexmanagement.IndexManagementPlugin
18-
import org.opensearch.indexmanagement.MANAGED_INDEX
19-
import org.opensearch.indexmanagement.PUT_INDEX_MAPPING
20-
import org.opensearch.indexmanagement.SEARCH_INDEX
21-
import org.opensearch.indexmanagement.SecurityRestTestCase
22-
import org.opensearch.indexmanagement.WRITE_INDEX
2314
import org.opensearch.indexmanagement.IndexManagementPlugin
2415
import org.opensearch.indexmanagement.SecurityRestTestCase
2516
import org.opensearch.indexmanagement.indexstatemanagement.action.AliasAction

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

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import org.junit.After
1515
import org.junit.Before
1616
import org.opensearch.client.RestClient
1717
import org.opensearch.commons.rest.SecureRestClientBuilder
18+
import org.opensearch.indexmanagement.SecurityRestTestCase
1819
import org.opensearch.indexmanagement.common.model.dimension.DateHistogram
1920
import org.opensearch.indexmanagement.common.model.dimension.Terms
2021
import org.opensearch.indexmanagement.indexstatemanagement.action.RollupAction
@@ -25,6 +26,7 @@ import org.opensearch.indexmanagement.indexstatemanagement.randomErrorNotificati
2526
import org.opensearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings
2627
import org.opensearch.indexmanagement.indexstatemanagement.step.rollup.AttemptCreateRollupJobStep
2728
import org.opensearch.indexmanagement.indexstatemanagement.step.rollup.WaitForRollupCompletionStep
29+
import org.opensearch.indexmanagement.makeRequest
2830
import org.opensearch.indexmanagement.rollup.model.ISMRollup
2931
import org.opensearch.indexmanagement.rollup.model.RollupMetadata
3032
import org.opensearch.indexmanagement.rollup.model.RollupMetrics
@@ -33,29 +35,12 @@ import org.opensearch.indexmanagement.rollup.model.metric.Max
3335
import org.opensearch.indexmanagement.rollup.model.metric.Min
3436
import org.opensearch.indexmanagement.rollup.model.metric.Sum
3537
import org.opensearch.indexmanagement.rollup.model.metric.ValueCount
36-
import org.opensearch.indexmanagement.security.ADD_POLICY
37-
import org.opensearch.indexmanagement.security.BULK_WRITE_INDEX
38-
import org.opensearch.indexmanagement.security.CREATE_INDEX
39-
import org.opensearch.indexmanagement.security.DELETE_POLICY
40-
import org.opensearch.indexmanagement.security.EXPLAIN_INDEX
41-
import org.opensearch.indexmanagement.security.EXPLAIN_ROLLUP
42-
import org.opensearch.indexmanagement.security.GET_INDEX_MAPPING
43-
import org.opensearch.indexmanagement.security.GET_POLICIES
44-
import org.opensearch.indexmanagement.security.GET_POLICY
45-
import org.opensearch.indexmanagement.security.GET_ROLLUP
46-
import org.opensearch.indexmanagement.security.INDEX_ROLLUP
47-
import org.opensearch.indexmanagement.security.MANAGED_INDEX
48-
import org.opensearch.indexmanagement.security.PUT_INDEX_MAPPING
49-
import org.opensearch.indexmanagement.security.SEARCH_INDEX
50-
import org.opensearch.indexmanagement.security.UPDATE_ROLLUP
51-
import org.opensearch.indexmanagement.security.WRITE_INDEX
52-
import org.opensearch.indexmanagement.security.WRITE_POLICY
38+
import org.opensearch.indexmanagement.waitFor
5339
import org.opensearch.rest.RestStatus
5440
import org.opensearch.test.junit.annotations.TestLogging
5541
import java.time.Instant
5642
import java.time.temporal.ChronoUnit
5743
import java.util.Locale
58-
import org.opensearch.indexmanagement.SecurityRestTestCase
5944

6045
@TestLogging("level:DEBUG", reason = "Debug for tests.")
6146
class IndexStateManagementSecurityBehaviorIT : SecurityRestTestCase() {
@@ -183,7 +168,7 @@ class IndexStateManagementSecurityBehaviorIT : SecurityRestTestCase() {
183168
try {
184169
val testPolicyJson = createReplicaCountTestPolicyRequest(10, "")
185170
createPolicyJson(testPolicyJson, AIRLINE_POLICY, true, superUserClient!!)
186-
client().makeRequest("PUT", "/$AIRLINE_INDEX")
171+
client().makeRequest("PUT", "/$AIRLINE_INDEX", emptyMap())
187172

188173
checkPolicyGet(AIRLINE_POLICY, testClient!!, RestStatus.OK)
189174
checkPolicyGet(AIRLINE_POLICY, superUserClient!!, RestStatus.OK)
@@ -205,7 +190,7 @@ class IndexStateManagementSecurityBehaviorIT : SecurityRestTestCase() {
205190
try {
206191
val testPolicyJson = createReplicaCountTestPolicyRequest(10, AIRLINE_INDEX_PATTERN)
207192
createPolicyJson(testPolicyJson, AIRLINE_POLICY, true, client())
208-
client().makeRequest("PUT", "/$AIRLINE_INDEX")
193+
client().makeRequest("PUT", "/$AIRLINE_INDEX", emptyMap())
209194

210195
val testIndexConfig = getExistingManagedIndexConfig(AIRLINE_INDEX)
211196
updateManagedIndexConfigStartTime(testIndexConfig)

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.opensearch.indexmanagement.controlcenter.notification
6+
package org.opensearch.indexmanagement.security
77

88
import org.junit.After
99
import org.junit.Before
1010
import org.opensearch.client.Request
1111
import org.opensearch.client.RestClient
1212
import org.opensearch.commons.rest.SecureRestClientBuilder
13-
import org.opensearch.indexmanagement.DELETE_LRON_CONFIG
14-
import org.opensearch.indexmanagement.GET_LRON_CONFIG
15-
import org.opensearch.indexmanagement.INDEX_LRON_CONFIG
1613
import org.opensearch.indexmanagement.IndexManagementPlugin
1714
import org.opensearch.indexmanagement.SecurityRestTestCase
15+
import org.opensearch.indexmanagement.controlcenter.notification.getResourceURI
16+
import org.opensearch.indexmanagement.controlcenter.notification.initNodeIdsInRestIT
17+
import org.opensearch.indexmanagement.controlcenter.notification.nodeIdsInRestIT
18+
import org.opensearch.indexmanagement.controlcenter.notification.randomLRONConfig
19+
import org.opensearch.indexmanagement.controlcenter.notification.randomTaskId
20+
import org.opensearch.indexmanagement.controlcenter.notification.toJsonString
1821
import org.opensearch.rest.RestStatus
1922

2023
@Suppress("UNCHECKED_CAST")

‎src/test/kotlin/org/opensearch/indexmanagement/security/PolicySecurityBehaviorIT.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ import org.opensearch.indexmanagement.indexstatemanagement.model.Policy
1818
import org.opensearch.indexmanagement.indexstatemanagement.model.State
1919
import org.opensearch.indexmanagement.indexstatemanagement.randomErrorNotification
2020
import org.opensearch.indexmanagement.indexstatemanagement.transport.action.addpolicy.AddPolicyAction
21-
import org.opensearch.indexmanagement.security.BULK_WRITE_INDEX
22-
import org.opensearch.indexmanagement.security.CREATE_INDEX
23-
import org.opensearch.indexmanagement.security.GET_INDEX_MAPPING
24-
import org.opensearch.indexmanagement.security.MANAGED_INDEX
25-
import org.opensearch.indexmanagement.security.PUT_INDEX_MAPPING
26-
import org.opensearch.indexmanagement.security.SEARCH_INDEX
27-
import org.opensearch.indexmanagement.security.WRITE_INDEX
2821
import org.opensearch.rest.RestStatus
2922
import org.opensearch.test.OpenSearchTestCase
3023
import org.opensearch.test.junit.annotations.TestLogging

‎src/test/kotlin/org/opensearch/indexmanagement/security/SecurityBehaviorIT.kt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@ import org.junit.After
1616
import org.junit.Before
1717
import org.opensearch.client.RestClient
1818
import org.opensearch.commons.rest.SecureRestClientBuilder
19-
import org.opensearch.indexmanagement.BULK_WRITE_INDEX
20-
import org.opensearch.indexmanagement.CREATE_INDEX
21-
import org.opensearch.indexmanagement.EXPLAIN_INDEX
22-
import org.opensearch.indexmanagement.GET_INDEX_MAPPING
23-
import org.opensearch.indexmanagement.GET_POLICIES
24-
import org.opensearch.indexmanagement.GET_POLICY
25-
import org.opensearch.indexmanagement.MANAGED_INDEX
26-
import org.opensearch.indexmanagement.PUT_INDEX_MAPPING
27-
import org.opensearch.indexmanagement.SEARCH_INDEX
28-
import org.opensearch.indexmanagement.SecurityRestTestCase
29-
import org.opensearch.indexmanagement.WRITE_INDEX
30-
import org.opensearch.indexmanagement.WRITE_POLICY
3119
import org.opensearch.indexmanagement.SecurityRestTestCase
3220
import org.opensearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings
3321
import org.opensearch.indexmanagement.makeRequest

‎src/test/kotlin/org/opensearch/indexmanagement/security/TransformSecurityBehaviorIT.kt‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,6 @@ import org.opensearch.commons.rest.SecureRestClientBuilder
1212
import org.opensearch.indexmanagement.SecurityRestTestCase
1313
import org.opensearch.indexmanagement.common.model.dimension.Terms
1414
import org.opensearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings
15-
import org.opensearch.indexmanagement.security.BULK_WRITE_INDEX
16-
import org.opensearch.indexmanagement.security.CREATE_INDEX
17-
import org.opensearch.indexmanagement.security.DELETE_TRANSFORM
18-
import org.opensearch.indexmanagement.security.EXPLAIN_INDEX
19-
import org.opensearch.indexmanagement.security.EXPLAIN_TRANSFORM
20-
import org.opensearch.indexmanagement.security.GET_INDEX_MAPPING
21-
import org.opensearch.indexmanagement.security.GET_TRANSFORM
22-
import org.opensearch.indexmanagement.security.GET_TRANSFORMS
23-
import org.opensearch.indexmanagement.security.HEALTH
24-
import org.opensearch.indexmanagement.security.MANAGED_INDEX
25-
import org.opensearch.indexmanagement.security.PUT_INDEX_MAPPING
26-
import org.opensearch.indexmanagement.security.SEARCH_INDEX
27-
import org.opensearch.indexmanagement.security.START_TRANSFORM
28-
import org.opensearch.indexmanagement.security.STOP_TRANSFORM
29-
import org.opensearch.indexmanagement.security.TRANSFORM_ACTION
30-
import org.opensearch.indexmanagement.security.WRITE_INDEX
3115
import org.opensearch.indexmanagement.transform.model.Transform
3216
import org.opensearch.indexmanagement.transform.model.TransformMetadata
3317
import org.opensearch.indexmanagement.transform.randomTransform

0 commit comments

Comments
 (0)