Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes RestHelper and IndexTemplateClusterPermissionsCheckTest for backport of #1885 : opendistro-1.10 #2014

Closed
wants to merge 1 commit into from
Closed

Fixes RestHelper and IndexTemplateClusterPermissionsCheckTest for backport of #1885 : opendistro-1.10 #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...n/java/com/amazon/opendistroforelasticsearch/security/resolver/IndexResolverReplacer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import java.util.regex.PatternSyntaxException;
import java.util.stream.Collectors;

import org.opensearch.action.admin.indices.template.put.PutComponentTemplateAction;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.action.ActionRequest;
Expand Down Expand Up @@ -768,8 +767,6 @@ private boolean getOrReplaceAllIndices(final Object request, final IndicesProvid
//do nothing
} else if (request instanceof SearchScrollRequest) {
//do nothing
} else if (request instanceof PutComponentTemplateAction.Request) {
// do nothing
} else {
if(log.isDebugEnabled()) {
log.debug(request.getClass() + " not supported (It is likely not a indices related request)");
Expand Down
8 changes: 4 additions & 4 deletions .../amazon/opendistroforelasticsearch/security/IndexTemplateClusterPermissionsCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
* GitHub history for details.
*/

package org.opensearch.security;
package com.amazon.opendistroforelasticsearch.security;

import org.apache.http.HttpStatus;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

import org.opensearch.security.test.SingleClusterTest;
import org.opensearch.security.test.helper.rest.RestHelper;
import org.opensearch.security.test.helper.rest.RestHelper.HttpResponse;
import com.amazon.opendistroforelasticsearch.security.test.SingleClusterTest;
import com.amazon.opendistroforelasticsearch.security.test.helper.rest.RestHelper;
import com.amazon.opendistroforelasticsearch.security.test.helper.rest.RestHelper.HttpResponse;

public class IndexTemplateClusterPermissionsCheckTest extends SingleClusterTest{
private RestHelper rh;
Expand Down
6 changes: 3 additions & 3 deletions ...test/java/com/amazon/opendistroforelasticsearch/security/test/helper/rest/RestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import org.opensearch.security.DefaultObjectMapper;
import org.opensearch.security.test.helper.cluster.ClusterInfo;
import org.opensearch.security.test.helper.file.FileHelper;
import com.amazon.opendistroforelasticsearch.security.DefaultObjectMapper;
import com.amazon.opendistroforelasticsearch.security.test.helper.cluster.ClusterInfo;
import com.amazon.opendistroforelasticsearch.security.test.helper.file.FileHelper;

import static org.junit.jupiter.api.Assertions.fail;

Expand Down