cleanup bug fix, it will be fixed in scope of other task

Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
MaciejMierzwa · Nov 15, 2023 · 413327c · 413327c
1 parent 129bae2
commit 413327c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 37 deletions.
diff --git a/src/integrationTest/java/org/opensearch/security/SearchOperationTest.java b/src/integrationTest/java/org/opensearch/security/SearchOperationTest.java
@@ -25,12 +25,11 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.opensearch.action.admin.cluster.health.ClusterHealthRequest;
-import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.opensearch.action.admin.cluster.repositories.delete.DeleteRepositoryRequest;
 import org.opensearch.action.admin.cluster.repositories.put.PutRepositoryRequest;
 import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
@@ -88,7 +87,6 @@
 import org.opensearch.client.indices.PutMappingRequest;
 import org.opensearch.client.indices.ResizeRequest;
 import org.opensearch.client.indices.ResizeResponse;
-import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.IndexTemplateMetadata;
 import org.opensearch.common.settings.Settings;
@@ -126,7 +124,6 @@
 import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
 import static org.opensearch.client.RequestOptions.DEFAULT;
 import static org.opensearch.core.rest.RestStatus.ACCEPTED;
-import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
 import static org.opensearch.core.rest.RestStatus.FORBIDDEN;
 import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
 import static org.opensearch.rest.RestRequest.Method.DELETE;
@@ -2373,32 +2370,21 @@ public void openIndex_negative() throws IOException {
     }
 
     @Test
+    @Ignore
+    // required permissions: "indices:admin/resize", "indices:monitor/stats
+    // todo even when I assign the `indices:admin/resize` and `indices:monitor/stats` permissions to test user, this test fails.
+    // Issue: https://github.com/opensearch-project/security/issues/2141
     public void shrinkIndex_positive() throws IOException {
         String sourceIndexName = INDICES_ON_WHICH_USER_CAN_PERFORM_INDEX_OPERATIONS_PREFIX.concat("shrink_index_positive_source");
+        Settings sourceIndexSettings = Settings.builder().put("index.blocks.write", true).put("index.number_of_shards", 2).build();
         String targetIndexName = INDICES_ON_WHICH_USER_CAN_PERFORM_INDEX_OPERATIONS_PREFIX.concat("shrink_index_positive_target");
-        Settings sourceIndexSettings = Settings.builder()
-            .put("index.number_of_replicas", 1)
-            .put("index.blocks.write", true)
-            .put("index.number_of_shards", 4)
-            .build();
         IndexOperationsHelper.createIndex(cluster, sourceIndexName, sourceIndexSettings);
 
         try (
             RestHighLevelClient restHighLevelClient = cluster.getRestHighLevelClient(
                 USER_ALLOWED_TO_PERFORM_INDEX_OPERATIONS_ON_SELECTED_INDICES
             )
         ) {
-            ClusterHealthResponse healthResponse = restHighLevelClient.cluster()
-                .health(
-                    new ClusterHealthRequest(sourceIndexName).waitForNoRelocatingShards(true)
-                        .waitForActiveShards(4)
-                        .waitForNoInitializingShards(true)
-                        .waitForGreenStatus(),
-                    DEFAULT
-                );
-
-            assertThat(healthResponse.getStatus(), is(ClusterHealthStatus.GREEN));
-
             ResizeRequest resizeRequest = new ResizeRequest(targetIndexName, sourceIndexName);
             ResizeResponse response = restHighLevelClient.indices().shrink(resizeRequest, DEFAULT);
 
@@ -2441,6 +2427,7 @@ public void shrinkIndex_negative() throws IOException {
     }
 
     @Test
+    @Ignore
     // required permissions: "indices:admin/resize", "indices:monitor/stats
     // todo even when I assign the `indices:admin/resize` and `indices:monitor/stats` permissions to test user, this test fails.
     // Issue: https://github.com/opensearch-project/security/issues/2141
@@ -2460,10 +2447,6 @@ public void cloneIndex_positive() throws IOException {
 
             assertThat(response, isSuccessfulResizeResponse(targetIndexName));
             assertThat(cluster, indexExists(targetIndexName));
-
-            // can't clone the same index twice, target already exists
-            ResizeRequest repeatResizeRequest = new ResizeRequest(targetIndexName, sourceIndexName);
-            assertThatThrownBy(() -> restHighLevelClient.indices().clone(repeatResizeRequest, DEFAULT), statusException(BAD_REQUEST));
         }
     }
 
@@ -2501,6 +2484,7 @@ public void cloneIndex_negative() throws IOException {
     }
 
     @Test
+    @Ignore
     // required permissions: "indices:admin/resize", "indices:monitor/stats
     // todo even when I assign the `indices:admin/resize` and `indices:monitor/stats` permissions to test user, this test fails.
     // Issue: https://github.com/opensearch-project/security/issues/2141

diff --git a/src/main/java/org/opensearch/security/resolver/IndexResolverReplacer.java b/src/main/java/org/opensearch/security/resolver/IndexResolverReplacer.java
@@ -56,7 +56,6 @@
 import org.opensearch.action.admin.indices.datastream.CreateDataStreamAction;
 import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.opensearch.action.admin.indices.resolve.ResolveIndexAction;
-import org.opensearch.action.admin.indices.shrink.ResizeRequest;
 import org.opensearch.action.admin.indices.template.put.PutComponentTemplateAction;
 import org.opensearch.action.bulk.BulkRequest;
 import org.opensearch.action.bulk.BulkShardRequest;
@@ -778,18 +777,6 @@ private boolean getOrReplaceAllIndices(final Object request, final IndicesProvid
                 return false;
             }
             ((CreateIndexRequest) request).index(newIndices.length != 1 ? null : newIndices[0]);
-        } else if (request instanceof ResizeRequest) {
-            // clone or shrink operations
-            String[] newIndicesSource = provider.provide(((ResizeRequest) request).indices(), request, true);
-            String[] newIndicesTarget = provider.provide(((ResizeRequest) request).getTargetIndexRequest().indices(), request, true);
-            List<String> newIndices = new ArrayList<>(newIndicesSource.length + newIndicesTarget.length);
-            Collections.addAll(newIndices, newIndicesSource);
-            Collections.addAll(newIndices, newIndicesTarget);
-
-            // TODO check if this can be removed, return value is ignored in case of copy operation
-            if (checkIndices(request, newIndices.toArray(new String[0]), true, allowEmptyIndices) == false) {
-                return false;
-            }
         } else if (request instanceof CreateDataStreamAction.Request) {
             provider.provide(((CreateDataStreamAction.Request) request).indices(), request, false);
         } else if (request instanceof ReindexRequest) {