Skip to content

Commit 395317d

Browse files
cwperkscwperks
authored
Update CI check for integ-test-with-security to run all integ tests with security (opensearch-project#1243)
* Run all integ tests with security Signed-off-by: Craig Perkins <cwperx@amazon.com> * Use adminClient when deleting ISM index in RestStopRollupActionIT Signed-off-by: Craig Perkins <cwperx@amazon.com> * Update RolloverActionIT Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix RestStopSnapshotManagementIT Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix RestChangePolicyActionIT Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix more tests Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix more tests Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix more tests Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix RestExplainTransformActionIT Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix more tests Signed-off-by: Craig Perkins <cwperx@amazon.com> * Make sure read from system index also uses adminClient Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent c0942eb commit 395317d

17 files changed

+55
-24
lines changed

‎.github/workflows/security-test-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Run integration tests
4141
run: |
4242
chown -R 1000:1000 `pwd`
43-
su `id -un 1000` -c "./gradlew integTest -Dsecurity=true -Dhttps=true --tests '*SecurityBehaviorIT'"
43+
su `id -un 1000` -c "./gradlew integTest -Dsecurity=true -Dhttps=true --tests '*IT'"
4444
- name: Upload failed logs
4545
uses: actions/upload-artifact@v2
4646
if: failure()

‎src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementRestTestCase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
351351
}
352352
""".trimIndent()
353353
val res =
354-
client().makeRequest(
354+
adminClient().makeRequest(
355355
"PUT", "$index/_settings", emptyMap(),
356356
StringEntity(body, ContentType.APPLICATION_JSON),
357357
)
@@ -483,7 +483,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
483483

484484
protected fun updateManagedIndexConfigPolicySeqNo(update: ManagedIndexConfig) {
485485
val response =
486-
client().makeRequest(
486+
adminClient().makeRequest(
487487
"POST", "$INDEX_MANAGEMENT_INDEX/_update/${update.id}",
488488
StringEntity(
489489
"{\"doc\":{\"managed_index\":{\"policy_seq_no\":\"${update.policySeqNo}\"}}}",

‎src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/action/RolloverActionIT.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ class RolloverActionIT : IndexStateManagementRestTestCase() {
784784
}
785785
// Manually produce transaction failure
786786
val response =
787-
client().makeRequest(
787+
adminClient().makeRequest(
788788
"POST", "$INDEX_MANAGEMENT_INDEX/_update/${managedIndexConfig.id}%23metadata",
789789
StringEntity(
790790
"{\n" +

‎src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/RestChangePolicyActionIT.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package org.opensearch.indexmanagement.indexstatemanagement.resthandler
77

88
import org.junit.Before
9+
import org.opensearch.client.Request
910
import org.opensearch.client.ResponseException
1011
import org.opensearch.common.settings.Settings
1112
import org.opensearch.core.rest.RestStatus
@@ -35,7 +36,7 @@ import org.opensearch.indexmanagement.spi.indexstatemanagement.model.StateMetaDa
3536
import org.opensearch.indexmanagement.waitFor
3637
import org.opensearch.rest.RestRequest
3738
import java.time.Instant
38-
import java.util.Locale
39+
import java.util.*
3940

4041
class RestChangePolicyActionIT : IndexStateManagementRestTestCase() {
4142
private val testIndexName = javaClass.simpleName.lowercase(Locale.ROOT)
@@ -89,7 +90,10 @@ class RestChangePolicyActionIT : IndexStateManagementRestTestCase() {
8990
}
9091

9192
fun `test nonexistent ism config index`() {
92-
if (indexExists(INDEX_MANAGEMENT_INDEX)) deleteIndex(INDEX_MANAGEMENT_INDEX)
93+
if (indexExists(INDEX_MANAGEMENT_INDEX)) {
94+
val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
95+
adminClient().performRequest(deleteISMIndexRequest)
96+
}
9397
try {
9498
val changePolicy = ChangePolicy("some_id", null, emptyList(), false)
9599
client().makeRequest(

‎src/test/kotlin/org/opensearch/indexmanagement/rollup/resthandler/RestStartRollupActionIT.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
package org.opensearch.indexmanagement.rollup.resthandler
77

8+
import org.opensearch.client.Request
89
import org.opensearch.client.ResponseException
910
import org.opensearch.common.settings.Settings
1011
import org.opensearch.core.rest.RestStatus
1112
import org.opensearch.indexmanagement.IndexManagementIndices
1213
import org.opensearch.indexmanagement.IndexManagementPlugin
14+
import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
1315
import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.ROLLUP_JOBS_BASE_URI
1416
import org.opensearch.indexmanagement.common.model.dimension.DateHistogram
1517
import org.opensearch.indexmanagement.indexstatemanagement.util.INDEX_HIDDEN
@@ -22,7 +24,7 @@ import org.opensearch.indexmanagement.waitFor
2224
import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule
2325
import java.time.Instant
2426
import java.time.temporal.ChronoUnit
25-
import java.util.Locale
27+
import java.util.*
2628

2729
class RestStartRollupActionIT : RollupRestAPITestCase() {
2830
private val testName = javaClass.simpleName.lowercase(Locale.ROOT)
@@ -200,7 +202,8 @@ class RestStartRollupActionIT : RollupRestAPITestCase() {
200202

201203
fun `test start rollup when multiple shards configured for IM config index`() {
202204
// setup ism-config index with multiple primary shards
203-
deleteIndex(IndexManagementPlugin.INDEX_MANAGEMENT_INDEX)
205+
val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
206+
adminClient().performRequest(deleteISMIndexRequest)
204207
val mapping = IndexManagementIndices.indexManagementMappings.trim().trimStart('{').trimEnd('}')
205208
val settings =
206209
Settings.builder()
@@ -253,7 +256,7 @@ class RestStartRollupActionIT : RollupRestAPITestCase() {
253256

254257
// clearing the config index to prevent other tests using this multi shard index
255258
Thread.sleep(2000L)
256-
deleteIndex(IndexManagementPlugin.INDEX_MANAGEMENT_INDEX)
259+
adminClient().performRequest(deleteISMIndexRequest)
257260
Thread.sleep(2000L)
258261
}
259262
}

‎src/test/kotlin/org/opensearch/indexmanagement/rollup/resthandler/RestStopRollupActionIT.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
package org.opensearch.indexmanagement.rollup.resthandler
77

8+
import org.opensearch.client.Request
89
import org.opensearch.client.ResponseException
910
import org.opensearch.common.settings.Settings
1011
import org.opensearch.core.rest.RestStatus
1112
import org.opensearch.indexmanagement.IndexManagementIndices
1213
import org.opensearch.indexmanagement.IndexManagementPlugin
14+
import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
1315
import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.ROLLUP_JOBS_BASE_URI
1416
import org.opensearch.indexmanagement.common.model.dimension.DateHistogram
1517
import org.opensearch.indexmanagement.common.model.dimension.Terms
@@ -256,7 +258,8 @@ class RestStopRollupActionIT : RollupRestAPITestCase() {
256258

257259
fun `test stop rollup when multiple shards configured for IM config index`() {
258260
// setup ism-config index with multiple primary shards
259-
deleteIndex(IndexManagementPlugin.INDEX_MANAGEMENT_INDEX)
261+
val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
262+
adminClient().performRequest(deleteISMIndexRequest)
260263
val mapping = IndexManagementIndices.indexManagementMappings.trim().trimStart('{').trimEnd('}')
261264
val settings =
262265
Settings.builder()
@@ -313,7 +316,7 @@ class RestStopRollupActionIT : RollupRestAPITestCase() {
313316

314317
// clearing the config index to prevent other tests using this multi shard index
315318
Thread.sleep(2000L)
316-
deleteIndex(IndexManagementPlugin.INDEX_MANAGEMENT_INDEX)
319+
adminClient().performRequest(deleteISMIndexRequest)
317320
Thread.sleep(2000L)
318321
}
319322
}

‎src/test/kotlin/org/opensearch/indexmanagement/rollup/runner/RollupRunnerIT.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1466,7 +1466,7 @@ class RollupRunnerIT : RollupRestTestCase() {
14661466
// - Source index with pattern mapping to some closed indices
14671467

14681468
private fun deleteRollupMetadata(metadataId: String) {
1469-
val response = client().makeRequest("DELETE", "${IndexManagementPlugin.INDEX_MANAGEMENT_INDEX}/_doc/$metadataId")
1469+
val response = adminClient().makeRequest("DELETE", "${IndexManagementPlugin.INDEX_MANAGEMENT_INDEX}/_doc/$metadataId")
14701470
assertEquals("Unable to delete rollup metadata $metadataId", RestStatus.OK, response.restStatus())
14711471
}
14721472
}

‎src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/SnapshotManagementRestTestCase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ abstract class SnapshotManagementRestTestCase : IndexManagementRestTestCase() {
139139
val startTimeMillis = desiredStartTimeMillis ?: (now().toEpochMilli() - millis)
140140
val waitForActiveShards = if (isMultiNode) "all" else "1"
141141
val response =
142-
client().makeRequest(
142+
adminClient().makeRequest(
143143
"POST", "$INDEX_MANAGEMENT_INDEX/_update/${update.id}?wait_for_active_shards=$waitForActiveShards",
144144
StringEntity(
145145
"{\"doc\":{\"sm_policy\":{\"schedule\":{\"interval\":{\"start_time\":\"$startTimeMillis\"}}}}}",
@@ -171,7 +171,7 @@ abstract class SnapshotManagementRestTestCase : IndexManagementRestTestCase() {
171171
val startTimeMillis = desiredStartTimeMillis ?: (now().toEpochMilli() - millis)
172172
val waitForActiveShards = if (isMultiNode) "all" else "1"
173173
val response =
174-
client().makeRequest(
174+
adminClient().makeRequest(
175175
"POST", "$INDEX_MANAGEMENT_INDEX/_update/${update.metadataID}?wait_for_active_shards=$waitForActiveShards",
176176
StringEntity(
177177
"""

‎src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/resthandler/RestDeleteSnapshotManagementIT.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.indexmanagement.snapshotmanagement.resthandler
77

8+
import org.opensearch.client.Request
89
import org.opensearch.client.ResponseException
910
import org.opensearch.core.rest.RestStatus
1011
import org.opensearch.indexmanagement.IndexManagementPlugin
@@ -38,7 +39,8 @@ class RestDeleteSnapshotManagementIT : SnapshotManagementRestTestCase() {
3839

3940
fun `test deleting a snapshot management policy that doesn't exist and config index doesnt exist`() {
4041
try {
41-
deleteIndex(INDEX_MANAGEMENT_INDEX)
42+
val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
43+
adminClient().performRequest(deleteISMIndexRequest)
4244
client().makeRequest("DELETE", "${IndexManagementPlugin.SM_POLICIES_URI}/nonexistent_policy")
4345
fail("expected 404 ResponseException")
4446
} catch (e: ResponseException) {

‎src/test/kotlin/org/opensearch/indexmanagement/snapshotmanagement/resthandler/RestExplainSnapshotManagementIT.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.indexmanagement.snapshotmanagement.resthandler
77

8+
import org.opensearch.client.Request
89
import org.opensearch.client.ResponseException
910
import org.opensearch.common.xcontent.XContentType
1011
import org.opensearch.core.rest.RestStatus
@@ -141,7 +142,8 @@ class RestExplainSnapshotManagementIT : SnapshotManagementRestTestCase() {
141142

142143
fun `test explain sm policy when config index doesn't exist`() {
143144
try {
144-
deleteIndex(INDEX_MANAGEMENT_INDEX)
145+
val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
146+
adminClient().performRequest(deleteISMIndexRequest)
145147
explainSMPolicy(randomAlphaOfLength(10))
146148
fail("expected response exception")
147149
} catch (e: ResponseException) {

0 commit comments

Comments
 (0)