[TEST] Improve validation of do sections (#34734)

We throw parsing exception when an unknown array is found, but we don't when an unknown top-level field is found. This commit makes sure that unsupported top-level fields are not ignored in a do section. Closes #34651
elastic · Nov 1, 2018 · 5a5166a · 5a5166a
1 parent fbb5c10
commit 5a5166a
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 20 deletions.
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml
@@ -23,8 +23,8 @@
         indices.refresh: {}
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     script:
@@ -45,8 +45,8 @@
     - match: { hits.hits.1.fields.sNum1.0: 3.0 }
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     script:
@@ -70,8 +70,8 @@
     - match: { hits.hits.1.fields.sNum1.0: 3.0 }
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     script:
@@ -96,8 +96,8 @@
     - match: { hits.hits.2.fields.sNum1.0: 3.0 }
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     script:
@@ -127,8 +127,8 @@
         indices.refresh: {}
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     function_score:
@@ -149,8 +149,8 @@
     - match: { hits.hits.1._id: "1" }
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     function_score:
@@ -171,8 +171,8 @@
     - match: { hits.hits.1._id: "2" }
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     function_score:
@@ -193,8 +193,8 @@
     - match: { hits.hits.1._id: "1" }
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     function_score:
@@ -215,8 +215,8 @@
     - match: { hits.hits.1._id: "1" }
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     function_score:
@@ -237,8 +237,8 @@
     - match: { hits.hits.1._id: "1" }
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     function_score:
@@ -274,8 +274,8 @@
         indices.refresh: {}
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     function_score:
@@ -325,8 +325,8 @@
 
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     function_score:
@@ -364,8 +364,8 @@
 
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 script_fields:
                     foobar:
@@ -391,8 +391,8 @@
 
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 aggs:
                     value_agg:
@@ -428,8 +428,8 @@
 
     - do:
         catch: bad_request
-        index: test
         search:
+            index: test
             body:
                 aggs:
                     genre:

diff --git a/...nless-whitelist/src/test/resources/rest-api-spec/test/painless_whitelist/20_whitelist.yml b/...nless-whitelist/src/test/resources/rest-api-spec/test/painless_whitelist/20_whitelist.yml
@@ -11,8 +11,8 @@
         indices.refresh: {}
 
     - do:
-        index: test
         search:
+            index: test
             body:
                 query:
                     match_all: {}

diff --git a/...painless-whitelist/src/test/resources/rest-api-spec/test/painless_whitelist/30_static.yml b/...painless-whitelist/src/test/resources/rest-api-spec/test/painless_whitelist/30_static.yml
@@ -11,8 +11,8 @@
     indices.refresh: {}
 
 - do:
-    index: test
     search:
+      index: test
       body:
         query:
           match_all: {}

diff --git a/...inless-whitelist/src/test/resources/rest-api-spec/test/painless_whitelist/40_instance.yml b/...inless-whitelist/src/test/resources/rest-api-spec/test/painless_whitelist/40_instance.yml
@@ -11,8 +11,8 @@
     indices.refresh: {}
 
 - do:
-    index: test
     search:
+      index: test
       body:
         query:
           match_all: {}
@@ -26,8 +26,8 @@
 - match: { hits.hits.0.fields.sNum1.0: 2 }
 
 - do:
-    index: test
     search:
+      index: test
       body:
         query:
           match_all: {}

diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java
@@ -106,6 +106,8 @@ public static DoSection parse(XContentParser parser) throws IOException {
             } else if (token.isValue()) {
                 if ("catch".equals(currentFieldName)) {
                     doSection.setCatch(parser.text());
+                } else {
+                    throw new ParsingException(parser.getTokenLocation(), "unsupported field [" + currentFieldName + "]");
                 }
             } else if (token == XContentParser.Token.START_ARRAY) {
                 if ("warnings".equals(currentFieldName)) {

diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java
@@ -22,6 +22,7 @@
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.Node;
 import org.elasticsearch.client.NodeSelector;
+import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.xcontent.XContent;
 import org.elasticsearch.common.xcontent.XContentLocation;
@@ -52,7 +53,7 @@
 
 public class DoSectionTests extends AbstractClientYamlTestFragmentParserTestCase {
 
-    public void testWarningHeaders() throws IOException {
+    public void testWarningHeaders() {
         {
             final DoSection section = new DoSection(new XContentLocation(1, 1));
 
@@ -424,6 +425,17 @@ public void testParseDoSectionWithCatch() throws Exception {
         assertThat(doSection.getApiCallSection().hasBody(), equalTo(false));
     }
 
+    public void testUnsupportedTopLevelField() throws Exception {
+        parser = createParser(YamlXContent.yamlXContent,
+            "max_concurrent_shard_requests: 1"
+        );
+
+        ParsingException e = expectThrows(ParsingException.class, () -> DoSection.parse(parser));
+        assertThat(e.getMessage(), is("unsupported field [max_concurrent_shard_requests]"));
+        parser.nextToken();
+        parser.nextToken();
+    }
+
     public void testParseDoSectionWithHeaders() throws Exception {
         parser = createParser(YamlXContent.yamlXContent,
                 "headers:\n" +