honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix watcher search template test after #65332 (#65382) 

In #65332, the serialization of the WatcherSearchTemplateRequest class
changed to use IndicesOptions built in XContent facilities. This had
the side effect of fixing the handling of `all` for `expand_wildcards`
to include hidden indices. However, the tests in WatcherUtilsTests were
missed. This change updates those tests.

Backport of #65379
This commit is contained in:
Jay Modi 2020-11-24 09:04:42 -07:00 committed by GitHub
parent 87d74b27af
commit 419bda5c15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherUtilsTests.java
View File

@ -37,6 +37,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.xpack.core.watcher.support.WatcherDateTimeUtils.formatDate; import static org.elasticsearch.xpack.core.watcher.support.WatcherDateTimeUtils.formatDate;
import static org.elasticsearch.xpack.core.watcher.support.WatcherUtils.flattenModel; import static org.elasticsearch.xpack.core.watcher.support.WatcherUtils.flattenModel;
import static org.elasticsearch.xpack.watcher.input.search.ExecutableSearchInput.DEFAULT_SEARCH_TYPE; import static org.elasticsearch.xpack.watcher.input.search.ExecutableSearchInput.DEFAULT_SEARCH_TYPE;
import static org.elasticsearch.xpack.watcher.support.search.WatcherSearchTemplateRequest.DEFAULT_INDICES_OPTIONS;
import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.getRandomSupportedSearchType; import static org.elasticsearch.xpack.watcher.test.WatcherTestUtils.getRandomSupportedSearchType;
import static org.hamcrest.Matchers.arrayContainingInAnyOrder; import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
@ -92,7 +93,9 @@ public class WatcherUtilsTests extends ESTestCase {
String[] expectedIndices = generateRandomStringArray(5, 5, true); String[] expectedIndices = generateRandomStringArray(5, 5, true);
String[] expectedTypes = generateRandomStringArray(2, 5, true, false); String[] expectedTypes = generateRandomStringArray(2, 5, true, false);
IndicesOptions expectedIndicesOptions = IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(), IndicesOptions expectedIndicesOptions = IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(),
randomBoolean(), WatcherSearchTemplateRequest.DEFAULT_INDICES_OPTIONS); randomBoolean(), randomBoolean(), DEFAULT_INDICES_OPTIONS.allowAliasesToMultipleIndices(),
DEFAULT_INDICES_OPTIONS.forbidClosedIndices(), DEFAULT_INDICES_OPTIONS.ignoreAliases(),
DEFAULT_INDICES_OPTIONS.ignoreThrottled());
SearchType expectedSearchType = getRandomSupportedSearchType(); SearchType expectedSearchType = getRandomSupportedSearchType();
BytesReference expectedSource = null; BytesReference expectedSource = null;
@ -150,7 +153,6 @@ public class WatcherUtilsTests extends ESTestCase {
} }
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/65397")
public void testDeserializeSearchRequest() throws Exception { public void testDeserializeSearchRequest() throws Exception {
XContentBuilder builder = jsonBuilder().startObject(); XContentBuilder builder = jsonBuilder().startObject();
@ -175,18 +177,14 @@ public class WatcherUtilsTests extends ESTestCase {
} }
} }
IndicesOptions indicesOptions = WatcherSearchTemplateRequest.DEFAULT_INDICES_OPTIONS; IndicesOptions indicesOptions = DEFAULT_INDICES_OPTIONS;
if (randomBoolean()) { if (randomBoolean()) {
indicesOptions = IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(), indicesOptions = IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(),
randomBoolean(), WatcherSearchTemplateRequest.DEFAULT_INDICES_OPTIONS); randomBoolean(), randomBoolean(), indicesOptions.allowAliasesToMultipleIndices(),
builder.startObject("indices_options") indicesOptions.forbidClosedIndices(), indicesOptions.ignoreAliases(), indicesOptions.ignoreThrottled());
.field("allow_no_indices", indicesOptions.allowNoIndices()) builder.startObject("indices_options");
.field("expand_wildcards", indicesOptions.expandWildcardsClosed() && indicesOptions.expandWildcardsOpen() ? "all" : indicesOptions.toXContent(builder, ToXContent.EMPTY_PARAMS);
indicesOptions.expandWildcardsClosed() ? "closed" : builder.endObject();
indicesOptions.expandWildcardsOpen() ? "open" :
"none")
.field("ignore_unavailable", indicesOptions.ignoreUnavailable())
.endObject();
} }
SearchType searchType = SearchType.DEFAULT; SearchType searchType = SearchType.DEFAULT;
@ -248,5 +246,4 @@ public class WatcherUtilsTests extends ESTestCase {
assertWarnings(WatcherSearchTemplateRequest.TYPES_DEPRECATION_MESSAGE); assertWarnings(WatcherSearchTemplateRequest.TYPES_DEPRECATION_MESSAGE);
} }
} }
} }