Revert "Permissive warnings handler"

This reverts commit 7c82470. Signed-off-by: Craig Perkins <[email protected]>
opensearch-project · Nov 27, 2024 · c663da7 · c663da7
1 parent 94d808b
commit c663da7
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 57 deletions.
diff --git a/...g/opensearch/indexmanagement/indexstatemanagement/resthandler/RestChangePolicyActionIT.kt b/...g/opensearch/indexmanagement/indexstatemanagement/resthandler/RestChangePolicyActionIT.kt
@@ -7,9 +7,7 @@ package org.opensearch.indexmanagement.indexstatemanagement.resthandler
 
 import org.junit.Before
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.common.settings.Settings
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
@@ -94,9 +92,6 @@ class RestChangePolicyActionIT : IndexStateManagementRestTestCase() {
     fun `test nonexistent ism config index`() {
         if (indexExists(INDEX_MANAGEMENT_INDEX)) {
             val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-            val options = RequestOptions.DEFAULT.toBuilder()
-            options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-            deleteISMIndexRequest.options = options.build()
             adminClient().performRequest(deleteISMIndexRequest)
         }
         try {

diff --git a/src/test/kotlin/org/opensearch/indexmanagement/rollup/resthandler/RestStartRollupActionIT.kt b/src/test/kotlin/org/opensearch/indexmanagement/rollup/resthandler/RestStartRollupActionIT.kt
@@ -6,9 +6,7 @@
 package org.opensearch.indexmanagement.rollup.resthandler
 
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.common.settings.Settings
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementIndices
@@ -205,9 +203,6 @@ class RestStartRollupActionIT : RollupRestAPITestCase() {
     fun `test start rollup when multiple shards configured for IM config index`() {
         // setup ism-config index with multiple primary shards
         val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-        val options = RequestOptions.DEFAULT.toBuilder()
-        options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-        deleteISMIndexRequest.options = options.build()
         adminClient().performRequest(deleteISMIndexRequest)
         val mapping = IndexManagementIndices.indexManagementMappings.trim().trimStart('{').trimEnd('}')
         val settings =

diff --git a/src/test/kotlin/org/opensearch/indexmanagement/rollup/resthandler/RestStopRollupActionIT.kt b/src/test/kotlin/org/opensearch/indexmanagement/rollup/resthandler/RestStopRollupActionIT.kt
@@ -6,9 +6,7 @@
 package org.opensearch.indexmanagement.rollup.resthandler
 
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.common.settings.Settings
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementIndices
@@ -261,9 +259,6 @@ class RestStopRollupActionIT : RollupRestAPITestCase() {
     fun `test stop rollup when multiple shards configured for IM config index`() {
         // setup ism-config index with multiple primary shards
         val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-        val options = RequestOptions.DEFAULT.toBuilder()
-        options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-        deleteISMIndexRequest.options = options.build()
         adminClient().performRequest(deleteISMIndexRequest)
         val mapping = IndexManagementIndices.indexManagementMappings.trim().trimStart('{').trimEnd('}')
         val settings =

diff --git a/...ensearch/indexmanagement/snapshotmanagement/resthandler/RestDeleteSnapshotManagementIT.kt b/...ensearch/indexmanagement/snapshotmanagement/resthandler/RestDeleteSnapshotManagementIT.kt
@@ -6,9 +6,7 @@
 package org.opensearch.indexmanagement.snapshotmanagement.resthandler
 
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
@@ -42,9 +40,6 @@ class RestDeleteSnapshotManagementIT : SnapshotManagementRestTestCase() {
     fun `test deleting a snapshot management policy that doesn't exist and config index doesnt exist`() {
         try {
             val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-            val options = RequestOptions.DEFAULT.toBuilder()
-            options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-            deleteISMIndexRequest.options = options.build()
             adminClient().performRequest(deleteISMIndexRequest)
             client().makeRequest("DELETE", "${IndexManagementPlugin.SM_POLICIES_URI}/nonexistent_policy")
             fail("expected 404 ResponseException")

diff --git a/...nsearch/indexmanagement/snapshotmanagement/resthandler/RestExplainSnapshotManagementIT.kt b/...nsearch/indexmanagement/snapshotmanagement/resthandler/RestExplainSnapshotManagementIT.kt
@@ -6,9 +6,7 @@
 package org.opensearch.indexmanagement.snapshotmanagement.resthandler
 
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.common.xcontent.XContentType
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
@@ -145,9 +143,6 @@ class RestExplainSnapshotManagementIT : SnapshotManagementRestTestCase() {
     fun `test explain sm policy when config index doesn't exist`() {
         try {
             val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-            val options = RequestOptions.DEFAULT.toBuilder()
-            options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-            deleteISMIndexRequest.options = options.build()
             adminClient().performRequest(deleteISMIndexRequest)
             explainSMPolicy(randomAlphaOfLength(10))
             fail("expected response exception")

diff --git a/.../opensearch/indexmanagement/snapshotmanagement/resthandler/RestGetSnapshotManagementIT.kt b/.../opensearch/indexmanagement/snapshotmanagement/resthandler/RestGetSnapshotManagementIT.kt
@@ -8,9 +8,7 @@ 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.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
@@ -53,9 +51,6 @@ class RestGetSnapshotManagementIT : SnapshotManagementRestTestCase() {
     fun `test getting a snapshot management policy that doesn't exist and config index doesnt exist`() {
         try {
             val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-            val options = RequestOptions.DEFAULT.toBuilder()
-            options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-            deleteISMIndexRequest.options = options.build()
             adminClient().performRequest(deleteISMIndexRequest)
             getSMPolicy(randomAlphaOfLength(20))
             fail("expected response exception")

diff --git a/...pensearch/indexmanagement/snapshotmanagement/resthandler/RestIndexSnapshotManagementIT.kt b/...pensearch/indexmanagement/snapshotmanagement/resthandler/RestIndexSnapshotManagementIT.kt
@@ -6,9 +6,7 @@
 package org.opensearch.indexmanagement.snapshotmanagement.resthandler
 
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.common.xcontent.XContentType
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
@@ -134,9 +132,6 @@ class RestIndexSnapshotManagementIT : SnapshotManagementRestTestCase() {
     @Suppress("UNCHECKED_CAST")
     fun `test mappings after sm policy creation`() {
         val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-        val options = RequestOptions.DEFAULT.toBuilder()
-        options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-        deleteISMIndexRequest.options = options.build()
         adminClient().performRequest(deleteISMIndexRequest)
         createSMPolicy(randomSMPolicy())
 

diff --git a/...pensearch/indexmanagement/snapshotmanagement/resthandler/RestStartSnapshotManagementIT.kt b/...pensearch/indexmanagement/snapshotmanagement/resthandler/RestStartSnapshotManagementIT.kt
@@ -6,9 +6,7 @@
 package org.opensearch.indexmanagement.snapshotmanagement.resthandler
 
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
@@ -63,11 +61,8 @@ class RestStartSnapshotManagementIT : SnapshotManagementRestTestCase() {
 
     fun `test starting a snapshot management policy with no config index fails`() {
         try {
-            val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-            val options = RequestOptions.DEFAULT.toBuilder()
-            options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-            deleteISMIndexRequest.options = options.build()
-            adminClient().performRequest(deleteISMIndexRequest)
+            val request = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
+            adminClient().performRequest(request)
             client().makeRequest("POST", "${IndexManagementPlugin.SM_POLICIES_URI}/nonexistent_foo/_start")
             fail("expected response exception")
         } catch (e: ResponseException) {

diff --git a/...opensearch/indexmanagement/snapshotmanagement/resthandler/RestStopSnapshotManagementIT.kt b/...opensearch/indexmanagement/snapshotmanagement/resthandler/RestStopSnapshotManagementIT.kt
@@ -6,9 +6,7 @@
 package org.opensearch.indexmanagement.snapshotmanagement.resthandler
 
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
@@ -64,9 +62,6 @@ class RestStopSnapshotManagementIT : SnapshotManagementRestTestCase() {
     fun `test stopping a snapshot management policy with no config index fails`() {
         try {
             val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-            val options = RequestOptions.DEFAULT.toBuilder()
-            options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-            deleteISMIndexRequest.options = options.build()
             adminClient().performRequest(deleteISMIndexRequest)
             client().makeRequest("POST", "${IndexManagementPlugin.SM_POLICIES_URI}/nonexistent_foo/_stop")
             fail("expected response exception")

diff --git a/...otlin/org/opensearch/indexmanagement/transform/resthandler/RestDeleteTransformActionIT.kt b/...otlin/org/opensearch/indexmanagement/transform/resthandler/RestDeleteTransformActionIT.kt
@@ -6,9 +6,7 @@
 package org.opensearch.indexmanagement.transform.resthandler
 
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.TRANSFORM_BASE_URI
@@ -81,9 +79,6 @@ class RestDeleteTransformActionIT : TransformRestTestCase() {
         try {
             if (indexExists(INDEX_MANAGEMENT_INDEX)) {
                 val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-                val options = RequestOptions.DEFAULT.toBuilder()
-                options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-                deleteISMIndexRequest.options = options.build()
                 adminClient().performRequest(deleteISMIndexRequest)
             }
             val res = client().makeRequest("DELETE", "$TRANSFORM_BASE_URI/foobarbaz")

diff --git a/...tlin/org/opensearch/indexmanagement/transform/resthandler/RestExplainTransformActionIT.kt b/...tlin/org/opensearch/indexmanagement/transform/resthandler/RestExplainTransformActionIT.kt
@@ -7,9 +7,7 @@ package org.opensearch.indexmanagement.transform.resthandler
 
 import org.junit.Assert
 import org.opensearch.client.Request
-import org.opensearch.client.RequestOptions
 import org.opensearch.client.ResponseException
-import org.opensearch.client.WarningsHandler
 import org.opensearch.core.rest.RestStatus
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.INDEX_MANAGEMENT_INDEX
 import org.opensearch.indexmanagement.IndexManagementPlugin.Companion.TRANSFORM_BASE_URI
@@ -164,9 +162,6 @@ class RestExplainTransformActionIT : TransformRestTestCase() {
     @Throws(Exception::class)
     fun `test explain transform when config doesnt exist`() {
         val deleteISMIndexRequest = Request("DELETE", "/$INDEX_MANAGEMENT_INDEX")
-        val options = RequestOptions.DEFAULT.toBuilder()
-        options.setWarningsHandler(WarningsHandler.PERMISSIVE)
-        deleteISMIndexRequest.options = options.build()
         adminClient().performRequest(deleteISMIndexRequest)
         val responseExplicit = client().makeRequest("GET", "$TRANSFORM_BASE_URI/no_config_some_transform/_explain")
         val expectedResponse = mapOf("no_config_some_transform" to "Failed to search transform metadata")