Rest test fixes (#27354)

clintongormley · clintongormley · commit 1caa5c8e32b4 · 2017-11-14T11:14:14.000+01:00
* REST: Rename ingest.processor.grok to ingest.processor_grok
* REST: Rename remote.info to cluster.remote_info
* REST: Fixed bad YAML comments
* REST: Force dummy scripts to be strings, not numbers
* REST: Fix bad YAML in search/110_field_collapsing.yml
* REST: Adjust percentile tests to work with Perl number handling
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml
@@ -158,6 +158,6 @@ teardown:
 ---
 "Test Grok Patterns Retrieval":
   - do:
-      ingest.processor.grok: {}
+      ingest.processor_grok: {}
   - length: { patterns: 303 }
   - match: { patterns.PATH: "(?:%{UNIXPATH}|%{WINPATH})" }
diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
@@ -2,7 +2,7 @@
 "Fetch remote cluster info for existing cluster":
 
   - do:
-      remote.info: {}
+      cluster.remote_info: {}
   - match: { my_remote_cluster.connected: true }
   - match: { my_remote_cluster.num_nodes_connected: 1}
   - match: { my_remote_cluster.max_connections_per_cluster: 1}
@@ -37,7 +37,7 @@
   - match: { hits.hits.0._index: "test_remote_cluster:test_index" }
 
   - do:
-      remote.info: {}
+      cluster.remote_info: {}
   - set: { my_remote_cluster.http_addresses.0: remote_http }
   - match: { test_remote_cluster.http_addresses.0: $remote_http }
 
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.remote_info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.remote_info.json
@@ -1,5 +1,5 @@
 {
-  "remote.info": {
+  "cluster.remote_info": {
     "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html",
     "methods": ["GET"],
     "url": {
@@ -9,4 +9,4 @@
     },
     "body": null
   }
-}
+}
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json
@@ -1,5 +1,5 @@
 {
-  "ingest.processor.grok": {
+  "ingest.processor_grok": {
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html",
     "methods": [ "GET" ],
     "url": {
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml
@@ -4,6 +4,6 @@
       version: " - 5.3.99"
       reason: this API doesn't exist in 5.3.x yet
   - do:
-      remote.info: {}
+      cluster.remote_info: {}
   - is_true: ''
 
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml
@@ -1,7 +1,8 @@
 ---
 "Exists type":
  - skip:
-    version: "5.99.99 - "# this will only run in a mixed cluster environment with at least 1 5.x node
+    # this will only run in a mixed cluster environment with at least 1 5.x node
+    version: "5.99.99 - "
     reason:  multiple types are not supported on 6.x indices onwards
 
  - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml
@@ -2,7 +2,8 @@
 setup:
 
   - skip:
-        version: "5.99.99 - " # this will only run in a mixed cluster environment with at least 1 5.x node
+        # this will only run in a mixed cluster environment with at least 1 5.x node
+        version: "5.99.99 - " 
         reason:  multiple types are not supported on 6.x indices onwards
 
   - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml
@@ -17,8 +17,9 @@
         type:  test
         id:    "1"
         body:  { "foo": "hello world" }
-        refresh: true # make this doc visible in index stats
-
+        # make this doc visible in index stats
+        refresh: true
+ 
   - do:
       get:
         index: logs_search
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml
@@ -1,7 +1,8 @@
 ---
 "IDs":
   - skip:
-        version: "5.99.99 - "# this will only run in a mixed cluster environment with at least 1 5.x node
+        # this will only run in a mixed cluster environment with at least 1 5.x node
+        version: "5.99.99 - "
         reason:  multiple types are not supported on 6.x indices onwards
 
   - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric.yml
@@ -62,27 +62,24 @@ setup:
               percentiles:
                 field: double_field
 
-
-  - match: { hits.total: 4 }
+  - match:  { hits.total: 4 }
   - length: { hits.hits: 4 }
-  - match:
-      aggregations.percentiles_int.values:
-        "1.0": 2.5
-        "5.0": 8.500000000000002
-        "25.0": 38.5
-        "50.0": 76.0
-        "75.0": 113.5
-        "95.0": 143.49999999999997
-        "99.0": 149.5
-  - match:
-      aggregations.percentiles_double.values:
-        "1.0": 2.5
-        "5.0": 8.500000000000002
-        "25.0": 38.5
-        "50.0": 76.0
-        "75.0": 113.5
-        "95.0": 143.49999999999997
-        "99.0": 149.5
+
+  - match:  { aggregations.percentiles_int.values.1\.0: 2.5 }
+  - match:  { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
+  - match:  { aggregations.percentiles_int.values.25\.0: 38.5 }
+  - match:  { aggregations.percentiles_int.values.50\.0: 76.0 }
+  - match:  { aggregations.percentiles_int.values.75\.0: 113.5 }
+  - match:  { aggregations.percentiles_int.values.95\.0: 143.49999999999997 }
+  - match:  { aggregations.percentiles_int.values.99\.0: 149.5 }
+
+  - match:  { aggregations.percentiles_double.values.1\.0: 2.5 }
+  - match:  { aggregations.percentiles_double.values.5\.0: 8.500000000000002 }
+  - match:  { aggregations.percentiles_double.values.25\.0: 38.5 }
+  - match:  { aggregations.percentiles_double.values.50\.0: 76.0 }
+  - match:  { aggregations.percentiles_double.values.75\.0: 113.5 }
+  - match:  { aggregations.percentiles_double.values.95\.0: 143.49999999999997 }
+  - match:  { aggregations.percentiles_double.values.99\.0: 149.5 }
 
   - do:
       search:
@@ -102,24 +99,23 @@ setup:
 
   - match: { hits.total: 4 }
   - length: { hits.hits: 4 }
-  - match:
-      aggregations.percentiles_int.values:
-        "1.0": 2.5
-        "5.0": 8.500000000000002
-        "25.0": 38.5
-        "50.0": 76.0
-        "75.0": 113.5
-        "95.0": 143.49999999999997
-        "99.0": 149.5
-  - match:
-      aggregations.percentiles_double.values:
-        "1.0": 2.5
-        "5.0": 8.500000000000002
-        "25.0": 38.5
-        "50.0": 76.0
-        "75.0": 113.5
-        "95.0": 143.49999999999997
-        "99.0": 149.5
+
+  - match:  { aggregations.percentiles_int.values.1\.0: 2.5 }
+  - match:  { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
+  - match:  { aggregations.percentiles_int.values.25\.0: 38.5 }
+  - match:  { aggregations.percentiles_int.values.50\.0: 76.0 }
+  - match:  { aggregations.percentiles_int.values.75\.0: 113.5 }
+  - match:  { aggregations.percentiles_int.values.95\.0: 143.49999999999997 }
+  - match:  { aggregations.percentiles_int.values.99\.0: 149.5 }
+
+  - match:  { aggregations.percentiles_double.values.1\.0: 2.5 }
+  - match:  { aggregations.percentiles_double.values.5\.0: 8.500000000000002 }
+  - match:  { aggregations.percentiles_double.values.25\.0: 38.5 }
+  - match:  { aggregations.percentiles_double.values.50\.0: 76.0 }
+  - match:  { aggregations.percentiles_double.values.75\.0: 113.5 }
+  - match:  { aggregations.percentiles_double.values.95\.0: 143.49999999999997 }
+  - match:  { aggregations.percentiles_double.values.99\.0: 149.5 }
+
 
 ---
 "Only aggs test":
@@ -138,24 +134,24 @@ setup:
 
   - match: { hits.total: 4 }
   - length: { hits.hits: 0 }
-  - match:
-      aggregations.percentiles_int.values:
-        "1.0": 2.5
-        "5.0": 8.500000000000002
-        "25.0": 38.5
-        "50.0": 76.0
-        "75.0": 113.5
-        "95.0": 143.49999999999997
-        "99.0": 149.5
-  - match:
-      aggregations.percentiles_double.values:
-        "1.0": 2.5
-        "5.0": 8.500000000000002
-        "25.0": 38.5
-        "50.0": 76.0
-        "75.0": 113.5
-        "95.0": 143.49999999999997
-        "99.0": 149.5
+
+  - match:  { aggregations.percentiles_int.values.1\.0: 2.5 }
+  - match:  { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
+  - match:  { aggregations.percentiles_int.values.25\.0: 38.5 }
+  - match:  { aggregations.percentiles_int.values.50\.0: 76.0 }
+  - match:  { aggregations.percentiles_int.values.75\.0: 113.5 }
+  - match:  { aggregations.percentiles_int.values.95\.0: 143.49999999999997 }
+  - match:  { aggregations.percentiles_int.values.99\.0: 149.5 }
+
+  - match:  { aggregations.percentiles_double.values.1\.0: 2.5 }
+  - match:  { aggregations.percentiles_double.values.5\.0: 8.500000000000002 }
+  - match:  { aggregations.percentiles_double.values.25\.0: 38.5 }
+  - match:  { aggregations.percentiles_double.values.50\.0: 76.0 }
+  - match:  { aggregations.percentiles_double.values.75\.0: 113.5 }
+  - match:  { aggregations.percentiles_double.values.95\.0: 143.49999999999997 }
+  - match:  { aggregations.percentiles_double.values.99\.0: 149.5 }
+
+
 
 ---
 "Filtered test":
@@ -179,24 +175,22 @@ setup:
 
   - match: { hits.total: 3 }
   - length: { hits.hits: 3 }
-  - match:
-        aggregations.percentiles_int.values:
-            "1.0": 52.0
-            "5.0": 56.0
-            "25.0": 76.0
-            "50.0": 101.0
-            "75.0": 126.0
-            "95.0": 146.0
-            "99.0": 150.0
-  - match:
-          aggregations.percentiles_double.values:
-            "1.0": 52.0
-            "5.0": 56.0
-            "25.0": 76.0
-            "50.0": 101.0
-            "75.0": 126.0
-            "95.0": 146.0
-            "99.0": 150.0
+
+  - match:  { aggregations.percentiles_int.values.1\.0: 52.0 }
+  - match:  { aggregations.percentiles_int.values.5\.0: 56.0 }
+  - match:  { aggregations.percentiles_int.values.25\.0: 76.0 }
+  - match:  { aggregations.percentiles_int.values.50\.0: 101.0 }
+  - match:  { aggregations.percentiles_int.values.75\.0: 126.0 }
+  - match:  { aggregations.percentiles_int.values.95\.0: 146.0 }
+  - match:  { aggregations.percentiles_int.values.99\.0: 150.0 }
+
+  - match:  { aggregations.percentiles_double.values.1\.0: 52.0 }
+  - match:  { aggregations.percentiles_double.values.5\.0: 56.0 }
+  - match:  { aggregations.percentiles_double.values.25\.0: 76.0 }
+  - match:  { aggregations.percentiles_double.values.50\.0: 101.0 }
+  - match:  { aggregations.percentiles_double.values.75\.0: 126.0 }
+  - match:  { aggregations.percentiles_double.values.95\.0: 146.0 }
+  - match:  { aggregations.percentiles_double.values.99\.0: 150.0 }
 
 ---
 "Missing field with missing param":
@@ -212,15 +206,14 @@ setup:
 
   - match: { hits.total: 4 }
   - length: { hits.hits: 4 }
-  - match:
-      aggregations.percentiles_missing.values:
-        "1.0": 1.0
-        "5.0": 1.0
-        "25.0": 1.0
-        "50.0": 1.0
-        "75.0": 1.0
-        "95.0": 1.0
-        "99.0": 1.0
+
+  - match:  { aggregations.percentiles_missing.values.1\.0: 1.0 }
+  - match:  { aggregations.percentiles_missing.values.5\.0: 1.0 }
+  - match:  { aggregations.percentiles_missing.values.25\.0: 1.0 }
+  - match:  { aggregations.percentiles_missing.values.50\.0: 1.0 }
+  - match:  { aggregations.percentiles_missing.values.75\.0: 1.0 }
+  - match:  { aggregations.percentiles_missing.values.95\.0: 1.0 }
+  - match:  { aggregations.percentiles_missing.values.99\.0: 1.0 }
 
 ---
 "Missing field without missing param":
@@ -253,15 +246,15 @@ setup:
   - match: { hits.total: 4 }
   - length: { hits.hits: 4 }
   - match: { aggregations.percentiles_int.meta.foo: "bar" }
-  - match:
-      aggregations.percentiles_int.values:
-        "1.0": 2.5
-        "5.0": 8.500000000000002
-        "25.0": 38.5
-        "50.0": 76.0
-        "75.0": 113.5
-        "95.0": 143.49999999999997
-        "99.0": 149.5
+
+
+  - match:  { aggregations.percentiles_int.values.1\.0: 2.5 }
+  - match:  { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
+  - match:  { aggregations.percentiles_int.values.25\.0: 38.5 }
+  - match:  { aggregations.percentiles_int.values.50\.0: 76.0 }
+  - match:  { aggregations.percentiles_int.values.75\.0: 113.5 }
+  - match:  { aggregations.percentiles_int.values.95\.0: 143.49999999999997 }
+  - match:  { aggregations.percentiles_int.values.99\.0: 149.5 }
 
 ---
 "Invalid params test":
@@ -335,16 +328,14 @@ setup:
 
   - match: { hits.total: 4 }
   - length: { hits.hits: 4 }
-  - match:
-      aggregations.percentiles_int.values:
-        5.0: 8.500000000000002
-        25.0: 38.5
-        50.0: 76.0
-  - match:
-      aggregations.percentiles_double.values:
-        5.0: 8.500000000000002
-        25.0: 38.5
-        50.0: 76.0
+
+  - match:  { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
+  - match:  { aggregations.percentiles_int.values.25\.0: 38.5 }
+  - match:  { aggregations.percentiles_int.values.50\.0: 76.0 }
+
+  - match:  { aggregations.percentiles_double.values.5\.0: 8.500000000000002 }
+  - match: { aggregations.percentiles_double.values.25\.0: 38.5 }
+  - match: { aggregations.percentiles_double.values.50\.0: 76.0 }
 
 ---
 "Non-keyed test":
@@ -362,14 +353,13 @@ setup:
 
   - match: { hits.total: 4 }
   - length: { hits.hits: 4 }
-  - match:
-      aggregations.percentiles_int.values:
-        - key: 5.0
-          value: 8.500000000000002
-        - key: 25.0
-          value: 38.5
-        - key: 50.0
-          value: 76.0
+
+  - match:  { aggregations.percentiles_int.values.0.key:  5.0 }
+  - match:  { aggregations.percentiles_int.values.0.value:  8.500000000000002 }
+  - match:  { aggregations.percentiles_int.values.1.key:  25.0 }
+  - match:  { aggregations.percentiles_int.values.1.value:  38.5 }
+  - match:  { aggregations.percentiles_int.values.2.key:  50.0 }
+  - match:  { aggregations.percentiles_int.values.2.value:  76.0 }
 
 
 
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "remote.info": {`
	`2`	`+ "cluster.remote_info": {`
`3`	`3`	`"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html",`
`4`	`4`	`"methods": ["GET"],`
`5`	`5`	`"url": {`
`@@ -9,4 +9,4 @@`
`9`	`9`	`},`
`10`	`10`	`"body": null`
`11`	`11`	`}`
`12`		`-}`
	`12`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "ingest.processor.grok": {`
	`2`	`+ "ingest.processor_grok": {`
`3`	`3`	`"documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html",`
`4`	`4`	`"methods": [ "GET" ],`
`5`	`5`	`"url": {`