diff options
Diffstat (limited to 'rest-api-spec/src/main')
28 files changed, 39 insertions, 38 deletions
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/README.asciidoc b/rest-api-spec/src/main/resources/rest-api-spec/test/README.asciidoc index c822b665ae..c93873a5be 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/README.asciidoc +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/README.asciidoc @@ -163,6 +163,7 @@ be caught and tested. For instance: The argument to `catch` can be any of: [horizontal] +`bad_request`:: a 400 response from ES `unauthorized`:: a 401 response from ES `forbidden`:: a 403 response from ES `missing`:: a 404 response from ES diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml index 0ae24068e6..3a05a9baa7 100755 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml @@ -103,7 +103,7 @@ index: index1 - do: - catch: request + catch: bad_request cat.segments: index: index1 diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yml index f38d2c315e..32256811e0 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yml @@ -58,7 +58,7 @@ setup: --- "count body without query element": - do: - catch: request + catch: bad_request count: index: test body: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml index e220d98816..afd5ea134f 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml @@ -26,7 +26,7 @@ reason: validation logic only fixed from 5.1.2 onwards - do: - catch: request + catch: bad_request create: index: test type: test diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml index e29690fe8d..ac1f1adcc9 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml @@ -6,7 +6,7 @@ reason: validation logic only fixed from 5.1.2 onwards - do: - catch: request + catch: bad_request create: index: test type: test @@ -20,7 +20,7 @@ - match: { error.reason: "Validation Failed: 1: create operations only support internal versioning. use index instead;" } - do: - catch: request + catch: bad_request create: index: test type: test diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/30_parent.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/30_parent.yml index 91fdf027c1..4c92605756 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/30_parent.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/30_parent.yml @@ -31,7 +31,7 @@ setup: "Parent omitted": - do: - catch: request + catch: bad_request exists: index: test_1 type: test diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml index b5a9212d36..5f211435ae 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml @@ -56,7 +56,7 @@ setup: --- "Explain body without query element": - do: - catch: request + catch: bad_request explain: index: test_1 type: test diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/30_parent.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/30_parent.yml index 353dce8fab..04f578b88d 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/30_parent.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/30_parent.yml @@ -34,7 +34,7 @@ setup: --- "Parent omitted": - do: - catch: request + catch: bad_request get: index: test_1 type: test diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/30_parent.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/30_parent.yml index 8c1088e19b..fe589c9823 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/30_parent.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/30_parent.yml @@ -32,7 +32,7 @@ setup: "Parent omitted": - do: - catch: request + catch: bad_request get_source: index: test_1 type: test diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml index 8ac55ec79f..daac81849f 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml @@ -26,7 +26,7 @@ - match: { _source: { foo: bar }} - do: - catch: request + catch: bad_request index: index: idx type: type diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete/10_basic.yml index 40486da9e7..783e65001e 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete/10_basic.yml @@ -14,7 +14,7 @@ setup: version: " - 5.99.0" reason: delete index doesn't support aliases only from 6.0.0 on - do: - catch: request + catch: bad_request indices.delete: index: alias - do: @@ -42,7 +42,7 @@ setup: version: " - 5.99.0" reason: delete index doesn't support aliases only from 6.0.0 on - do: - catch: request + catch: bad_request indices.delete: index: alias,index2 - do: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml index 86a3a44153..992d933326 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml @@ -20,7 +20,7 @@ index: test_index - do: - catch: request + catch: bad_request search: index: test_index diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml index 181e010c95..944338123d 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml @@ -32,7 +32,7 @@ setup: index: _all - do: - catch: request + catch: bad_request search: index: test_index2 @@ -59,7 +59,7 @@ setup: index: test_* - do: - catch: request + catch: bad_request search: index: test_index2 @@ -86,7 +86,7 @@ setup: index: '*' - do: - catch: request + catch: bad_request search: index: test_index3 diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml index 5527c023b1..32a5be6276 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml @@ -39,7 +39,7 @@ index: test_index - do: - catch: request + catch: bad_request indices.put_alias: index: test_index name: test_* @@ -55,7 +55,7 @@ index: foo - do: - catch: request + catch: bad_request indices.put_alias: index: test_index name: foo diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml index 01bd7afc58..e2b15f3bde 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml @@ -100,7 +100,7 @@ - match: {test.settings: {index.number_of_shards: '1', index.number_of_replicas: '0'}} - do: - catch: request + catch: bad_request indices.put_template: name: test create: true diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yml index 3ad2a36833..64d94535a9 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yml @@ -66,7 +66,7 @@ index: index1 - do: - catch: request + catch: bad_request indices.segments: index: index1 diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml index b7724e0628..a0e131024b 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml @@ -106,7 +106,7 @@ setup: version: " - 5.0.99" reason: strict stats handling does not exist in 5.0 - do: - catch: request + catch: bad_request indices.stats: metric: [ fieldata ] diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yml index 62664319d8..07f32ff413 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yml @@ -27,7 +27,7 @@ version: " - 5.0.99" reason: strict stats handling does not exist in 5.0 - do: - catch: request + catch: bad_request nodes.stats: metric: [ transprot ] diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/100_avg_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/100_avg_metric.yml index 2b5201d041..a17bdade65 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/100_avg_metric.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/100_avg_metric.yml @@ -166,7 +166,7 @@ setup: "Aggregating wrong datatype test": - do: - catch: request + catch: bad_request search: body: aggs: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/110_max_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/110_max_metric.yml index abfbcbc394..30b0bafe3b 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/110_max_metric.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/110_max_metric.yml @@ -166,7 +166,7 @@ setup: "Aggregating wrong datatype test": - do: - catch: request + catch: bad_request search: body: aggs: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/120_min_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/120_min_metric.yml index 5e1edaf845..f56719dfe6 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/120_min_metric.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/120_min_metric.yml @@ -166,7 +166,7 @@ setup: "Aggregating wrong datatype test": - do: - catch: request + catch: bad_request search: body: aggs: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/130_sum_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/130_sum_metric.yml index 1ce2c01386..9fbb15fdab 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/130_sum_metric.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/130_sum_metric.yml @@ -166,7 +166,7 @@ setup: "Aggregating wrong datatype test": - do: - catch: request + catch: bad_request search: body: aggs: 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 index fd96767731..1b985c6689 100644 --- 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 @@ -288,7 +288,7 @@ setup: percents: [] - do: - catch: request + catch: bad_request search: body: aggs: @@ -298,7 +298,7 @@ setup: percents: null - do: - catch: request + catch: bad_request search: body: aggs: @@ -308,7 +308,7 @@ setup: percents: ["foo"] - do: - catch: request + catch: bad_request search: body: aggs: 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 index d959eefed8..1d527efbf8 100644 --- 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 @@ -298,7 +298,7 @@ setup: number_of_significant_value_digits: 10 - do: - catch: request + catch: bad_request search: body: aggs: @@ -320,7 +320,7 @@ setup: percents: [] - do: - catch: request + catch: bad_request search: body: aggs: @@ -331,7 +331,7 @@ setup: percents: null - do: - catch: request + catch: bad_request search: body: aggs: @@ -342,7 +342,7 @@ setup: percents: ["foo"] - do: - catch: request + catch: bad_request search: body: aggs: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml index 5cdde2cb69..52fbd19185 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml @@ -69,7 +69,7 @@ setup: "Search body without query element": - do: - catch: request + catch: bad_request search: body: match: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue4895.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue4895.yml index 993cbed264..96a2ca4854 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue4895.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue4895.yml @@ -22,7 +22,7 @@ setup: "Test with _local preference placed in query body - should fail": - do: - catch: request + catch: bad_request search: index: test type: test diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue9606.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue9606.yml index 5421ae56a9..3e46531c03 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue9606.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue9606.yml @@ -19,7 +19,7 @@ setup: "Test search_type=query_and_fetch not supported from REST layer": - do: - catch: request + catch: bad_request search: index: test type: test @@ -33,7 +33,7 @@ setup: "Test search_type=dfs_query_and_fetch not supported from REST layer": - do: - catch: request + catch: bad_request search: index: test type: test diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yml index 82508f951e..e65f80d705 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yml @@ -65,7 +65,7 @@ setup: body: { foo: bar } - do: - catch: request + catch: bad_request update: index: test_1 type: test |