Fix more tests

Signed-off-by: Craig Perkins <cwperx@amazon.com>
opensearch-project · Sep 10, 2024 · 0248bd4 · 0248bd4
1 parent bde39fd
commit 0248bd4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/...ensearch/indexmanagement/snapshotmanagement/resthandler/RestDeleteSnapshotManagementIT.kt b/...ensearch/indexmanagement/snapshotmanagement/resthandler/RestDeleteSnapshotManagementIT.kt
@@ -5,6 +5,7 @@
 
 package org.opensearch.indexmanagement.snapshotmanagement.resthandler
 
+import org.opensearch.client.Request
 import org.opensearch.client.ResponseException
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin
@@ -38,7 +39,8 @@ class RestDeleteSnapshotManagementIT : SnapshotManagementRestTestCase() {
 
  fun `test deleting a snapshot management policy that doesn't exist and config index doesnt exist`() {
  try {
- deleteIndex(INDEX_MANAGEMENT_INDEX)
+ val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
+ adminClient().performRequest(deleteISMIndexRequest)
  client().makeRequest("DELETE", "${IndexManagementPlugin.SM_POLICIES_URI}/nonexistent_policy")
  fail("expected 404 ResponseException")
  } catch (e: ResponseException) {

diff --git a/.../opensearch/indexmanagement/snapshotmanagement/resthandler/RestGetSnapshotManagementIT.kt b/.../opensearch/indexmanagement/snapshotmanagement/resthandler/RestGetSnapshotManagementIT.kt
@@ -7,9 +7,11 @@ package org.opensearch.indexmanagement.snapshotmanagement.resthandler
 
 import org.apache.hc.core5.http.HttpHeaders
 import org.apache.hc.core5.http.message.BasicHeader
+import org.opensearch.client.Request
 import org.opensearch.client.ResponseException
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin
+import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
 import org.opensearch.indexmanagement.makeRequest
 import org.opensearch.indexmanagement.opensearchapi.convertToMap
 import org.opensearch.indexmanagement.snapshotmanagement.SnapshotManagementRestTestCase
@@ -48,7 +50,8 @@ class RestGetSnapshotManagementIT : SnapshotManagementRestTestCase() {
  @Throws(Exception::class)
  fun `test getting a snapshot management policy that doesn't exist and config index doesnt exist`() {
  try {
- deleteIndex(IndexManagementPlugin.INDEX_MANAGEMENT_INDEX)
+ val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
+ adminClient().performRequest(deleteISMIndexRequest)
  getSMPolicy(randomAlphaOfLength(20))
  fail("expected response exception")
  } catch (e: ResponseException) {

diff --git a/...otlin/org/opensearch/indexmanagement/transform/resthandler/RestDeleteTransformActionIT.kt b/...otlin/org/opensearch/indexmanagement/transform/resthandler/RestDeleteTransformActionIT.kt
@@ -5,6 +5,7 @@
 
 package org.opensearch.indexmanagement.transform.resthandler
 
+import org.opensearch.client.Request
 import org.opensearch.client.ResponseException
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
@@ -76,7 +77,10 @@ class RestDeleteTransformActionIT : TransformRestTestCase() {
  @Throws(Exception::class)
  fun `test deleting a transform that doesn't exist and config index doesn't exist`() {
  try {
- if (indexExists(INDEX_MANAGEMENT_INDEX)) deleteIndex(INDEX_MANAGEMENT_INDEX)
+ if (indexExists(INDEX_MANAGEMENT_INDEX)) {
+ val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
+ adminClient().performRequest(deleteISMIndexRequest)
+ }
  val res = client().makeRequest("DELETE", "$TRANSFORM_BASE_URI/foobarbaz")
  fail("expected 404 ResponseException: ${res.asMap()}")
  } catch (e: ResponseException) {