diff --git a/.gitignore b/.gitignore index 03e2446ec4f13..d1af97cbaea3b 100644 --- a/.gitignore +++ b/.gitignore @@ -68,4 +68,4 @@ testfixtures_shared/ # Generated checkstyle_ide.xml -x-pack/plugin/esql/gen/ +x-pack/plugin/esql/src/main/generated-src/generated/ diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchBuildCompletePlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchBuildCompletePlugin.java index d342ebc435197..4f9498c8f33a6 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchBuildCompletePlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchBuildCompletePlugin.java @@ -142,10 +142,17 @@ public void execute(BuildFinishedFlowAction.Parameters parameters) throws FileNo uploadFile.getParentFile().mkdirs(); createBuildArchiveTar(parameters.getFilteredFiles().get(), parameters.getProjectDir().get(), uploadFile); if (uploadFile.exists() && "true".equals(System.getenv("BUILDKITE"))) { - String uploadFilePath = "build/" + uploadFile.getName(); + String uploadFilePath = uploadFile.getName(); + File uploadFileDir = uploadFile.getParentFile(); try { System.out.println("Uploading buildkite artifact: " + uploadFilePath + "..."); - new ProcessBuilder("buildkite-agent", "artifact", "upload", uploadFilePath).start().waitFor(); + ProcessBuilder pb = new ProcessBuilder("buildkite-agent", "artifact", "upload", uploadFilePath); + // If we don't switch to the build directory first, the uploaded file will have a `build/` prefix + // Buildkite will flip the `/` to a `\` at upload time on Windows, which will make the search command below fail + // So, if you change this such that the artifact will have a slash/directory in it, you'll need to update the logic + // below as well + pb.directory(uploadFileDir); + pb.start().waitFor(); System.out.println("Generating buildscan link for artifact..."); diff --git a/docs/changelog/107287.yaml b/docs/changelog/107287.yaml new file mode 100644 index 0000000000000..791f07fd1c729 --- /dev/null +++ b/docs/changelog/107287.yaml @@ -0,0 +1,6 @@ +pr: 107287 +summary: Add support for the 'Anonymous IP' database to the geoip processor +area: Ingest Node +type: enhancement +issues: + - 90789 diff --git a/docs/reference/esql/functions/description/e.asciidoc b/docs/reference/esql/functions/description/e.asciidoc index 787de53c32ef6..dae6d770bf649 100644 --- a/docs/reference/esql/functions/description/e.asciidoc +++ b/docs/reference/esql/functions/description/e.asciidoc @@ -2,4 +2,4 @@ *Description* -Euler’s number. +Returns {wikipedia}/E_(mathematical_constant)[Euler's number]. diff --git a/docs/reference/esql/functions/description/floor.asciidoc b/docs/reference/esql/functions/description/floor.asciidoc index 139b8b57dafb9..f4e60cac3b0c2 100644 --- a/docs/reference/esql/functions/description/floor.asciidoc +++ b/docs/reference/esql/functions/description/floor.asciidoc @@ -3,3 +3,7 @@ *Description* Round a number down to the nearest integer. + +NOTE: This is a noop for `long` (including unsigned) and `integer`. +For `double` this picks the closest `double` value to the integer +similar to {javadoc}/java.base/java/lang/Math.html#floor(double)[Math.floor]. diff --git a/docs/reference/esql/functions/description/pi.asciidoc b/docs/reference/esql/functions/description/pi.asciidoc index c2b9b737126e1..90930678ded9f 100644 --- a/docs/reference/esql/functions/description/pi.asciidoc +++ b/docs/reference/esql/functions/description/pi.asciidoc @@ -2,4 +2,4 @@ *Description* -The ratio of a circle’s circumference to its diameter. +Returns the {wikipedia}/Pi[ratio] of a circle's circumference to its diameter. diff --git a/docs/reference/esql/functions/description/pow.asciidoc b/docs/reference/esql/functions/description/pow.asciidoc index fd05421eae005..7e6da7bab2e34 100644 --- a/docs/reference/esql/functions/description/pow.asciidoc +++ b/docs/reference/esql/functions/description/pow.asciidoc @@ -2,4 +2,6 @@ *Description* -Returns the value of a base raised to the power of an exponent. +Returns the value of `base` raised to the power of `exponent`. + +NOTE: It is still possible to overflow a double result here; in that case, null will be returned. diff --git a/docs/reference/esql/functions/description/round.asciidoc b/docs/reference/esql/functions/description/round.asciidoc index 3dfec1b30565d..aebed74b88485 100644 --- a/docs/reference/esql/functions/description/round.asciidoc +++ b/docs/reference/esql/functions/description/round.asciidoc @@ -2,4 +2,4 @@ *Description* -Rounds a number to the closest number with the specified number of digits. +Rounds a number to the closest number with the specified number of digits. Defaults to 0 digits if no number of digits is provided. If the specified number of digits is negative, rounds to the number of digits left of the decimal point. diff --git a/docs/reference/esql/functions/e.asciidoc b/docs/reference/esql/functions/examples/e.asciidoc similarity index 51% rename from docs/reference/esql/functions/e.asciidoc rename to docs/reference/esql/functions/examples/e.asciidoc index ac082c1a68a07..509f6b17f53e8 100644 --- a/docs/reference/esql/functions/e.asciidoc +++ b/docs/reference/esql/functions/examples/e.asciidoc @@ -1,15 +1,4 @@ -[discrete] -[[esql-e]] -=== `E` - -*Syntax* - -[.text-center] -image::esql/functions/signature/e.svg[Embedded,opts=inline] - -*Description* - -Returns {wikipedia}/E_(mathematical_constant)[Euler's number]. +// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it. *Example* @@ -21,3 +10,4 @@ include::{esql-specs}/math.csv-spec[tag=e] |=== include::{esql-specs}/math.csv-spec[tag=e-result] |=== + diff --git a/docs/reference/esql/functions/examples/floor.asciidoc b/docs/reference/esql/functions/examples/floor.asciidoc new file mode 100644 index 0000000000000..ef77c0aa8e346 --- /dev/null +++ b/docs/reference/esql/functions/examples/floor.asciidoc @@ -0,0 +1,13 @@ +// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it. + +*Example* + +[source.merge.styled,esql] +---- +include::{esql-specs}/math.csv-spec[tag=floor] +---- +[%header.monospaced.styled,format=dsv,separator=|] +|=== +include::{esql-specs}/math.csv-spec[tag=floor-result] +|=== + diff --git a/docs/reference/esql/functions/examples/pi.asciidoc b/docs/reference/esql/functions/examples/pi.asciidoc new file mode 100644 index 0000000000000..d15c460993e1b --- /dev/null +++ b/docs/reference/esql/functions/examples/pi.asciidoc @@ -0,0 +1,13 @@ +// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it. + +*Example* + +[source.merge.styled,esql] +---- +include::{esql-specs}/math.csv-spec[tag=pi] +---- +[%header.monospaced.styled,format=dsv,separator=|] +|=== +include::{esql-specs}/math.csv-spec[tag=pi-result] +|=== + diff --git a/docs/reference/esql/functions/pow.asciidoc b/docs/reference/esql/functions/examples/pow.asciidoc similarity index 50% rename from docs/reference/esql/functions/pow.asciidoc rename to docs/reference/esql/functions/examples/pow.asciidoc index 6618b728d7da9..5c24a043e606b 100644 --- a/docs/reference/esql/functions/pow.asciidoc +++ b/docs/reference/esql/functions/examples/pow.asciidoc @@ -1,27 +1,4 @@ -[discrete] -[[esql-pow]] -=== `POW` - -*Syntax* - -[.text-center] -image::esql/functions/signature/pow.svg[Embedded,opts=inline] - -*Parameters* - -`base`:: -Numeric expression. If `null`, the function returns `null`. - -`exponent`:: -Numeric expression. If `null`, the function returns `null`. - -*Description* - -Returns the value of `base` raised to the power of `exponent`. Both arguments -must be numeric. The output is always a double. Note that it is still possible -to overflow a double result here; in that case, null will be returned. - -include::types/pow.asciidoc[] +// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it. *Examples* @@ -33,10 +10,8 @@ include::{esql-specs}/math.csv-spec[tag=powDI] |=== include::{esql-specs}/math.csv-spec[tag=powDI-result] |=== - The exponent can be a fraction, which is similar to performing a root. For example, the exponent of `0.5` will give the square root of the base: - [source.merge.styled,esql] ---- include::{esql-specs}/math.csv-spec[tag=powID-sqrt] @@ -45,3 +20,4 @@ include::{esql-specs}/math.csv-spec[tag=powID-sqrt] |=== include::{esql-specs}/math.csv-spec[tag=powID-sqrt-result] |=== + diff --git a/docs/reference/esql/functions/examples/round.asciidoc b/docs/reference/esql/functions/examples/round.asciidoc new file mode 100644 index 0000000000000..c69eefccc6c95 --- /dev/null +++ b/docs/reference/esql/functions/examples/round.asciidoc @@ -0,0 +1,13 @@ +// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it. + +*Example* + +[source.merge.styled,esql] +---- +include::{esql-specs}/docs.csv-spec[tag=round] +---- +[%header.monospaced.styled,format=dsv,separator=|] +|=== +include::{esql-specs}/docs.csv-spec[tag=round-result] +|=== + diff --git a/docs/reference/esql/functions/floor.asciidoc b/docs/reference/esql/functions/floor.asciidoc deleted file mode 100644 index 69d8657d008b2..0000000000000 --- a/docs/reference/esql/functions/floor.asciidoc +++ /dev/null @@ -1,34 +0,0 @@ -[discrete] -[[esql-floor]] -=== `FLOOR` - -*Syntax* - -[.text-center] -image::esql/functions/signature/floor.svg[Embedded,opts=inline] - -*Parameters* - -`n`:: -Numeric expression. If `null`, the function returns `null`. - -*Description* - -Rounds a number down to the nearest integer. - -NOTE: This is a noop for `long` (including unsigned) and `integer`. - For `double` this picks the closest `double` value to the integer - similar to {javadoc}/java.base/java/lang/Math.html#floor(double)[Math.floor]. - -include::types/floor.asciidoc[] - -*Example* - -[source.merge.styled,esql] ----- -include::{esql-specs}/math.csv-spec[tag=floor] ----- -[%header.monospaced.styled,format=dsv,separator=|] -|=== -include::{esql-specs}/math.csv-spec[tag=floor-result] -|=== diff --git a/docs/reference/esql/functions/kibana/definition/e.json b/docs/reference/esql/functions/kibana/definition/e.json index 97d33b752d042..6bd0197797e59 100644 --- a/docs/reference/esql/functions/kibana/definition/e.json +++ b/docs/reference/esql/functions/kibana/definition/e.json @@ -2,11 +2,14 @@ "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.", "type" : "eval", "name" : "e", - "description" : "Euler’s number.", + "description" : "Returns Euler's number.", "signatures" : [ { "params" : [ ], "returnType" : "double" } + ], + "examples" : [ + "ROW E()" ] } diff --git a/docs/reference/esql/functions/kibana/definition/floor.json b/docs/reference/esql/functions/kibana/definition/floor.json index 18ab8031558bd..b61588559a928 100644 --- a/docs/reference/esql/functions/kibana/definition/floor.json +++ b/docs/reference/esql/functions/kibana/definition/floor.json @@ -3,6 +3,7 @@ "type" : "eval", "name" : "floor", "description" : "Round a number down to the nearest integer.", + "note" : "This is a noop for `long` (including unsigned) and `integer`.\nFor `double` this picks the closest `double` value to the integer\nsimilar to Math.floor.", "signatures" : [ { "params" : [ @@ -10,7 +11,7 @@ "name" : "number", "type" : "double", "optional" : false, - "description" : "" + "description" : "Numeric expression. If `null`, the function returns `null`." } ], "variadic" : false, @@ -22,7 +23,7 @@ "name" : "number", "type" : "integer", "optional" : false, - "description" : "" + "description" : "Numeric expression. If `null`, the function returns `null`." } ], "variadic" : false, @@ -34,7 +35,7 @@ "name" : "number", "type" : "long", "optional" : false, - "description" : "" + "description" : "Numeric expression. If `null`, the function returns `null`." } ], "variadic" : false, @@ -46,11 +47,14 @@ "name" : "number", "type" : "unsigned_long", "optional" : false, - "description" : "" + "description" : "Numeric expression. If `null`, the function returns `null`." } ], "variadic" : false, "returnType" : "unsigned_long" } + ], + "examples" : [ + "ROW a=1.8\n| EVAL a=FLOOR(a)" ] } diff --git a/docs/reference/esql/functions/kibana/definition/pi.json b/docs/reference/esql/functions/kibana/definition/pi.json index d1d700d2011ee..047067f852c80 100644 --- a/docs/reference/esql/functions/kibana/definition/pi.json +++ b/docs/reference/esql/functions/kibana/definition/pi.json @@ -2,11 +2,14 @@ "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.", "type" : "eval", "name" : "pi", - "description" : "The ratio of a circle’s circumference to its diameter.", + "description" : "Returns the ratio of a circle's circumference to its diameter.", "signatures" : [ { "params" : [ ], "returnType" : "double" } + ], + "examples" : [ + "ROW PI()" ] } diff --git a/docs/reference/esql/functions/kibana/definition/pow.json b/docs/reference/esql/functions/kibana/definition/pow.json index 9970a45847cc7..bef8dee142b23 100644 --- a/docs/reference/esql/functions/kibana/definition/pow.json +++ b/docs/reference/esql/functions/kibana/definition/pow.json @@ -2,7 +2,8 @@ "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.", "type" : "eval", "name" : "pow", - "description" : "Returns the value of a base raised to the power of an exponent.", + "description" : "Returns the value of `base` raised to the power of `exponent`.", + "note" : "It is still possible to overflow a double result here; in that case, null will be returned.", "signatures" : [ { "params" : [ @@ -10,13 +11,13 @@ "name" : "base", "type" : "double", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "double", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -28,13 +29,13 @@ "name" : "base", "type" : "double", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "integer", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -46,13 +47,13 @@ "name" : "base", "type" : "double", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -64,13 +65,13 @@ "name" : "base", "type" : "double", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "unsigned_long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -82,13 +83,13 @@ "name" : "base", "type" : "integer", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "double", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -100,13 +101,13 @@ "name" : "base", "type" : "integer", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "integer", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -118,13 +119,13 @@ "name" : "base", "type" : "integer", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -136,13 +137,13 @@ "name" : "base", "type" : "integer", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "unsigned_long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -154,13 +155,13 @@ "name" : "base", "type" : "long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "double", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -172,13 +173,13 @@ "name" : "base", "type" : "long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "integer", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -190,13 +191,13 @@ "name" : "base", "type" : "long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -208,13 +209,13 @@ "name" : "base", "type" : "long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "unsigned_long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -226,13 +227,13 @@ "name" : "base", "type" : "unsigned_long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "double", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -244,13 +245,13 @@ "name" : "base", "type" : "unsigned_long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "integer", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -262,13 +263,13 @@ "name" : "base", "type" : "unsigned_long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, @@ -280,17 +281,21 @@ "name" : "base", "type" : "unsigned_long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the base. If `null`, the function returns `null`." }, { "name" : "exponent", "type" : "unsigned_long", "optional" : false, - "description" : "" + "description" : "Numeric expression for the exponent. If `null`, the function returns `null`." } ], "variadic" : false, "returnType" : "double" } + ], + "examples" : [ + "ROW base = 2.0, exponent = 2\n| EVAL result = POW(base, exponent)", + "ROW base = 4, exponent = 0.5\n| EVAL s = POW(base, exponent)" ] } diff --git a/docs/reference/esql/functions/kibana/definition/round.json b/docs/reference/esql/functions/kibana/definition/round.json index e12672d8ee6e2..f8a0c0ce31165 100644 --- a/docs/reference/esql/functions/kibana/definition/round.json +++ b/docs/reference/esql/functions/kibana/definition/round.json @@ -2,7 +2,7 @@ "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.", "type" : "eval", "name" : "round", - "description" : "Rounds a number to the closest number with the specified number of digits.", + "description" : "Rounds a number to the closest number with the specified number of digits.\nDefaults to 0 digits if no number of digits is provided. If the specified number\nof digits is negative, rounds to the number of digits left of the decimal point.", "signatures" : [ { "params" : [ @@ -10,17 +10,104 @@ "name" : "number", "type" : "double", "optional" : false, - "description" : "The numeric value to round" + "description" : "The numeric value to round. If `null`, the function returns `null`." + } + ], + "variadic" : false, + "returnType" : "double" + }, + { + "params" : [ + { + "name" : "number", + "type" : "double", + "optional" : false, + "description" : "The numeric value to round. If `null`, the function returns `null`." }, { "name" : "decimals", "type" : "integer", "optional" : true, - "description" : "The number of decimal places to round to. Defaults to 0." + "description" : "The number of decimal places to round to. Defaults to 0. If `null`, the function returns `null`." } ], "variadic" : false, "returnType" : "double" + }, + { + "params" : [ + { + "name" : "number", + "type" : "integer", + "optional" : false, + "description" : "The numeric value to round. If `null`, the function returns `null`." + } + ], + "variadic" : false, + "returnType" : "integer" + }, + { + "params" : [ + { + "name" : "number", + "type" : "integer", + "optional" : false, + "description" : "The numeric value to round. If `null`, the function returns `null`." + }, + { + "name" : "decimals", + "type" : "integer", + "optional" : true, + "description" : "The number of decimal places to round to. Defaults to 0. If `null`, the function returns `null`." + } + ], + "variadic" : false, + "returnType" : "integer" + }, + { + "params" : [ + { + "name" : "number", + "type" : "long", + "optional" : false, + "description" : "The numeric value to round. If `null`, the function returns `null`." + } + ], + "variadic" : false, + "returnType" : "long" + }, + { + "params" : [ + { + "name" : "number", + "type" : "long", + "optional" : false, + "description" : "The numeric value to round. If `null`, the function returns `null`." + }, + { + "name" : "decimals", + "type" : "integer", + "optional" : true, + "description" : "The number of decimal places to round to. Defaults to 0. If `null`, the function returns `null`." + } + ], + "variadic" : false, + "returnType" : "long" + }, + { + "params" : [ + { + "name" : "number", + "type" : "unsigned_long", + "optional" : false, + "description" : "The numeric value to round. If `null`, the function returns `null`." + } + ], + "variadic" : false, + "returnType" : "unsigned_long" } + ], + "examples" : [ + "FROM employees\n| KEEP first_name, last_name, height\n| EVAL height_ft = ROUND(height * 3.281, 1)" ] } diff --git a/docs/reference/esql/functions/kibana/docs/e.md b/docs/reference/esql/functions/kibana/docs/e.md index da85eadf2e74e..7700101b9229e 100644 --- a/docs/reference/esql/functions/kibana/docs/e.md +++ b/docs/reference/esql/functions/kibana/docs/e.md @@ -3,5 +3,8 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ --> ### E -Euler’s number. +Returns Euler's number. +``` +ROW E() +``` diff --git a/docs/reference/esql/functions/kibana/docs/floor.md b/docs/reference/esql/functions/kibana/docs/floor.md index a0a095525e08d..116edc2d15ba7 100644 --- a/docs/reference/esql/functions/kibana/docs/floor.md +++ b/docs/reference/esql/functions/kibana/docs/floor.md @@ -5,3 +5,10 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ ### FLOOR Round a number down to the nearest integer. +``` +ROW a=1.8 +| EVAL a=FLOOR(a) +``` +Note: This is a noop for `long` (including unsigned) and `integer`. +For `double` this picks the closest `double` value to the integer +similar to {javadoc}/java.base/java/lang/Math.html#floor(double)[Math.floor]. diff --git a/docs/reference/esql/functions/kibana/docs/pi.md b/docs/reference/esql/functions/kibana/docs/pi.md index f796ace56607d..3e179cbeae5d7 100644 --- a/docs/reference/esql/functions/kibana/docs/pi.md +++ b/docs/reference/esql/functions/kibana/docs/pi.md @@ -3,5 +3,8 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ --> ### PI -The ratio of a circle’s circumference to its diameter. +Returns the {wikipedia}/Pi[ratio] of a circle's circumference to its diameter. +``` +ROW PI() +``` diff --git a/docs/reference/esql/functions/kibana/docs/pow.md b/docs/reference/esql/functions/kibana/docs/pow.md index 6cb9139dd91cc..d214504ce4b03 100644 --- a/docs/reference/esql/functions/kibana/docs/pow.md +++ b/docs/reference/esql/functions/kibana/docs/pow.md @@ -3,5 +3,10 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ --> ### POW -Returns the value of a base raised to the power of an exponent. +Returns the value of `base` raised to the power of `exponent`. +``` +ROW base = 2.0, exponent = 2 +| EVAL result = POW(base, exponent) +``` +Note: It is still possible to overflow a double result here; in that case, null will be returned. diff --git a/docs/reference/esql/functions/kibana/docs/round.md b/docs/reference/esql/functions/kibana/docs/round.md index 2f8fd0864badf..f6e7ef5314a77 100644 --- a/docs/reference/esql/functions/kibana/docs/round.md +++ b/docs/reference/esql/functions/kibana/docs/round.md @@ -4,4 +4,11 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ ### ROUND Rounds a number to the closest number with the specified number of digits. +Defaults to 0 digits if no number of digits is provided. If the specified number +of digits is negative, rounds to the number of digits left of the decimal point. +``` +FROM employees +| KEEP first_name, last_name, height +| EVAL height_ft = ROUND(height * 3.281, 1) +``` diff --git a/docs/reference/esql/functions/layout/e.asciidoc b/docs/reference/esql/functions/layout/e.asciidoc index a0e1ca3830e30..2c353f4e4ae4f 100644 --- a/docs/reference/esql/functions/layout/e.asciidoc +++ b/docs/reference/esql/functions/layout/e.asciidoc @@ -12,3 +12,4 @@ image::esql/functions/signature/e.svg[Embedded,opts=inline] include::../parameters/e.asciidoc[] include::../description/e.asciidoc[] include::../types/e.asciidoc[] +include::../examples/e.asciidoc[] diff --git a/docs/reference/esql/functions/layout/floor.asciidoc b/docs/reference/esql/functions/layout/floor.asciidoc index f3f05260989dc..0c26c4fda36c2 100644 --- a/docs/reference/esql/functions/layout/floor.asciidoc +++ b/docs/reference/esql/functions/layout/floor.asciidoc @@ -12,3 +12,4 @@ image::esql/functions/signature/floor.svg[Embedded,opts=inline] include::../parameters/floor.asciidoc[] include::../description/floor.asciidoc[] include::../types/floor.asciidoc[] +include::../examples/floor.asciidoc[] diff --git a/docs/reference/esql/functions/layout/pi.asciidoc b/docs/reference/esql/functions/layout/pi.asciidoc index 402e7b28481d6..37fd1b80bac41 100644 --- a/docs/reference/esql/functions/layout/pi.asciidoc +++ b/docs/reference/esql/functions/layout/pi.asciidoc @@ -12,3 +12,4 @@ image::esql/functions/signature/pi.svg[Embedded,opts=inline] include::../parameters/pi.asciidoc[] include::../description/pi.asciidoc[] include::../types/pi.asciidoc[] +include::../examples/pi.asciidoc[] diff --git a/docs/reference/esql/functions/layout/pow.asciidoc b/docs/reference/esql/functions/layout/pow.asciidoc index 019c17b7a03c6..3adaff72d26be 100644 --- a/docs/reference/esql/functions/layout/pow.asciidoc +++ b/docs/reference/esql/functions/layout/pow.asciidoc @@ -12,3 +12,4 @@ image::esql/functions/signature/pow.svg[Embedded,opts=inline] include::../parameters/pow.asciidoc[] include::../description/pow.asciidoc[] include::../types/pow.asciidoc[] +include::../examples/pow.asciidoc[] diff --git a/docs/reference/esql/functions/layout/round.asciidoc b/docs/reference/esql/functions/layout/round.asciidoc index 8424432052750..2fbcffd814747 100644 --- a/docs/reference/esql/functions/layout/round.asciidoc +++ b/docs/reference/esql/functions/layout/round.asciidoc @@ -12,3 +12,4 @@ image::esql/functions/signature/round.svg[Embedded,opts=inline] include::../parameters/round.asciidoc[] include::../description/round.asciidoc[] include::../types/round.asciidoc[] +include::../examples/round.asciidoc[] diff --git a/docs/reference/esql/functions/math-functions.asciidoc b/docs/reference/esql/functions/math-functions.asciidoc index dd5b8a0a3d4e0..1789f53b3704c 100644 --- a/docs/reference/esql/functions/math-functions.asciidoc +++ b/docs/reference/esql/functions/math-functions.asciidoc @@ -40,13 +40,13 @@ include::layout/atan2.asciidoc[] include::layout/ceil.asciidoc[] include::layout/cos.asciidoc[] include::layout/cosh.asciidoc[] -include::e.asciidoc[] -include::floor.asciidoc[] +include::layout/e.asciidoc[] +include::layout/floor.asciidoc[] include::layout/log.asciidoc[] include::layout/log10.asciidoc[] -include::pi.asciidoc[] -include::pow.asciidoc[] -include::round.asciidoc[] +include::layout/pi.asciidoc[] +include::layout/pow.asciidoc[] +include::layout/round.asciidoc[] include::layout/signum.asciidoc[] include::layout/sin.asciidoc[] include::layout/sinh.asciidoc[] diff --git a/docs/reference/esql/functions/parameters/floor.asciidoc b/docs/reference/esql/functions/parameters/floor.asciidoc index 91c56709d182a..65013f4c21265 100644 --- a/docs/reference/esql/functions/parameters/floor.asciidoc +++ b/docs/reference/esql/functions/parameters/floor.asciidoc @@ -3,4 +3,4 @@ *Parameters* `number`:: - +Numeric expression. If `null`, the function returns `null`. diff --git a/docs/reference/esql/functions/parameters/pow.asciidoc b/docs/reference/esql/functions/parameters/pow.asciidoc index 8e94723086e2e..1576c96ee2277 100644 --- a/docs/reference/esql/functions/parameters/pow.asciidoc +++ b/docs/reference/esql/functions/parameters/pow.asciidoc @@ -3,7 +3,7 @@ *Parameters* `base`:: - +Numeric expression for the base. If `null`, the function returns `null`. `exponent`:: - +Numeric expression for the exponent. If `null`, the function returns `null`. diff --git a/docs/reference/esql/functions/parameters/round.asciidoc b/docs/reference/esql/functions/parameters/round.asciidoc index 788c99434fd29..ce3a43b56f497 100644 --- a/docs/reference/esql/functions/parameters/round.asciidoc +++ b/docs/reference/esql/functions/parameters/round.asciidoc @@ -3,7 +3,7 @@ *Parameters* `number`:: -The numeric value to round +The numeric value to round. If `null`, the function returns `null`. `decimals`:: -The number of decimal places to round to. Defaults to 0. +The number of decimal places to round to. Defaults to 0. If `null`, the function returns `null`. diff --git a/docs/reference/esql/functions/pi.asciidoc b/docs/reference/esql/functions/pi.asciidoc deleted file mode 100644 index fb88cbffc99d0..0000000000000 --- a/docs/reference/esql/functions/pi.asciidoc +++ /dev/null @@ -1,23 +0,0 @@ -[discrete] -[[esql-pi]] -=== `PI` - -*Syntax* - -[.text-center] -image::esql/functions/signature/pi.svg[Embedded,opts=inline] - -*Description* - -Returns the {wikipedia}/Pi[ratio] of a circle's circumference to its diameter. - -*Example* - -[source.merge.styled,esql] ----- -include::{esql-specs}/math.csv-spec[tag=pi] ----- -[%header.monospaced.styled,format=dsv,separator=|] -|=== -include::{esql-specs}/math.csv-spec[tag=pi-result] -|=== diff --git a/docs/reference/esql/functions/types/case.asciidoc b/docs/reference/esql/functions/types/case.asciidoc index 44acf331a43dc..e7d627ab915a1 100644 --- a/docs/reference/esql/functions/types/case.asciidoc +++ b/docs/reference/esql/functions/types/case.asciidoc @@ -5,5 +5,5 @@ [%header.monospaced.styled,format=dsv,separator=|] |=== condition | trueValue | result - +keyword |=== diff --git a/docs/reference/esql/functions/types/e.asciidoc b/docs/reference/esql/functions/types/e.asciidoc index 50e9c47238e34..aa22828b31bb1 100644 --- a/docs/reference/esql/functions/types/e.asciidoc +++ b/docs/reference/esql/functions/types/e.asciidoc @@ -5,5 +5,5 @@ [%header.monospaced.styled,format=dsv,separator=|] |=== result - +double |=== diff --git a/docs/reference/esql/functions/types/pi.asciidoc b/docs/reference/esql/functions/types/pi.asciidoc index 50e9c47238e34..aa22828b31bb1 100644 --- a/docs/reference/esql/functions/types/pi.asciidoc +++ b/docs/reference/esql/functions/types/pi.asciidoc @@ -5,5 +5,5 @@ [%header.monospaced.styled,format=dsv,separator=|] |=== result - +double |=== diff --git a/docs/reference/esql/functions/types/round.asciidoc b/docs/reference/esql/functions/types/round.asciidoc index ea9ab93825d4f..8c13e14e73b01 100644 --- a/docs/reference/esql/functions/types/round.asciidoc +++ b/docs/reference/esql/functions/types/round.asciidoc @@ -6,4 +6,6 @@ |=== number | decimals | result double | integer | double +integer | integer | integer +long | integer | long |=== diff --git a/docs/reference/esql/functions/types/tau.asciidoc b/docs/reference/esql/functions/types/tau.asciidoc index 50e9c47238e34..aa22828b31bb1 100644 --- a/docs/reference/esql/functions/types/tau.asciidoc +++ b/docs/reference/esql/functions/types/tau.asciidoc @@ -5,5 +5,5 @@ [%header.monospaced.styled,format=dsv,separator=|] |=== result - +double |=== diff --git a/docs/reference/ingest/processors/geoip.asciidoc b/docs/reference/ingest/processors/geoip.asciidoc index 7e0e53747834a..ea22dafeadda4 100644 --- a/docs/reference/ingest/processors/geoip.asciidoc +++ b/docs/reference/ingest/processors/geoip.asciidoc @@ -9,7 +9,7 @@ IPv4 or IPv6 address. [[geoip-automatic-updates]] By default, the processor uses the GeoLite2 City, GeoLite2 Country, and GeoLite2 -ASN GeoIP2 databases from http://dev.maxmind.com/geoip/geoip2/geolite2/[MaxMind], shared under the +ASN IP geolocation databases from http://dev.maxmind.com/geoip/geoip2/geolite2/[MaxMind], shared under the CC BY-SA 4.0 license. It automatically downloads these databases if your nodes can connect to `storage.googleapis.com` domain and either: * `ingest.geoip.downloader.eager.download` is set to true @@ -38,7 +38,7 @@ field instead. | Name | Required | Default | Description | `field` | yes | - | The field to get the ip address from for the geographical lookup. | `target_field` | no | geoip | The field that will hold the geographical information looked up from the MaxMind database. -| `database_file` | no | GeoLite2-City.mmdb | The database filename referring to a database the module ships with (GeoLite2-City.mmdb, GeoLite2-Country.mmdb, or GeoLite2-ASN.mmdb) or a custom database in the `ingest-geoip` config directory. +| `database_file` | no | GeoLite2-City.mmdb | The database filename referring to one of the automatically downloaded GeoLite2 databases (GeoLite2-City.mmdb, GeoLite2-Country.mmdb, or GeoLite2-ASN.mmdb) or the name of a supported database file in the `ingest-geoip` config directory. | `properties` | no | [`continent_name`, `country_iso_code`, `country_name`, `region_iso_code`, `region_name`, `city_name`, `location`] * | Controls what properties are added to the `target_field` based on the geoip lookup. | `ignore_missing` | no | `false` | If `true` and `field` does not exist, the processor quietly exits without modifying the document | `first_only` | no | `true` | If `true` only first found geoip data will be returned, even if `field` contains array @@ -47,15 +47,18 @@ field instead. *Depends on what is available in `database_file`: -* If the GeoLite2 City database is used, then the following fields may be added under the `target_field`: `ip`, -`country_iso_code`, `country_name`, `continent_name`, `region_iso_code`, `region_name`, `city_name`, `timezone`, `latitude`, `longitude` +* If a GeoLite2 City or GeoIP2 City database is used, then the following fields may be added under the `target_field`: `ip`, +`country_iso_code`, `country_name`, `continent_name`, `region_iso_code`, `region_name`, `city_name`, `timezone`, and `location`. The fields actually added depend on what has been found and which properties were configured in `properties`. -* If the GeoLite2 Country database is used, then the following fields may be added under the `target_field`: `ip`, +* If a GeoLite2 Country or GeoIP2 Country database is used, then the following fields may be added under the `target_field`: `ip`, `country_iso_code`, `country_name` and `continent_name`. The fields actually added depend on what has been found and which properties were configured in `properties`. * If the GeoLite2 ASN database is used, then the following fields may be added under the `target_field`: `ip`, `asn`, `organization_name` and `network`. The fields actually added depend on what has been found and which properties were configured in `properties`. +* If the GeoIP2 Anonymous IP database is used, then the following fields may be added under the `target_field`: `ip`, +`hosting_provider`, `tor_exit_node`, `anonymous_vpn`, `anonymous`, `public_proxy`, and `residential_proxy`. The fields actually added +depend on what has been found and which properties were configured in `properties`. Here is an example that uses the default city database and adds the geographical information to the `geoip` field based on the `ip` field: @@ -109,7 +112,7 @@ Which returns: Here is an example that uses the default country database and adds the geographical information to the `geo` field based on the `ip` field. Note that -this database is included in the module. So this: +this database is downloaded automatically. So this: [source,console] -------------------------------------------------- @@ -316,14 +319,14 @@ GET /my_ip_locations/_search //// [[manage-geoip-database-updates]] -==== Manage your own GeoIP2 database updates +==== Manage your own IP geolocation database updates -If you can't <> your GeoIP2 -databases from the Elastic endpoint, you have a few other options: +If you can't <> your IP geolocation databases +from the Elastic endpoint, you have a few other options: * <> * <> -* <> +* <> [[use-proxy-geoip-endpoint]] **Use a proxy endpoint** @@ -375,7 +378,7 @@ settings API>> to set <>. [[manually-update-geoip-databases]] -**Manually update your GeoIP2 databases** +**Manually update your IP geolocation databases** . Use the <> to set `ingest.geoip.downloader.enabled` to `false`. This disables automatic updates @@ -414,14 +417,14 @@ Note that these settings are node settings and apply to all `geoip` processors, [[ingest-geoip-downloader-enabled]] `ingest.geoip.downloader.enabled`:: (<>, Boolean) -If `true`, {es} automatically downloads and manages updates for GeoIP2 databases +If `true`, {es} automatically downloads and manages updates for IP geolocation databases from the `ingest.geoip.downloader.endpoint`. If `false`, {es} does not download updates and deletes all downloaded databases. Defaults to `true`. [[ingest-geoip-downloader-eager-download]] `ingest.geoip.downloader.eager.download`:: (<>, Boolean) -If `true`, {es} downloads GeoIP2 databases immediately, regardless of whether a +If `true`, {es} downloads IP geolocation databases immediately, regardless of whether a pipeline exists with a geoip processor. If `false`, {es} only begins downloading the databases if a pipeline with a geoip processor exists or is added. Defaults to `false`. @@ -429,7 +432,7 @@ to `false`. [[ingest-geoip-downloader-endpoint]] `ingest.geoip.downloader.endpoint`:: (<>, string) -Endpoint URL used to download updates for GeoIP2 databases. For example, `https://myDomain.com/overview.json`. +Endpoint URL used to download updates for IP geolocation databases. For example, `https://myDomain.com/overview.json`. Defaults to `https://geoip.elastic.co/v1/database`. {es} stores downloaded database files in each node's <> at `$ES_TMPDIR/geoip-databases/`. Note that {es} will make a GET request to `${ingest.geoip.downloader.endpoint}?elastic_geoip_service_tos=agree`, @@ -440,6 +443,6 @@ The GeoIP downloader uses the JDK's builtin cacerts. If you're using a custom en [[ingest-geoip-downloader-poll-interval]] `ingest.geoip.downloader.poll.interval`:: (<>, <>) -How often {es} checks for GeoIP2 database updates at the +How often {es} checks for IP geolocation database updates at the `ingest.geoip.downloader.endpoint`. Must be greater than `1d` (one day). Defaults to `3d` (three days). diff --git a/docs/reference/setup/secure-settings.asciidoc b/docs/reference/setup/secure-settings.asciidoc index cb88be94e17b6..04113c949122b 100644 --- a/docs/reference/setup/secure-settings.asciidoc +++ b/docs/reference/setup/secure-settings.asciidoc @@ -25,7 +25,11 @@ are node-specific settings that must have the same value on every node. Just like the settings values in `elasticsearch.yml`, changes to the keystore contents are not automatically applied to the running {es} node. Re-reading settings requires a node restart. However, certain secure settings are marked as -*reloadable*. Such settings can be <>. +*reloadable*. Such settings can be re-read and applied on a running node. + +You can define these settings before the node is started, +or call the <> +after the settings are defined to apply them to a running node. The values of all secure settings, *reloadable* or not, must be identical across all cluster nodes. After making the desired secure settings changes, diff --git a/docs/reference/snapshot-restore/repository-azure.asciidoc b/docs/reference/snapshot-restore/repository-azure.asciidoc index 35cf454906050..f3d04159bc025 100644 --- a/docs/reference/snapshot-restore/repository-azure.asciidoc +++ b/docs/reference/snapshot-restore/repository-azure.asciidoc @@ -6,8 +6,10 @@ You can use https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blobs-i [[repository-azure-usage]] ==== Setup -To enable Azure repositories, you have first to define your azure storage settings as -{ref}/secure-settings.html[secure settings], before starting up the node: +To enable Azure repositories, you have first to define your Azure storage settings as +{ref}/secure-settings.html[secure settings]. + +You can define these settings before the node is started, or call the <> after the settings are defined to apply them to a running node. [source,sh] ---------------------------------------------------------------- diff --git a/docs/reference/snapshot-restore/repository-gcs.asciidoc b/docs/reference/snapshot-restore/repository-gcs.asciidoc index b359952715a73..551df223ba0d3 100644 --- a/docs/reference/snapshot-restore/repository-gcs.asciidoc +++ b/docs/reference/snapshot-restore/repository-gcs.asciidoc @@ -117,6 +117,10 @@ PUT _snapshot/my_gcs_repository // TEST[skip:we don't have gcs setup while testing this] The `credentials_file` settings are {ref}/secure-settings.html#reloadable-secure-settings[reloadable]. +You can define these settings before the node is started, +or call the <> +after the settings are defined to apply them to a running node. + After you reload the settings, the internal `gcs` clients, which are used to transfer the snapshot contents, utilize the latest settings from the keystore. diff --git a/docs/reference/snapshot-restore/repository-s3.asciidoc b/docs/reference/snapshot-restore/repository-s3.asciidoc index 11324639cb2f0..9ee630c37eee2 100644 --- a/docs/reference/snapshot-restore/repository-s3.asciidoc +++ b/docs/reference/snapshot-restore/repository-s3.asciidoc @@ -56,7 +56,7 @@ For more information about creating and updating the {es} keystore, see {ref}/secure-settings.html[Secure settings]. For example, if you want to use specific credentials to access S3 then run the -following commands to add these credentials to the keystore: +following commands to add these credentials to the keystore. [source,sh] ---- @@ -80,8 +80,12 @@ bin/elasticsearch-keystore remove s3.client.default.session_token ---- *All* client secure settings of this repository type are -{ref}/secure-settings.html#reloadable-secure-settings[reloadable]. After you -reload the settings, the internal `s3` clients, used to transfer the snapshot +{ref}/secure-settings.html#reloadable-secure-settings[reloadable]. +You can define these settings before the node is started, +or call the <> +after the settings are defined to apply them to a running node. + +After you reload the settings, the internal `s3` clients, used to transfer the snapshot contents, will utilize the latest settings from the keystore. Any existing `s3` repositories, as well as any newly created ones, will pick up the new values stored in the keystore. diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml index 25522264c4dc0..439233aab094b 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml @@ -63,8 +63,8 @@ setup: --- "Terms lookup": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: fixed in 7.9.0 - do: indices.create: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml index 792a81e32f5cb..25c54bcd7a70a 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml @@ -25,8 +25,8 @@ setup: --- "basic": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: interval had a in bug before 7.9.0 - do: search: @@ -47,8 +47,8 @@ setup: --- "avg_bucket": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: Fixed in 7.8.0 - do: search: @@ -78,8 +78,8 @@ setup: --- "profile at top level": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: introduced in 7.10.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml index 8270a8c6b5d74..1c950d387f7a6 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml @@ -243,8 +243,8 @@ setup: --- "profiler int": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: introduced in 7.10.0 - do: search: @@ -270,8 +270,8 @@ setup: --- "profiler double": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: introduced in 7.10.0 - do: search: @@ -297,8 +297,8 @@ setup: --- "profiler string": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: introduced in 7.10.0 - do: search: @@ -319,8 +319,8 @@ setup: - gt: { profile.shards.0.aggregations.0.breakdown.post_collection: 0 } --- "profiler string save memory hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -342,8 +342,8 @@ setup: - gt: { profile.shards.0.aggregations.0.breakdown.post_collection: 0 } --- "profiler string save time hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -365,8 +365,8 @@ setup: - gt: { profile.shards.0.aggregations.0.breakdown.post_collection: 0 } --- "profiler string global ords hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -388,8 +388,8 @@ setup: - gt: { profile.shards.0.aggregations.0.breakdown.post_collection: 0 } --- "profiler string segment ords hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -414,8 +414,8 @@ setup: - match: { profile.shards.0.aggregations.0.debug.string_hashing_collectors_used: 0 } --- "profiler string direct hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -440,8 +440,8 @@ setup: - gt: { profile.shards.0.aggregations.0.debug.string_hashing_collectors_used: 0 } --- "invalid execution hint throws": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: catch: /Invalid execution mode for cardinality aggregation/ diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml index e480f9636f351..1d56a1a99afe3 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml @@ -311,8 +311,8 @@ setup: - match: { aggregations.test.buckets.4.doc_count: 1 } --- "Basic numeric histogram": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: Multivalue Handling changed in 8.4 - do: search: @@ -341,8 +341,8 @@ setup: - match: { aggregations.test.buckets.2.doc_count: 1} --- "Basic numeric histogram with missing bucket": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: Multivalue Handling changed in 8.4 - do: search: @@ -374,8 +374,8 @@ setup: - match: { aggregations.test.buckets.3.doc_count: 1} --- "Basic numeric histogram with missing bucket order desc": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: Multivalue Handling changed in 8.4 - do: search: @@ -498,8 +498,8 @@ setup: --- "Composite aggregation with format and calendar_interval": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -559,8 +559,8 @@ setup: --- "Composite aggregation with invalid format": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: After key parse checking added in 7.14 - do: @@ -587,8 +587,8 @@ setup: --- "Composite aggregation with lossy format": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: After key parse checking added in 7.14 - do: @@ -614,8 +614,8 @@ setup: ] --- "Composite aggregation with date_histogram offset": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: offset introduced in 7.6.0 - do: @@ -695,8 +695,8 @@ setup: --- "Composite aggregation with unmapped field": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: starting in 7.2.0 the composite aggregation handles unmapped fields as keywords - do: @@ -776,8 +776,8 @@ setup: --- "Missing source": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: null/empty sources disallowed in 7.2 - do: @@ -805,8 +805,8 @@ setup: --- "Duplicate sources": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: duplicate names disallowed in 7.2 - do: @@ -837,8 +837,8 @@ setup: --- "Simple Composite aggregation with GeoTile grid": - - skip: - version: " - 7.4.99" + - requires: + cluster_features: ["gte_v7.5.0"] reason: geotile_grid is not supported until 7.5.0 - do: search: @@ -881,8 +881,8 @@ setup: --- "Simple Composite aggregation with geotile grid add aggregate after": - - skip: - version: " - 7.4.99" + - requires: + cluster_features: ["gte_v7.5.0"] reason: geotile_grid is not supported until 7.5.0 - do: search: @@ -923,8 +923,8 @@ setup: --- "Mixed ip and unmapped fields": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: This was fixed in 7.6.0 # It is important that the index *without* the ip field be sorted *before* # the index *with* the ip field because that has caused bugs in the past. @@ -969,8 +969,8 @@ setup: --- "date_histogram with time_zone": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: Fixed in 7.6.0 - do: index: @@ -1039,8 +1039,8 @@ setup: "date_histogram with time_zone epoch format": # Same as above, but with a different format. We had a bug about this specifically: # https://github.com/elastic/elasticsearch/issues/68963 - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: Fixed in 7.6.0 - do: index: @@ -1107,8 +1107,8 @@ setup: --- "date_histogram on date_nanos": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: Fixed in 7.7.0 - do: index: @@ -1198,8 +1198,8 @@ setup: --- "Terms source from part of sorted": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: fixed in 7.7.0. - do: @@ -1340,8 +1340,8 @@ setup: --- "Nested then filter then nested then terms": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: Filter support added in 7.13 - do: search: @@ -1384,8 +1384,8 @@ setup: --- "Filter without nesting": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: Filter added in 7.13 - do: search: @@ -1438,8 +1438,8 @@ setup: --- "Simple Composite aggregation with missing_order": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "`missing_order` has been introduced in 7.16" - do: search: @@ -1465,8 +1465,8 @@ setup: --- "missing_order with missing_bucket = false": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "`missing_order` has been introduced in 7.16" - do: catch: /missingOrder can only be set if missingBucket is true/ @@ -1489,8 +1489,8 @@ setup: --- "missing_order without missing_bucket": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "`missing_order` has been introduced in 7.16" - do: catch: /missingOrder can only be set if missingBucket is true/ @@ -1512,8 +1512,8 @@ setup: --- "Nested Composite aggregation with missing_order": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "`missing_order` has been introduced in 7.16" - do: search: @@ -1557,8 +1557,8 @@ setup: --- "date_histogram and date_histogram_composite timezone": - - skip: - version: " - 7.16.99" + - requires: + cluster_features: ["gte_v7.17.0"] reason: bug fixed somewhere between 7.2 and 7.17 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_agg_per_day_of_week.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_agg_per_day_of_week.yml index b7e16109826b4..dc349171e3a27 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_agg_per_day_of_week.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_agg_per_day_of_week.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "Start of the week Monday was enabled in a backport to 7.7 PR#50916" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml index bb1a2336bce83..b1b9623c8769c 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -127,8 +127,8 @@ setup: --- "date_histogram on range with hard bounds": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: hard_bounds introduced in 7.10.0 - do: @@ -156,8 +156,8 @@ setup: --- "date_histogram on date_nanos without timezone fixed interval": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: bug fixed in 7.6.1 - do: search: @@ -186,8 +186,8 @@ setup: --- "date_histogram on date_nanos with timezone fixed interval": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: bug fixed in 7.6.1 - do: search: @@ -216,8 +216,8 @@ setup: --- "date_histogram on date_nanos without timezone calendar interval": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: bug fixed in 7.6.1 - do: search: @@ -246,8 +246,8 @@ setup: --- "date_histogram on date_nanos with timezone calendar interval": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: bug fixed in 7.6.1 - do: search: @@ -276,8 +276,8 @@ setup: --- "date_histogram and date_histogram_composite timezone": - - skip: - version: " - 7.16.99" + - requires: + cluster_features: ["gte_v7.17.0"] reason: bug fixed somewhere between 7.2 and 7.17 - do: search: @@ -337,8 +337,8 @@ setup: --- "Multi-value date histogram": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -359,8 +359,8 @@ setup: --- "Multi-value date histogram docvalues only": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml index af78ab3a3677e..f8d8f2a379c83 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml @@ -123,8 +123,8 @@ setup: --- "Date range unmapped with children": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: Fixed in 7.10.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml index cbd642d3583d3..fec89e6d33e7d 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml @@ -30,8 +30,8 @@ setup: --- "Test numeric terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: search: @@ -50,8 +50,8 @@ setup: --- "Test keyword terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: search: @@ -70,8 +70,8 @@ setup: --- "Test unmapped string terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: bulk: @@ -95,8 +95,8 @@ setup: --- "Test composite str_terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: search: @@ -122,8 +122,8 @@ setup: --- "Test composite num_terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: search: @@ -149,10 +149,10 @@ setup: --- "Single bucket filters agg with doc_count": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: implementation change in 8.0 - features: default_shards + test_runner_features: default_shards - do: search: @@ -177,10 +177,10 @@ setup: --- "Filters agg with doc_count": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: implementation changed when there is more than one bucket 8.3.0 - features: default_shards + test_runner_features: default_shards - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml index 7d173ce9511bb..3374e21e2a566 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml @@ -187,8 +187,8 @@ setup: --- "Sorting terms": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: fixed in 7.7.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filters_bucket.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filters_bucket.yml index da3010ad8437a..c128a33a7358e 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filters_bucket.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filters_bucket.yml @@ -137,8 +137,8 @@ setup: --- "named filters with bucket sort test": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: introduced in 8.8.0 - do: search: @@ -288,8 +288,8 @@ setup: --- no meta: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Fixed in 8.5" - do: @@ -315,8 +315,8 @@ no meta: --- empty meta: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Fixed in 8.5" - do: @@ -342,8 +342,8 @@ empty meta: --- null meta: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Fixed in 8.5" - do: @@ -365,8 +365,8 @@ null meta: --- "Bad params": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "empty bodies throws exception starting in 7.2" - do: catch: /\[filters\] cannot be empty/ @@ -390,8 +390,8 @@ null meta: --- "cache busting": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: cache fixed in 7.11.0 - do: @@ -458,8 +458,8 @@ null meta: --- nested: - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: fixed in 7.11.0 # Tests that we don't accidentally match nested documents when the filter diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/geo_distance.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/geo_distance.yml index 275216291ba13..657d81adba32b 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/geo_distance.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/geo_distance.yml @@ -46,8 +46,8 @@ setup: --- "avg_bucket": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: Fixed in 7.8.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/global.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/global.yml index 34e357bd74249..da330fd586512 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/global.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/global.yml @@ -36,8 +36,8 @@ simple: --- profile: - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: fix introduced in 7.13.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/histogram.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/histogram.yml index e84b296a04ecf..9d5b9bdf1bb92 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/histogram.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/histogram.yml @@ -255,8 +255,8 @@ setup: --- "histogram with hard bounds": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: hard_bounds were introduced in 7.10.0 - do: @@ -432,8 +432,8 @@ setup: --- "date_histogram": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -504,8 +504,8 @@ setup: --- "date_histogram with offset": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -557,8 +557,8 @@ setup: --- "date_histogram on range": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -609,8 +609,8 @@ setup: --- "date_histogram on range with offset": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -662,8 +662,8 @@ setup: --- "date_histogram with pre-epoch daylight savings time transition": - - skip: - version: " - 7.6.1" + - requires: + cluster_features: ["gte_v7.6.2"] reason: bug fixed in 7.6.1. - do: @@ -708,8 +708,8 @@ setup: --- "histogram profiler": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug info added in 7.9.0 - do: @@ -765,8 +765,8 @@ setup: --- "date_histogram profiler": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug info added in 7.9.0 - do: @@ -816,8 +816,8 @@ setup: --- "date_histogram with extended_bounds and offset and unmapped": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: fixed in 7.11 - do: @@ -874,8 +874,8 @@ setup: --- "Tiny tiny tiny range": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: fixed in 7.13.0 - do: @@ -902,8 +902,8 @@ setup: --- "Tiny tiny tiny date_range": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: fixed in 7.14.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_prefix.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_prefix.yml index f590fa8807d7b..7160946414caa 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_prefix.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_prefix.yml @@ -42,8 +42,8 @@ setup: --- "IPv4 prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -76,8 +76,8 @@ setup: # high 24 bits of a field which is an IPv4 address encoded on 16 bytes. As a result the # network part will just 0s. "IPv4 prefix with incorrect is_ipv6": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -101,8 +101,8 @@ setup: --- "IPv4 short prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -138,8 +138,8 @@ setup: --- "IPv6 prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -172,8 +172,8 @@ setup: # it will be the 2 bytes whose value is set to 12 hexadecimal) which results to 18 decimal, # with everything else being 0s. "IPv6 prefix with incorrect is_ipv6": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -198,8 +198,8 @@ setup: --- "Invalid IPv4 prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: catch: /\[prefix_length\] must be in range \[0, 32\] while value is \[44\]/ @@ -216,8 +216,8 @@ setup: --- "Invalid IPv6 prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: catch: /\[prefix_length] must be in range \[0, 128\] while value is \[170]/ @@ -233,8 +233,8 @@ setup: --- "IPv4 prefix sub aggregation": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -275,8 +275,8 @@ setup: --- "IPv6 prefix sub aggregation": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -316,8 +316,8 @@ setup: --- "IPv6 prefix metric sub aggregation": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -353,8 +353,8 @@ setup: --- "IPv4 prefix appended": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -385,8 +385,8 @@ setup: --- "IPv6 prefix appended": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -417,8 +417,8 @@ setup: --- "Mixed IPv4 and IPv6 with is_ipv6 false": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -448,8 +448,8 @@ setup: --- "Mixed IPv4 and IPv6 with is_ipv6 true": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_range.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_range.yml index 0dde5cc5c6326..1188482dadc84 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_range.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_range.yml @@ -136,8 +136,8 @@ setup: --- "IP Range avg_bucket": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: Fixed in 7.8.0 - do: bulk: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/matrix_stats_multi_value_field.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/matrix_stats_multi_value_field.yml index 6240b51cc48a8..9514f3343c8ac 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/matrix_stats_multi_value_field.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/matrix_stats_multi_value_field.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: serialization bug fixed in 8.7.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/max_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/max_metric.yml index 8c81f74a4c664..a5b33a8f9cc1b 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/max_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/max_metric.yml @@ -200,8 +200,8 @@ setup: --- "Merging results with unmapped fields": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: Fixed in 8.5.0 - do: @@ -218,8 +218,8 @@ setup: --- "Counter field": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/median_absolute_deviation_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/median_absolute_deviation_metric.yml index 65408812c6518..cd5e5deead8c3 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/median_absolute_deviation_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/median_absolute_deviation_metric.yml @@ -77,8 +77,8 @@ setup: --- "with execution hint": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/min_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/min_metric.yml index b08f9a6905572..eb85790f03832 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/min_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/min_metric.yml @@ -201,8 +201,8 @@ setup: --- "Counter field": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/moving_fn.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/moving_fn.yml index 177bafaa07adf..cd6feb601b1df 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/moving_fn.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/moving_fn.yml @@ -769,8 +769,8 @@ bad path: --- "Bad window": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "calendar_interval added in 7.2" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentile_ranks_tdigest_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentile_ranks_tdigest_metric.yml index 60ab82588006c..ab4f57c3c50df 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentile_ranks_tdigest_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentile_ranks_tdigest_metric.yml @@ -53,9 +53,9 @@ basic: --- with compression: - - skip: - features: close_to - version: " - 8.8.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: search: @@ -75,9 +75,9 @@ with compression: --- with execution hint: - - skip: - features: close_to - version: " - 8.8.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentiles_tdigest_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentiles_tdigest_metric.yml index c703727c9146f..be8f28d2f8629 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentiles_tdigest_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentiles_tdigest_metric.yml @@ -44,8 +44,8 @@ setup: --- "Basic test": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: search: @@ -188,9 +188,9 @@ setup: --- "Execution hint": - - skip: - features: close_to - version: " - 8.8.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/pipeline.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/pipeline.yml index 3189afce08a88..c8e86024d59c2 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/pipeline.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/pipeline.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: These new error messages were added in 7.2 - do: @@ -100,10 +100,10 @@ setup: --- "Max pipeline on percentiles tdigest agg with single percent metric value": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: behaviour changed in 8.4.0 - features: close_to + test_runner_features: close_to - do: search: @@ -236,10 +236,10 @@ setup: --- "Max pipeline on percentiles hdr agg with single percent metric value": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: behaviour changed in 8.4.0 - features: close_to + test_runner_features: close_to - do: search: @@ -353,10 +353,10 @@ setup: --- "Max pipeline on percentiles with incorrect name": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: behaviour changed in 8.4.0 - features: close_to + test_runner_features: close_to - do: catch: /No aggregation \[unknown_aggregation\] found for path \[the_terms\>unknown_aggregation\]\;/ diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml index 4e93e9c83785f..5b2c2dc379cb9 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml @@ -30,9 +30,9 @@ setup: --- "Test random_sampler aggregation with no filter": - - skip: - features: close_to - version: " - 8.1.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.2.0"] reason: added in 8.2.0 - do: search: @@ -80,8 +80,8 @@ setup: - match: { aggregations.sampled.mean.value: 2.5 } --- "Test random_sampler aggregation with filter": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: added in 8.2.0 - do: search: @@ -143,8 +143,8 @@ setup: - match: { aggregations.sampled.mean.value: 1.0 } --- "Test random_sampler aggregation with poor settings": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: added in 8.2.0 - do: catch: /\[probability\] must be between 0.0 and 0.5 or exactly 1.0, was \[1.5\]/ diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range.yml index cf110dc3e7af2..639ea6649ddb2 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range.yml @@ -73,8 +73,8 @@ setup: --- "Float Endpoint Exclusive": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: Bug fixed in 7.16.0 - do: search: @@ -102,8 +102,8 @@ setup: --- "Half Float Endpoint Exclusive": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: Bug fixed in 7.16.0 - do: search: @@ -131,8 +131,8 @@ setup: --- "Float range": - - skip: - version: " - 7.17.0" + - requires: + cluster_features: ["gte_v7.17.1"] reason: Bug fixed in 8.1.0 and backported to 7.17.1 - do: search: @@ -170,8 +170,8 @@ setup: --- "Double range": - - skip: - version: " - 7.16.99" + - requires: + cluster_features: ["gte_v7.17.0"] reason: Bug fixed in 8.1.0 and backported to 7.17.0 - do: search: @@ -209,8 +209,8 @@ setup: --- "Double range on long field": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: Bug fixed in 8.1.0 - do: search: @@ -433,8 +433,8 @@ setup: --- "Range aggregation on date field": - - skip: - version: " - 7.16.99" + - requires: + cluster_features: ["gte_v7.17.0"] reason: Fixed in 8.1.0 and backported to 7.17.0 - do: @@ -462,8 +462,8 @@ setup: --- "Min and max long range bounds": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: Bug fixed in 8.1.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range_timezone_bug.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range_timezone_bug.yml index 87641f43211db..fcecf8c110e74 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range_timezone_bug.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range_timezone_bug.yml @@ -20,8 +20,8 @@ setup: --- "respect offsets in range bounds": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Fixed in 7.16" - do: search: @@ -54,8 +54,8 @@ setup: --- "offsets and timezones play nicely together": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Fixed in 7.16" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/rare_terms.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/rare_terms.yml index 3235925d8e00e..a1dc99ca46d01 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/rare_terms.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/rare_terms.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: RareTerms added in 7.3.0 - do: indices.create: @@ -308,8 +308,8 @@ setup: --- "sub aggs": - - skip: - version: " - 7.6.1" + - requires: + cluster_features: ["gte_v7.6.2"] reason: Sub aggs fixed in 7.6.1 - do: @@ -356,8 +356,8 @@ setup: --- "avg_bucket": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: Fixed in 7.8.0 - do: indices.create: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/serial_diff.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/serial_diff.yml index 1f75802811405..96f9387769983 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/serial_diff.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/serial_diff.yml @@ -121,8 +121,8 @@ parent has gap: --- parent has min_doc_count: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: allowed in 8.3.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/sig_terms.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/sig_terms.yml index 777820c0c0ba8..e8b0419589ed3 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/sig_terms.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/sig_terms.yml @@ -74,8 +74,8 @@ --- "Test background filter count ": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: bugfix introduced in 7.15.0 - do: @@ -221,8 +221,8 @@ --- 'Misspelled fields get "did you mean"': - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: introduced in 7.7.0 - do: catch: /\[significant_terms\] unknown field \[jlp\] did you mean \[jlh\]\?/ @@ -236,8 +236,8 @@ --- "Test alias background filter": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: fixed in 8.4 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_text.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_text.yml index 1b940014e8d60..39ceaa4ab901a 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_text.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_text.yml @@ -118,8 +118,8 @@ simple: --- profile: - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: extra profiling added in 7.14.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_texts.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_texts.yml index ef63c2853edef..485a2b2257a30 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_texts.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_texts.yml @@ -43,8 +43,8 @@ setup: --- "significant_texts all terms": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: @@ -88,8 +88,8 @@ setup: --- "significant_texts limited size": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: @@ -128,8 +128,8 @@ setup: --- "significant_texts with min_doc_count": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: @@ -164,8 +164,8 @@ setup: --- "significant_texts with exclude": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: @@ -207,8 +207,8 @@ setup: --- "significant_texts with include": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms.yml index de82c8351c43e..1b2d1ad6883eb 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms.yml @@ -79,8 +79,8 @@ setup: --- "IP test": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "Changed rest status for error in 8.12" - do: @@ -751,8 +751,8 @@ setup: --- "No field or script": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "Exception was a deep, server exception before 7.8" - do: catch: /Required one of fields \[field, script\], but none were specified/ @@ -763,8 +763,8 @@ setup: --- "string profiler via global ordinals filters implementation": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: profile info changed in 8.0.0 to be backported to 7.14.0 - do: bulk: @@ -815,8 +815,8 @@ setup: --- "string profiler via global ordinals native implementation": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug information added in 7.9.0 - do: bulk: @@ -927,8 +927,8 @@ setup: --- "string profiler via map": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug information added in 7.9.0 - do: bulk: @@ -976,8 +976,8 @@ setup: --- "numeric profiler": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug information added in 7.9.0 - do: bulk: @@ -1013,8 +1013,8 @@ setup: --- "min_doc_count": - - skip: - version: " - 7.9.2" + - requires: + cluster_features: ["gte_v7.9.3"] reason: broken in 7.9.1, was fixed in 7.9.2 - do: @@ -1178,9 +1178,9 @@ setup: --- "order by sub agg containing nested": - - skip: - version: " - 7.11.2" - reason: "It was fixed in 7.11.2" + - requires: + cluster_features: ["gte_v7.11.3"] + reason: "It was fixed in 7.11.2" - do: indices.put_mapping: index: test_1 @@ -1334,9 +1334,9 @@ precise size: --- huge size: - - skip: - version: " - 7.14.0" - reason: "Fixed in 7.14.1" + - requires: + cluster_features: ["gte_v7.14.1"] + reason: "Fixed in 7.14.1" - do: bulk: @@ -1378,9 +1378,9 @@ huge size: --- Value type mismatch fails shard: - - skip: - version: " - 8.0.99" - reason: "Fixed in 8.1" + - requires: + cluster_features: ["gte_v8.1.0"] + reason: "Fixed in 8.1" - do: indices.create: @@ -1452,9 +1452,9 @@ Value type mismatch fails shard: --- Value type mismatch fails shard with no docs: - - skip: - version: " - 8.0.99" - reason: "Fixed in 8.1" + - requires: + cluster_features: ["gte_v8.1.0"] + reason: "Fixed in 8.1" - do: indices.create: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_disable_opt.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_disable_opt.yml index a3e606beeadad..a22bb2afdc475 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_disable_opt.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_disable_opt.yml @@ -36,8 +36,8 @@ teardown: --- disable optimization: - - skip: - version: " - 7.13.1" + - requires: + cluster_features: ["gte_v7.13.2"] reason: setting to disable optimization added in 7.13.2 - do: @@ -65,8 +65,8 @@ disable optimization: --- enable optimization: - - skip: - version: " - 7.13.1" + - requires: + cluster_features: ["gte_v7.13.2"] reason: setting to disable optimization added in 7.13.2 - do: @@ -93,8 +93,8 @@ enable optimization: --- enabled by default: - - skip: - version: " - 7.13.1" + - requires: + cluster_features: ["gte_v7.13.2"] reason: setting to disable optimization added in 7.13.2 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_flattened_field.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_flattened_field.yml index 9576b3a3d9589..8270fc59dc3bb 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_flattened_field.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_flattened_field.yml @@ -25,8 +25,8 @@ setup: - '{"flattened.primary": "quux"}' --- "Key exists, no missing values": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: @@ -49,8 +49,8 @@ setup: - match: { aggregations.primary_terms.buckets.2.doc_count: 1 } --- "Key exists, missing values, missing specified": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: @@ -74,8 +74,8 @@ setup: - match: { aggregations.primary_terms.buckets.2.doc_count: 1 } --- "Key exists, missing values, missing not specified": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: @@ -95,8 +95,8 @@ setup: - match: { aggregations.primary_terms.buckets.1.doc_count: 1 } --- "Key does not exist, missing specified": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: @@ -115,8 +115,8 @@ setup: - match: { aggregations.primary_terms.buckets.0.doc_count: 4 } --- "Key does not exist, missing not specified": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml index 421c0c5800949..7800923ab1580 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: "8.7.00 - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "Synthetic source shows up in the mapping in 8.10 and on, may trigger assert failures in mixed cluster tests" - do: @@ -54,8 +54,8 @@ setup: --- "Basic test": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: Time series result serialization changed in 8.6.0 - do: @@ -83,8 +83,8 @@ setup: --- "Basic test profiled": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: Time series profiling enabled in 8.8 - do: @@ -107,8 +107,8 @@ setup: --- "Size test": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -151,8 +151,8 @@ setup: --- "Score test filter some": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: Time series min score fixed in 8.9 - do: @@ -179,8 +179,8 @@ setup: --- "Score test filter all": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: Time series min score fixed in 8.9 - do: @@ -205,8 +205,8 @@ setup: --- "Sampler aggregation with nested time series aggregation failure": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Handling for time series aggregation failures introduced in 8.7.0" - do: @@ -234,8 +234,8 @@ setup: --- "Composite aggregation with nested time series aggregation failure": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Handling for time series aggregation failures introduced in 8.7.0" - do: @@ -271,8 +271,8 @@ setup: --- "Global aggregation with nested time series aggregation failure": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Handling for time series aggregation failures introduced in 8.7.0" - do: @@ -293,8 +293,8 @@ setup: field: val --- "Configure with no synthetic source": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "Error message fix in 8.9" - do: @@ -311,8 +311,8 @@ setup: --- "Number for keyword routing field": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -354,8 +354,8 @@ setup: # collection and reduction order. Note that changing the hashing algorithm might require selecting proper values # for dimensions fields such that sort(_tsid, timestamp) != sort(_tsid hash, timestamp). - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -453,8 +453,8 @@ setup: --- "auto_date_histogram aggregation with time_series aggregation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Handling for time series aggregation failures introduced in 8.13.0" - do: @@ -472,8 +472,8 @@ setup: --- "variable_width_histogram aggregation with time_series aggregation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Handling for time series aggregation failures introduced in 8.13.0" - do: @@ -491,8 +491,8 @@ setup: --- "rare_terms aggregation with time_series aggregation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Handling for time series aggregation failures introduced in 8.13.0" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits.yml index 5cf0265374b08..ed24e1cc8404c 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits.yml @@ -348,8 +348,8 @@ sequence number and primary term: --- synthetic _source: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -432,8 +432,8 @@ synthetic _source: --- "having": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: fixed in 8.9.0 - do: bulk: @@ -719,8 +719,8 @@ synthetic _source: --- runtime fields: - - skip: - version: " - 8.9.1" + - requires: + cluster_features: ["gte_v8.9.2"] reason: "bugfix #97460 added in 8.9.1" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits_nested_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits_nested_metric.yml index fa675360881ea..2f448808eb677 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits_nested_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits_nested_metric.yml @@ -79,8 +79,8 @@ setup: --- "top_hits aggregation with nested documents and disabled _source": - - skip: - version: " - 7.10.1" + - requires: + cluster_features: ["gte_v7.10.2"] reason: "bug fix introduced in 7.10.2" - do: indices.create: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/typed_keys.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/typed_keys.yml index fdc997e771311..7041dc5b85a16 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/typed_keys.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/typed_keys.yml @@ -203,8 +203,8 @@ setup: --- "Test typed keys parameter for date_histogram aggregation and max_bucket pipeline aggregation": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "calendar_interval added in 7.2" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/variable_width_histogram.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/variable_width_histogram.yml index d42bc1cbff436..0f66dd0d871b9 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/variable_width_histogram.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/variable_width_histogram.yml @@ -37,8 +37,8 @@ setup: --- defaults: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: added in 7.9.0 - do: search: @@ -63,8 +63,8 @@ defaults: --- num_buckets: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: added in 7.9.0 - do: search: @@ -83,8 +83,8 @@ num_buckets: --- shard_size: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: added in 7.9.0 - do: search: @@ -103,8 +103,8 @@ shard_size: --- initial_buffer: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: added in 7.9.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/weighted_avg.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/weighted_avg.yml index 3563e0da18e59..a43b00ce61552 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/weighted_avg.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/weighted_avg.yml @@ -183,10 +183,10 @@ setup: --- "Multi weight field not allowed": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "Changed status code in 8.12" - features: close_to + test_runner_features: close_to - do: catch: bad_request search: diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml index a19a1f2721910..b9476e04f9965 100644 --- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml +++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml @@ -1,8 +1,8 @@ --- "get cluster stats returns analysis stats": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "analysis stats are added for v7.7.0" - do: diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/20_analysis_stats_synonyms.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/20_analysis_stats_synonyms.yml index de766acbcd437..5583bb98dc1ca 100644 --- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/20_analysis_stats_synonyms.yml +++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/20_analysis_stats_synonyms.yml @@ -1,8 +1,8 @@ --- "get cluster stats returns synonym sets stats": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "synonym sets stats are added for v8.10.0" - do: diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml index 35a611d13f359..97f63310b0b03 100644 --- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml +++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml @@ -22,8 +22,8 @@ setup: --- "Test use_field": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: search: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/100_delete_by_query.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/100_delete_by_query.yml index 7f1ec1f2c6855..b88584f9038f8 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/100_delete_by_query.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/100_delete_by_query.yml @@ -1,8 +1,8 @@ --- "DBQ from data stream": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -68,9 +68,9 @@ --- "Delete by query for multiple data streams": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/10_basic.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/10_basic.yml index 6187c1a0dfed1..a7ec537823827 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/10_basic.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/10_basic.yml @@ -29,8 +29,8 @@ setup: --- "Create data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -113,8 +113,8 @@ setup: --- "Create hidden data stream": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "hidden data streams only available in 7.11" - do: allowed_warnings: @@ -209,8 +209,8 @@ setup: --- "Create data stream with failure store": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "data stream failure stores only creatable in 8.11+" - do: @@ -310,8 +310,8 @@ setup: --- "Create data stream with invalid name": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -325,8 +325,8 @@ setup: --- "Create existing data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -350,8 +350,8 @@ setup: --- "Get data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -415,8 +415,8 @@ setup: --- "Get data stream and check DSL and ILM information": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "data streams DSL and ILM mixing information available in 8.11+" - do: @@ -486,8 +486,8 @@ setup: --- "Delete data stream with backing indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -537,9 +537,9 @@ setup: --- "Delete data stream with failure stores": - - skip: - version: " - 8.11.99" - reason: "data stream failure stores only supported in 8.12+" + - requires: + cluster_features: ["gte_v8.12.0"] + reason: "data stream failure stores only supported in 8.12+" - do: allowed_warnings: @@ -611,8 +611,8 @@ setup: --- "Delete data stream missing behaviour": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -656,8 +656,8 @@ setup: --- "Delete data stream by wildcard": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams supported only in 7.9+" - do: @@ -693,10 +693,10 @@ setup: --- "append-only writes to backing indices prohibited": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -755,10 +755,10 @@ setup: --- "Indexing a document into a data stream without a timestamp field": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -804,10 +804,10 @@ setup: --- "Include metadata in a data stream": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "re-enable in 7.11 when backported" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -846,10 +846,10 @@ setup: --- "Create index into a namespace that is governed by a data stream template": - - skip: - version: " - 7.9.1" + - requires: + cluster_features: ["gte_v7.9.2"] reason: "validation added in 7.9.2" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -874,8 +874,8 @@ setup: --- "Get data stream api check existence of replicated field": - - skip: - version: " - 7.16.0" + - requires: + cluster_features: ["gte_v7.16.1"] reason: "replicated field only supported in 7.16+" - do: @@ -925,8 +925,8 @@ setup: --- "Get data stream api check existence of allow_custom_routing field": - - skip: - version: " - 8.0.0" + - requires: + cluster_features: ["gte_v8.0.1"] reason: "allow_custom_routing field only supported in 8.0+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/110_update_by_query.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/110_update_by_query.yml index ccf7cead1d70d..53cc8279b5ae3 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/110_update_by_query.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/110_update_by_query.yml @@ -1,8 +1,8 @@ --- "Update by query from data stream": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -107,9 +107,9 @@ --- "Update by query for multiple data streams": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/120_data_streams_stats.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/120_data_streams_stats.yml index 21eceeccf6c1b..7ee9e656007ed 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/120_data_streams_stats.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/120_data_streams_stats.yml @@ -26,8 +26,8 @@ setup: --- "No data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -38,8 +38,8 @@ setup: --- "Empty data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -67,8 +67,8 @@ setup: --- "Single data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -99,8 +99,8 @@ setup: --- "Rolled over data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -144,8 +144,8 @@ setup: --- "Multiple data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/130_migrate_to_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/130_migrate_to_data_stream.yml index fcacdc437a9dc..73ce2afb26aab 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/130_migrate_to_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/130_migrate_to_data_stream.yml @@ -1,9 +1,9 @@ --- "Migrate to data stream": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "migrate API released in 7.11.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/140_data_stream_aliases.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/140_data_stream_aliases.yml index 1050d6e01a95f..6eaa751f845a2 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/140_data_stream_aliases.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/140_data_stream_aliases.yml @@ -1,9 +1,9 @@ --- "Create data stream alias": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: "data streams aliases are available from 7.14.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -74,10 +74,10 @@ --- "Create data stream alias with filter": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: "data stream alias filter supported was added in 7.15.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -154,10 +154,10 @@ --- "Create data stream aliases using wildcard expression": - - skip: - version: " - 7.14.0" + - requires: + cluster_features: ["gte_v7.14.1"] reason: "bugfix fixed from 7.14.1 and later" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -196,10 +196,10 @@ --- "Fix IndexNotFoundException error when handling remove alias action": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Fix available from 7.16.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -262,10 +262,10 @@ --- "Test get alias with non-matching data streams": - - skip: - version: " - 8.12.1" + - requires: + cluster_features: ["gte_v8.12.2"] reason: "bugfix fixed from 8.12.1 and later" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/150_tsdb.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/150_tsdb.yml index 683cf675cda8e..355a549b6fbf1 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/150_tsdb.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/150_tsdb.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -86,8 +86,8 @@ setup: --- created the data stream: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -132,8 +132,8 @@ created the data stream: --- fetch the tsid: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -151,8 +151,8 @@ fetch the tsid: --- "aggregate the tsid": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hahing introduced in 8.13 - do: @@ -194,8 +194,8 @@ index without timestamp with pipeline: --- dynamic templates: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for dynamic fields was added in 8.13" - do: allowed_warnings: @@ -325,8 +325,8 @@ dynamic templates: --- dynamic templates - conflicting aliases: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for dynamic fields was added in 8.13" - do: allowed_warnings: @@ -422,8 +422,8 @@ dynamic templates - conflicting aliases: --- dynamic templates with nesting: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for dynamic fields was added in 8.13" - do: allowed_warnings: @@ -579,8 +579,8 @@ dynamic templates with nesting: --- dynamic templates with incremental indexing: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for dynamic fields was added in 8.13" - do: allowed_warnings: @@ -773,8 +773,8 @@ dynamic templates with incremental indexing: --- subobject in passthrough object auto flatten: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for passthrough fields was added in 8.13" - do: allowed_warnings: @@ -818,8 +818,8 @@ subobject in passthrough object auto flatten: --- enable subobjects in passthrough object: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for passthrough fields was added in 8.13" - do: catch: /Mapping definition for \[attributes\] has unsupported parameters:\ \[subobjects \:\ true\]/ diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/170_modify_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/170_modify_data_stream.yml index b0a3c45d8f6bc..5edcf0e61c56b 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/170_modify_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/170_modify_data_stream.yml @@ -1,9 +1,9 @@ --- "Modify a data stream": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "this API was released in 7.16.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/180_simulate_existing_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/180_simulate_existing_data_stream.yml index 87ca5a0c7a0b9..94918a7f90612 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/180_simulate_existing_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/180_simulate_existing_data_stream.yml @@ -1,9 +1,9 @@ --- "Simulate an index with the same name as a data stream that already exists": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "simulating index template API for an existing index has not yet been backported" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml index f22267357104e..7268ee9bb3b56 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml @@ -22,10 +22,10 @@ teardown: --- "Redirect ingest failure in data stream to failure store": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "data stream failure stores only redirect ingest failures in 8.13+" - features: [allowed_warnings, contains] + test_runner_features: [allowed_warnings, contains] - do: ingest.put_pipeline: @@ -111,10 +111,10 @@ teardown: --- "Redirect shard failure in data stream to failure store": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "data stream failure stores only redirect shard failures in 8.14+" - features: [allowed_warnings, contains] + test_runner_features: [allowed_warnings, contains] - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_require_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_require_data_stream.yml index df9f0840f575f..d9f26343a4549 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_require_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_require_data_stream.yml @@ -1,9 +1,9 @@ --- "Testing require_data_stream in index creation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "require_data_stream was introduced in 8.13.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -59,10 +59,10 @@ --- "Testing require_data_stream in bulk requests": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "require_data_stream was introduced in 8.13.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/200_rollover_failure_store.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/200_rollover_failure_store.yml index 46d46e8291ae9..0074ce425c6f9 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/200_rollover_failure_store.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/200_rollover_failure_store.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "data stream failure store rollover only supported in 8.14+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml index 32eb908331026..709eb41ccb61d 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml @@ -1,9 +1,9 @@ --- "Test apis that do not supported data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -57,10 +57,10 @@ --- "Prohibit clone on data stream's write index": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -101,10 +101,10 @@ --- "Prohibit shrink on data stream's write index": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -144,10 +144,10 @@ --- "Prohibit split on data stream's write index": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -188,10 +188,10 @@ --- "Non append-only writes into a data stream": - - skip: - version: " - 7.9.3" + - requires: + cluster_features: ["gte_v7.9.4"] reason: "validation bug only backported to 7.9.3" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/30_auto_create_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/30_auto_create_data_stream.yml index 303a584555f8f..32338fea056ae 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/30_auto_create_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/30_auto_create_data_stream.yml @@ -1,9 +1,9 @@ --- "Put index template": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -49,10 +49,10 @@ --- "Put index template with failure store": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "data stream failure stores only creatable in 8.11+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml index 7117ad4861840..72fce418d8899 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml @@ -23,8 +23,8 @@ teardown: --- "Verify get index api": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" # save the backing index names for later use @@ -41,8 +41,8 @@ teardown: --- "Verify get mapping api": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" # save the backing index names for later use @@ -59,10 +59,10 @@ teardown: --- "Verify shard stores api": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -118,9 +118,9 @@ teardown: - is_true: acknowledged --- "Verify search shards api": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -150,9 +150,9 @@ teardown: --- "Verify get field mappings api": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -189,10 +189,10 @@ teardown: --- "Open write index for data stream opens all backing indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -262,10 +262,10 @@ teardown: --- "Verify rank eval with data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: index: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/50_delete_backing_indices.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/50_delete_backing_indices.yml index 729e376bfabad..4c46d4919dcbd 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/50_delete_backing_indices.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/50_delete_backing_indices.yml @@ -12,8 +12,8 @@ setup: --- "Delete backing index on data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -73,8 +73,8 @@ setup: --- "Attempt to delete write index on data stream is rejected": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/60_get_backing_indices.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/60_get_backing_indices.yml index d74ab4770fcc5..a92871f066f84 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/60_get_backing_indices.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/60_get_backing_indices.yml @@ -1,9 +1,9 @@ --- "Get backing indices for data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/70_rollover_data_streams.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/70_rollover_data_streams.yml index bcf207e52d7cb..a66c2bd1448de 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/70_rollover_data_streams.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/70_rollover_data_streams.yml @@ -1,9 +1,9 @@ --- "Roll over a data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml index 8694a14448daa..810b0e43a0da6 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index api only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -66,8 +66,8 @@ setup: --- "Resolve index with indices, aliases, and data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index api only supported in 7.9+" - do: @@ -110,8 +110,8 @@ setup: --- "Resolve index with hidden and closed indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index api only supported in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/90_reindex.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/90_reindex.yml index 3d70acdd4ea2d..ea2b49c9139dc 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/90_reindex.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/90_reindex.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do : allowed_warnings: @@ -22,10 +22,10 @@ teardown: --- "Reindex from data stream into another data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: index: @@ -55,10 +55,10 @@ teardown: --- "Reindex from index into data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: index: @@ -88,10 +88,10 @@ teardown: --- "Reindex from data stream into an index": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: index: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml index e2268ee9118ac..745fd342d3a43 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml @@ -1,9 +1,9 @@ --- "Create data stream with lifecycle": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Data stream lifecycle with effective retention was released in 8.14" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: - "index template [template-with-lifecycle] has index patterns [managed-data-stream] matching patterns from existing older templates [global] with patterns (global => [*]); this template [template-with-lifecycle] will take precedence during new index creation" diff --git a/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml b/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml index 8a27108cf9a85..523213919484a 100644 --- a/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml +++ b/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml @@ -1,7 +1,7 @@ --- "Test ingest attachment processor with .doc file": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "new fields added in 8.0.0" - do: ingest.put_pipeline: @@ -44,8 +44,8 @@ --- "Test ingest attachment processor with .docx file": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "tika upgraded in 8.3.0" - do: ingest.put_pipeline: diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/15_info_ingest.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/15_info_ingest.yml index 56f80d7bbe1db..e2b226abb70b7 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/15_info_ingest.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/15_info_ingest.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "/_info/ingest only available from v8.9" --- diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml index 53928894ceec7..c4bac119d849b 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml @@ -280,8 +280,8 @@ teardown: --- "Test adding circular references fails pipeline": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "Test causes fatal error prior to 8.3.0" - do: diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml index 59fd640705e26..8a7b28760adcc 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml @@ -67,8 +67,8 @@ teardown: --- "Test Pipeline Processor with Circular Pipelines": -- skip: - version: " - 8.12.99" +- requires: + cluster_features: ["gte_v8.13.0"] reason: exception class changed in 8.13.0 - do: ingest.put_pipeline: diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml index 68fa8d6c86014..f93a35aac2c9c 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml @@ -1,7 +1,7 @@ --- "Test pipeline versioned updates": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "added versioned updates in 7.16.0" - do: diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml index 0c18cd8814bbf..c8ef06a18fe74 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml @@ -186,8 +186,8 @@ teardown: --- "Update with pipeline": - - skip: - version: " - 7.17.4" + - requires: + cluster_features: ["gte_v7.17.5"] reason: "fixed in 7.17.5" - do: diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/Database.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/Database.java index b1c9c99ace03e..0e6f25d02ee88 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/Database.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/Database.java @@ -39,9 +39,9 @@ enum Database { Property.LOCATION ), Set.of( - Property.CONTINENT_NAME, - Property.COUNTRY_NAME, Property.COUNTRY_ISO_CODE, + Property.COUNTRY_NAME, + Property.CONTINENT_NAME, Property.REGION_ISO_CODE, Property.REGION_NAME, Property.CITY_NAME, @@ -55,11 +55,31 @@ enum Database { Asn( Set.of(Property.IP, Property.ASN, Property.ORGANIZATION_NAME, Property.NETWORK), Set.of(Property.IP, Property.ASN, Property.ORGANIZATION_NAME, Property.NETWORK) + ), + AnonymousIp( + Set.of( + Property.IP, + Property.HOSTING_PROVIDER, + Property.TOR_EXIT_NODE, + Property.ANONYMOUS_VPN, + Property.ANONYMOUS, + Property.PUBLIC_PROXY, + Property.RESIDENTIAL_PROXY + ), + Set.of( + Property.HOSTING_PROVIDER, + Property.TOR_EXIT_NODE, + Property.ANONYMOUS_VPN, + Property.ANONYMOUS, + Property.PUBLIC_PROXY, + Property.RESIDENTIAL_PROXY + ) ); private static final String CITY_DB_SUFFIX = "-City"; private static final String COUNTRY_DB_SUFFIX = "-Country"; private static final String ASN_DB_SUFFIX = "-ASN"; + private static final String ANONYMOUS_IP_DB_SUFFIX = "-Anonymous-IP"; /** * Parses the passed-in databaseType (presumably from the passed-in databaseFile) and return the Database instance that is @@ -79,6 +99,8 @@ public static Database getDatabase(final String databaseType, final String datab database = Database.Country; } else if (databaseType.endsWith(Database.ASN_DB_SUFFIX)) { database = Database.Asn; + } else if (databaseType.endsWith(Database.ANONYMOUS_IP_DB_SUFFIX)) { + database = Database.AnonymousIp; } } @@ -147,7 +169,13 @@ enum Property { LOCATION, ASN, ORGANIZATION_NAME, - NETWORK; + NETWORK, + HOSTING_PROVIDER, + TOR_EXIT_NODE, + ANONYMOUS_VPN, + ANONYMOUS, + PUBLIC_PROXY, + RESIDENTIAL_PROXY; /** * Parses a string representation of a property into an actual Property instance. Not all properties that exist are diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseReaderLazyLoader.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseReaderLazyLoader.java index 3a02c08360b1e..89a180c1a5014 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseReaderLazyLoader.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseReaderLazyLoader.java @@ -12,6 +12,7 @@ import com.maxmind.db.Reader; import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.model.AbstractResponse; +import com.maxmind.geoip2.model.AnonymousIpResponse; import com.maxmind.geoip2.model.AsnResponse; import com.maxmind.geoip2.model.CityResponse; import com.maxmind.geoip2.model.CountryResponse; @@ -169,6 +170,12 @@ public AsnResponse getAsn(InetAddress ipAddress) { return getResponse(ipAddress, DatabaseReader::tryAsn); } + @Nullable + @Override + public AnonymousIpResponse getAnonymousIp(InetAddress ipAddress) { + return getResponse(ipAddress, DatabaseReader::tryAnonymousIp); + } + boolean preLookup() { return currentUsages.updateAndGet(current -> current < 0 ? current : current + 1) > 0; } diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDatabase.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDatabase.java index 0bcaab6e6915b..9109437d70ab8 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDatabase.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDatabase.java @@ -8,6 +8,7 @@ package org.elasticsearch.ingest.geoip; +import com.maxmind.geoip2.model.AnonymousIpResponse; import com.maxmind.geoip2.model.AsnResponse; import com.maxmind.geoip2.model.CityResponse; import com.maxmind.geoip2.model.CountryResponse; @@ -53,6 +54,9 @@ public interface GeoIpDatabase { @Nullable AsnResponse getAsn(InetAddress ipAddress); + @Nullable + AnonymousIpResponse getAnonymousIp(InetAddress ipAddress); + /** * Releases the current database object. Called after processing a single document. Databases should be closed or returned to a * resource pool. No further interactions should be expected. diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java index ea17338c25bbf..bdb2dcda044e3 100644 --- a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java +++ b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java @@ -9,6 +9,7 @@ package org.elasticsearch.ingest.geoip; import com.maxmind.db.Network; +import com.maxmind.geoip2.model.AnonymousIpResponse; import com.maxmind.geoip2.model.AsnResponse; import com.maxmind.geoip2.model.CityResponse; import com.maxmind.geoip2.model.CountryResponse; @@ -172,6 +173,7 @@ private Map getGeoData(GeoIpDatabase geoIpDatabase, String ip) t case City -> retrieveCityGeoData(geoIpDatabase, ipAddress); case Country -> retrieveCountryGeoData(geoIpDatabase, ipAddress); case Asn -> retrieveAsnGeoData(geoIpDatabase, ipAddress); + case AnonymousIp -> retrieveAnonymousIpGeoData(geoIpDatabase, ipAddress); }; } @@ -340,6 +342,46 @@ private Map retrieveAsnGeoData(GeoIpDatabase geoIpDatabase, Inet return geoData; } + private Map retrieveAnonymousIpGeoData(GeoIpDatabase geoIpDatabase, InetAddress ipAddress) { + AnonymousIpResponse response = geoIpDatabase.getAnonymousIp(ipAddress); + if (response == null) { + return Map.of(); + } + + boolean isHostingProvider = response.isHostingProvider(); + boolean isTorExitNode = response.isTorExitNode(); + boolean isAnonymousVpn = response.isAnonymousVpn(); + boolean isAnonymous = response.isAnonymous(); + boolean isPublicProxy = response.isPublicProxy(); + boolean isResidentialProxy = response.isResidentialProxy(); + + Map geoData = new HashMap<>(); + for (Property property : this.properties) { + switch (property) { + case IP -> geoData.put("ip", NetworkAddress.format(ipAddress)); + case HOSTING_PROVIDER -> { + geoData.put("hosting_provider", isHostingProvider); + } + case TOR_EXIT_NODE -> { + geoData.put("tor_exit_node", isTorExitNode); + } + case ANONYMOUS_VPN -> { + geoData.put("anonymous_vpn", isAnonymousVpn); + } + case ANONYMOUS -> { + geoData.put("anonymous", isAnonymous); + } + case PUBLIC_PROXY -> { + geoData.put("public_proxy", isPublicProxy); + } + case RESIDENTIAL_PROXY -> { + geoData.put("residential_proxy", isResidentialProxy); + } + } + } + return geoData; + } + /** * Retrieves and verifies a {@link GeoIpDatabase} instance for each execution of the {@link GeoIpProcessor}. Guards against missing * custom databases, and ensures that database instances are of the proper type before use. diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java index b40845246deb3..d3ec428243fbe 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java +++ b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java @@ -303,6 +303,39 @@ public void testAsn() throws Exception { assertThat(geoData.get("network"), equalTo("82.168.0.0/14")); } + public void testAnonymmousIp() throws Exception { + String ip = "81.2.69.1"; + GeoIpProcessor processor = new GeoIpProcessor( + randomAlphaOfLength(10), + null, + "source_field", + loader("/GeoIP2-Anonymous-IP-Test.mmdb"), + () -> true, + "target_field", + ALL_PROPERTIES, + false, + false, + "filename" + ); + + Map document = new HashMap<>(); + document.put("source_field", ip); + IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document); + processor.execute(ingestDocument); + + assertThat(ingestDocument.getSourceAndMetadata().get("source_field"), equalTo(ip)); + @SuppressWarnings("unchecked") + Map geoData = (Map) ingestDocument.getSourceAndMetadata().get("target_field"); + assertThat(geoData.size(), equalTo(7)); + assertThat(geoData.get("ip"), equalTo(ip)); + assertThat(geoData.get("hosting_provider"), equalTo(true)); + assertThat(geoData.get("tor_exit_node"), equalTo(true)); + assertThat(geoData.get("anonymous_vpn"), equalTo(true)); + assertThat(geoData.get("anonymous"), equalTo(true)); + assertThat(geoData.get("public_proxy"), equalTo(true)); + assertThat(geoData.get("residential_proxy"), equalTo(true)); + } + public void testAddressIsNotInTheDatabase() throws Exception { GeoIpProcessor processor = new GeoIpProcessor( randomAlphaOfLength(10), diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/MaxMindSupportTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/MaxMindSupportTests.java index d34d2798fdefe..97df5b006a195 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/MaxMindSupportTests.java +++ b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/MaxMindSupportTests.java @@ -60,6 +60,16 @@ */ public class MaxMindSupportTests extends ESTestCase { + private static final Set ANONYMOUS_IP_SUPPORTED_FIELDS = Set.of( + "anonymous", + "anonymousVpn", + "hostingProvider", + "publicProxy", + "residentialProxy", + "torExitNode" + ); + private static final Set ANONYMOUS_IP_UNSUPPORTED_FIELDS = Set.of("ipAddress", "network"); + private static final Set ASN_SUPPORTED_FIELDS = Set.of("autonomousSystemNumber", "autonomousSystemOrganization", "network"); private static final Set ASN_UNSUPPORTED_FIELDS = Set.of("ipAddress"); @@ -192,6 +202,8 @@ public class MaxMindSupportTests extends ESTestCase { ); private static final Map> TYPE_TO_SUPPORTED_FIELDS_MAP = Map.of( + Database.AnonymousIp, + ANONYMOUS_IP_SUPPORTED_FIELDS, Database.Asn, ASN_SUPPORTED_FIELDS, Database.City, @@ -200,6 +212,8 @@ public class MaxMindSupportTests extends ESTestCase { COUNTRY_SUPPORTED_FIELDS ); private static final Map> TYPE_TO_UNSUPPORTED_FIELDS_MAP = Map.of( + Database.AnonymousIp, + ANONYMOUS_IP_UNSUPPORTED_FIELDS, Database.Asn, ASN_UNSUPPORTED_FIELDS, Database.City, @@ -208,6 +222,8 @@ public class MaxMindSupportTests extends ESTestCase { COUNTRY_UNSUPPORTED_FIELDS ); private static final Map> TYPE_TO_MAX_MIND_CLASS = Map.of( + Database.AnonymousIp, + AnonymousIpResponse.class, Database.Asn, AsnResponse.class, Database.City, @@ -217,7 +233,6 @@ public class MaxMindSupportTests extends ESTestCase { ); private static final Set> KNOWN_UNSUPPORTED_RESPONSE_CLASSES = Set.of( - AnonymousIpResponse.class, ConnectionTypeResponse.class, DomainResponse.class, EnterpriseResponse.class, diff --git a/modules/ingest-geoip/src/test/resources/GeoIP2-Anonymous-IP-Test.mmdb b/modules/ingest-geoip/src/test/resources/GeoIP2-Anonymous-IP-Test.mmdb new file mode 100644 index 0000000000000..17fc3715090ae Binary files /dev/null and b/modules/ingest-geoip/src/test/resources/GeoIP2-Anonymous-IP-Test.mmdb differ diff --git a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml index 78170cb8af868..1170768086580 100644 --- a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml +++ b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml @@ -164,8 +164,8 @@ --- "Test explain templated search": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: Bug fix for explain in search template added in 8.8.0 - do: diff --git a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml index 9d20462900ab8..109bc8888889f 100644 --- a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml +++ b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml @@ -31,8 +31,8 @@ setup: --- "Basic multi-search template": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "status field checks were added in 8.3" - do: @@ -74,9 +74,9 @@ setup: --- "Multi-search template with errors": - - - skip: - version: " - 8.2.99" + + - requires: + cluster_features: ["gte_v8.3.0"] reason: "status field checks were added in 8.3" - do: @@ -151,8 +151,8 @@ setup: --- "Basic multi-search using stored template": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "status field checks were added in 8.3" - do: @@ -197,8 +197,8 @@ setup: --- "Test with rest_total_hits_as_int": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "status field checks were added in 8.3" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml index 37dbbe34a3ed1..8e5fcfddd48e1 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml @@ -1,7 +1,7 @@ # Integration tests for ScriptScoreQuery using Painless setup: - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "boost was corrected in script_score query from 8.0" - do: indices.create: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml index ed1f93ccc33db..6ac4ba01c34e5 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" - features: headers + test_runner_features: headers - do: indices.create: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml index 8b2a4f9887f95..c3d008ea69d07 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" - features: headers + test_runner_features: headers - do: indices.create: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml index a9f6948272f1a..09512b6585a1d 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml @@ -126,8 +126,8 @@ --- "Script Update Metadata": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "update metadata introduced in 8.4.0" - do: @@ -170,8 +170,8 @@ --- "Script Write Field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Write fields api introduced in 8.5.0" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml index fc24964feafe2..90e91c32c8f6f 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml @@ -27,8 +27,8 @@ setup: --- "Indexing of Dense vectors should error when dims don't match defined in the mapping": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "exception changed in 8.8" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml index 4848b1d576458..b1454a1fac3af 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" - features: headers + test_runner_features: headers - do: indices.create: @@ -31,8 +31,8 @@ setup: --- "Indexing of Dense vectors should error when dims don't match defined in the mapping": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "exception changed in 8.8" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml index dd0cc8cde92b6..b5c1362725b39 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml @@ -64,8 +64,8 @@ --- "Access to values of indexed dense_vector in script": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "Access to values of dense_vector in script was added in 7.13" - do: indices.create: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml index c361c0a082bcf..35119f179091e 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" --- diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml index 3d6db1b781caf..30a7943e271af 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml @@ -1,7 +1,7 @@ --- "Script errors contain position": - - skip: - version: " - 7.7.0" + - requires: + cluster_features: ["gte_v7.7.1"] reason: "position introduced in 7.7" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml index 75d2ca8d3a7a9..069f93352ff18 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml @@ -1,7 +1,7 @@ --- "size and isEmpty code works for any vector, including empty": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -87,8 +87,8 @@ --- "null can be used for default value": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -174,8 +174,8 @@ --- "empty dense vector throws for vector accesses": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -294,8 +294,8 @@ --- "dot product works on dense vectors": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -413,8 +413,8 @@ --- "iterator over dense vector values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -490,8 +490,8 @@ --- "l1Norm works on dense vectors": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -593,8 +593,8 @@ --- "l2Norm works on dense vectors": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -712,8 +712,8 @@ --- "cosineSimilarity works on dense vectors": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -811,8 +811,8 @@ --- "query vector of wrong type errors": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "Fields API for dense vector added in 8.2" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml index 643f694e12c3b..824d3061045ea 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" --- diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml index 8ab1cbf769d1a..4f19de00b83ef 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml @@ -96,8 +96,8 @@ --- "Script Upsert Metadata": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "update metadata introduced in 8.4.0" - do: @@ -190,8 +190,8 @@ --- "Script Write Field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Write fields api introduced in 8.5.0" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml index 1cf44a6b27d1c..06788a55c2d1d 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml @@ -500,8 +500,8 @@ --- "Script Score With Highlight": - - skip: - version: " - 7.4.0" + - requires: + cluster_features: ["gte_v7.4.1"] reason: "highlight for script_score was introduced in 7.4.1" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml index d96b0ce42ec24..4737d66624f91 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml @@ -1,8 +1,8 @@ # Integration tests for ScriptScoreQuery using Painless setup: -- skip: - version: " - 7.1.99" +- requires: + cluster_features: ["gte_v7.2.0"] reason: "random score function of script score was added in 7.2" --- diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml index 070a41b0153ce..7d1d6e2edec30 100644 --- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml +++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: "match_only_text was added in 7.14" - do: @@ -256,8 +256,8 @@ setup: --- "Wildcard highlighting": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "Wildcard highlighting on match_only_text was fixed in 8.3" - do: @@ -277,8 +277,8 @@ setup: --- synthetic_source: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: synthetic source introduced in 8.4.0 - do: @@ -310,8 +310,8 @@ synthetic_source: --- tsdb: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: bug fixed in 8.10.0 - do: diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/20_null_value.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/20_null_value.yml index eab28f07d6810..926ac3e770400 100644 --- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/20_null_value.yml +++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/20_null_value.yml @@ -1,8 +1,8 @@ --- "Non positive null_value": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "null_value parameter was added in 8.9.0" - do: @@ -21,8 +21,8 @@ --- "Search rank_feature with and without null_value": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "null_value parameter was added in 8.9.0" - do: diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml index 15e44e5e7b73a..07e0a35852566 100644 --- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml +++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "added in 7.2.0" - do: diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml index f9be93ca8c110..91b79078635d9 100644 --- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml +++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "added in 7.2.0" - do: diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml index 5df0d110d20c5..0121f89b99504 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml @@ -28,8 +28,8 @@ setup: --- teardown: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -68,8 +68,8 @@ teardown: --- "HasChild disallow expensive queries": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" ### Update setting to false diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml index 2ac3a8dd8315a..daa9068162ffa 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml @@ -30,8 +30,8 @@ setup: --- teardown: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -100,8 +100,8 @@ teardown: --- "Test field retrieval": - - skip: - version: " - 7.13.1" + - requires: + cluster_features: ["gte_v7.13.2"] reason: bugfix was introduced in 7.13.2 - do: search: @@ -121,8 +121,8 @@ teardown: --- "HasChild disallow expensive queries": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" ### Update setting to false @@ -147,10 +147,10 @@ teardown: --- "deprecated use of multi-fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "deprecation added in 8.14" - features: warnings + test_runner_features: warnings - do: warnings: diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml index fab161baf1750..6395d3e0f8db4 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: "The bug was corrected from 7.6.0" - do: @@ -46,8 +46,8 @@ setup: --- teardown: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -58,8 +58,8 @@ teardown: --- "Test two sub-queries with only one having inner_hits": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "The bug was corrected from 7.7.0" - do: @@ -87,8 +87,8 @@ teardown: --- "HasParent disallow expensive queries": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" ### Update setting to false diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/50_order_by.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/50_order_by.yml index 56f6dd1dc9d8c..b8f6751dac9a8 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/50_order_by.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/50_order_by.yml @@ -2,7 +2,7 @@ "order by sub agg containing join": - skip: reason: "https://github.com/elastic/elasticsearch/issues/66876" - version: "7.11.1 - " + cluster_features: ["gte_v7.11.1"] - do: indices.create: index: test_1 @@ -73,7 +73,7 @@ "order by sub agg containing join and nested": - skip: reason: "https://github.com/elastic/elasticsearch/issues/66876" - version: "7.11.1 - " + cluster_features: ["gte_v7.11.1"] - do: indices.create: index: test_1 @@ -153,7 +153,7 @@ "order by sub agg containing join and nested and filter": - skip: reason: "https://github.com/elastic/elasticsearch/issues/66876" - version: "7.11.1 - " + cluster_features: ["gte_v7.11.1"] - do: indices.create: index: test_1 diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/60_synthetic_source.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/60_synthetic_source.yml index 55d39940081bc..4ebc6cf4e9d69 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/60_synthetic_source.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/60_synthetic_source.yml @@ -1,6 +1,6 @@ unsupported: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: diff --git a/modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/20_matched_queries.yml b/modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/20_matched_queries.yml index 1e692bc43faba..665e494412e9d 100644 --- a/modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/20_matched_queries.yml +++ b/modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/20_matched_queries.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Displaying matched named queries within percolator queries was added in 8.13" - do: indices.create: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml index 8ae4d151635e6..7f7132d378d89 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml @@ -89,7 +89,7 @@ --- "Response for version conflict (version powered)": - skip: - version: "6.7.0 - " + cluster_features: ["gte_v6.7.0"] reason: reindex moved to rely on sequence numbers for concurrency control - do: @@ -278,7 +278,7 @@ --- "Limit by size pre 7.3": - skip: - version: "7.3.0 - " + cluster_features: ["gte_v7.3.0"] reason: "7.3 should use max_docs or get deprecation warning" - do: @@ -320,8 +320,8 @@ --- "Limit by max_docs in URL": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -363,8 +363,8 @@ --- "Limit by max_docs in body": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -448,8 +448,8 @@ --- tsdb: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml index d07b61e32b9e9..84a81c6948d23 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml @@ -32,8 +32,8 @@ --- "invalid max_docs fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -52,8 +52,8 @@ --- "max_docs shoule be greater than slices": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml index cb97e957e8394..9f8490192c84c 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml @@ -1,7 +1,7 @@ --- "delete_by_query fails to delete documents with version number equal to zero": - skip: - version: "6.7.0 - " + cluster_features: ["gte_v6.7.0"] reason: reindex moved to rely on sequence numbers for concurrency control - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/100_tsdb.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/100_tsdb.yml index 98996cc9c24be..40d5dda5aa295 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/100_tsdb.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/100_tsdb.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -90,8 +90,8 @@ setup: --- from tsdb to standard: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -126,8 +126,8 @@ from tsdb to standard: --- from tsdb to tsdb: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -170,8 +170,8 @@ from tsdb to tsdb: --- from standard with tsdb id to tsdb: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 # Populate the standard index @@ -237,8 +237,8 @@ from standard with tsdb id to tsdb: --- from standard with random _id to tsdb: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 # Populate the standard index @@ -304,8 +304,8 @@ from standard with random _id to tsdb: --- from tsdb to tsdb modifying timestamp: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -353,8 +353,8 @@ from tsdb to tsdb modifying timestamp: --- from tsdb to tsdb modifying dimension: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -402,10 +402,10 @@ from tsdb to tsdb modifying dimension: --- from tsdb to tsdb created by template while modifying dimension: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/110_synthetic_source.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/110_synthetic_source.yml index 4cb0f58e12bb2..9ae2153f89ca5 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/110_synthetic_source.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/110_synthetic_source.yml @@ -21,8 +21,8 @@ setup: --- from synthetic: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: @@ -84,8 +84,8 @@ from synthetic: --- from standard: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml index 762e63fb329b4..c96414e46f7e7 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml @@ -96,8 +96,8 @@ --- "specifying size fails": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "size supported until 8" - do: @@ -118,8 +118,8 @@ --- "invalid max_docs in body fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -139,8 +139,8 @@ --- "max_docs shoule be greater than slices": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -161,8 +161,8 @@ --- "invalid max_docs in URL fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -182,8 +182,8 @@ --- "inconsistent max_docs in body and max_docs in URL fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml index 4aac33d52fb6f..cef101068cee0 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml @@ -34,7 +34,7 @@ --- "Sorting and size combined pre 7.3": - skip: - version: "7.3.0 - " + cluster_features: ["gte_v7.3.0"] reason: "7.3 should use max_docs or get deprecation warning" - do: @@ -76,10 +76,10 @@ --- "Sorting and max_docs in body combined": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: "max_docs introduced in 7.3.0, but sort deprecated in 7.6" - features: "warnings" + test_runner_features: "warnings" - do: index: @@ -123,10 +123,10 @@ --- "Sorting deprecated wait_for_completion false": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: "sort deprecated in 7.6" - features: "warnings" + test_runner_features: "warnings" - do: index: @@ -158,8 +158,8 @@ --- "max_docs in URL": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml index a09211c3dec68..c538450fa5bc9 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml @@ -443,8 +443,8 @@ --- "Script Write Field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Write fields api introduced in 8.5.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml index 325f044466847..b08ce231490cc 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml @@ -219,8 +219,8 @@ --- "Reindex from remote with max_docs": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml index f1d7b481f5298..572577348917d 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml @@ -74,7 +74,7 @@ --- "Response for version conflict (version powered)": - skip: - version: "6.7.0 - " + cluster_features: ["gte_v6.7.0"] reason: reindex moved to rely on sequence numbers for concurrency control - do: indices.create: @@ -216,7 +216,7 @@ --- "Limit by size pre 7.3": - skip: - version: "7.3.0 - " + cluster_features: ["gte_v7.3.0"] reason: "7.3 should use max_docs or get deprecation warning" - do: @@ -245,8 +245,8 @@ --- "Limit by max_docs in URL": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -275,8 +275,8 @@ --- "Limit by max_docs in body": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml index df3d7d5ef5da4..7969b507243c3 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml @@ -13,8 +13,8 @@ --- "invalid max_docs in URL fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -30,8 +30,8 @@ --- "invalid max_docs in body fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -48,8 +48,8 @@ --- "inconsistent max_docs in body and max_docs in URL fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -69,8 +69,8 @@ --- "max_docs shoule be greater than slices": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml index 477e83452adf3..d7b79146f38dd 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml @@ -23,7 +23,7 @@ --- "update_by_query fails to update documents with version number equal to zero": - skip: - version: "6.7.0 - " + cluster_features: ["gte_v6.7.0"] reason: reindex moved to rely on sequence numbers for concurrency control - do: index: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml index b646fd864718c..bef39938cffdc 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml @@ -132,8 +132,8 @@ --- "Setting bogus context is an error": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "error message changed in 8.5" - do: index: @@ -154,8 +154,8 @@ --- "Can't change _id": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "error message changed in 8.5" - do: index: @@ -313,8 +313,8 @@ --- "Set unsupported operation type": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "error message changed in 8.5" - do: index: @@ -442,8 +442,8 @@ --- "Can read version": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: fixed in 8.4.0 - do: @@ -508,8 +508,8 @@ --- "Script Write Field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Write fields api introduced in 8.5.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_tsdb.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_tsdb.yml index cee4395eb87f8..51a5884ab286c 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_tsdb.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_tsdb.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/RepositoryCredentialsTests.java b/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/RepositoryCredentialsTests.java index 13e582598a2d2..10f19f04da002 100644 --- a/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/RepositoryCredentialsTests.java +++ b/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/RepositoryCredentialsTests.java @@ -15,15 +15,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.client.internal.node.NodeClient; -import org.elasticsearch.cluster.metadata.RepositoryMetadata; -import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.settings.MockSecureSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; -import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.core.SuppressForbidden; import org.elasticsearch.env.Environment; -import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.repositories.RepositoriesService; @@ -34,7 +30,6 @@ import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.rest.FakeRestRequest; import org.elasticsearch.watcher.ResourceWatcherService; -import org.elasticsearch.xcontent.NamedXContentRegistry; import java.security.AccessController; import java.security.PrivilegedAction; @@ -256,23 +251,6 @@ public ProxyS3RepositoryPlugin(Settings settings) { super(settings); } - @Override - protected S3Repository createRepository( - RepositoryMetadata metadata, - NamedXContentRegistry registry, - ClusterService clusterService, - BigArrays bigArrays, - RecoverySettings recoverySettings, - S3RepositoriesMetrics s3RepositoriesMetrics - ) { - return new S3Repository(metadata, registry, getService(), clusterService, bigArrays, recoverySettings, s3RepositoriesMetrics) { - @Override - protected void assertSnapshotOrStatelessPermittedThreadPool() { - // eliminate thread name check as we create repo manually on test/main threads - } - }; - } - @Override S3Service s3Service(Environment environment, Settings nodeSettings, ResourceWatcherService resourceWatcherService) { return new ProxyS3Service(environment, nodeSettings, resourceWatcherService); diff --git a/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java b/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java index ff61504d6c525..c1f862a7628c5 100644 --- a/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java +++ b/modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java @@ -130,11 +130,6 @@ private S3Repository createS3Repo(RepositoryMetadata metadata) { MockBigArrays.NON_RECYCLING_INSTANCE, new RecoverySettings(Settings.EMPTY, new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS)), S3RepositoriesMetrics.NOOP - ) { - @Override - protected void assertSnapshotOrStatelessPermittedThreadPool() { - // eliminate thread name check as we create repo manually on test/main threads - } - }; + ); } } diff --git a/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLRepositoryTests.java b/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLRepositoryTests.java index a02bff59988d8..39ddc1366f934 100644 --- a/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLRepositoryTests.java +++ b/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLRepositoryTests.java @@ -41,12 +41,7 @@ private URLRepository createRepository(Settings baseSettings, RepositoryMetadata MockBigArrays.NON_RECYCLING_INSTANCE, new RecoverySettings(baseSettings, new ClusterSettings(baseSettings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS)), mock(URLHttpClient.Factory.class) - ) { - @Override - protected void assertSnapshotOrStatelessPermittedThreadPool() { - // eliminate thread name check as we create repo manually on test/main threads - } - }; + ); } public void testWhiteListingRepoURL() throws IOException { diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml index e8bf1f84e6437..7bd7b6c7779e2 100644 --- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml +++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml @@ -110,8 +110,8 @@ setup: --- "fetch multiple stored fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "bug fixed in 8.14" - do: diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/110_composite.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/110_composite.yml index dad3ce22e945f..13af92f9aa84b 100644 --- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/110_composite.yml +++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/110_composite.yml @@ -106,8 +106,8 @@ query: --- "Field caps with composite runtime mappings section. Issue 76742": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: Composite Runtime mappings support was added in 7.15 - do: diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/270_synthetic_source.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/270_synthetic_source.yml index ac2a56cf26b19..8832b3230910c 100644 --- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/270_synthetic_source.yml +++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/270_synthetic_source.yml @@ -1,7 +1,7 @@ --- keywords: - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: Runtime mappings support was added in 7.12 - do: @@ -68,8 +68,8 @@ keywords: --- doubles: - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: Runtime mappings support was added in 7.12 - do: diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/40_runtime_mappings.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/40_runtime_mappings.yml index b956fd57ac13e..0e7d0b78bba47 100644 --- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/40_runtime_mappings.yml +++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/40_runtime_mappings.yml @@ -21,8 +21,8 @@ setup: --- "Field caps with runtime mappings section": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: Runtime mappings support was added in 7.12 - do: @@ -49,8 +49,8 @@ setup: --- "Field caps with runtime mappings section overwriting existing mapping": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: Runtime mappings support was added in 7.10 - do: @@ -89,8 +89,8 @@ setup: --- "Field caps with errors in runtime mappings section throws": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: Runtime mappings support was added in 7.12 - do: diff --git a/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml b/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml index 6ef35999307c4..36ce0260b046e 100644 --- a/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml +++ b/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml @@ -251,8 +251,8 @@ --- "Annotated highlighter on annotated text exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: diff --git a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java index d91f7cf3e9a8d..cc613671c860c 100644 --- a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java +++ b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java @@ -23,7 +23,6 @@ import org.elasticsearch.client.RestClientBuilder; import org.elasticsearch.common.CheckedSupplier; import org.elasticsearch.common.Strings; -import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.core.IOUtils; import org.elasticsearch.test.cluster.ElasticsearchCluster; import org.elasticsearch.test.cluster.FeatureFlag; @@ -309,20 +308,8 @@ protected ClientYamlTestExecutionContext createRestTestExecutionContext( getClusterStateFeatures(adminSearchClient), semanticNodeVersions ); - final TestFeatureService combinedTestFeatureService = new TestFeatureService() { - @Override - public boolean clusterHasFeature(String featureId) { - return testFeatureService.clusterHasFeature(featureId) && searchTestFeatureService.clusterHasFeature(featureId); - } - - @Override - public Set getAllSupportedFeatures() { - return Sets.intersection( - testFeatureService.getAllSupportedFeatures(), - searchTestFeatureService.getAllSupportedFeatures() - ); - } - }; + final TestFeatureService combinedTestFeatureService = featureId -> testFeatureService.clusterHasFeature(featureId) + && searchTestFeatureService.clusterHasFeature(featureId); final Set combinedOsSet = Stream.concat(osSet.stream(), Stream.of(searchOs)).collect(Collectors.toSet()); final Set combinedNodeVersions = Stream.concat(nodesVersions.stream(), searchNodeVersions.stream()) .collect(Collectors.toSet()); diff --git a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java index ce11112bd4416..5a58f3629df14 100644 --- a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java +++ b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java @@ -24,7 +24,6 @@ import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.core.IOUtils; import org.elasticsearch.test.cluster.ElasticsearchCluster; import org.elasticsearch.test.cluster.FeatureFlag; @@ -294,20 +293,9 @@ protected ClientYamlTestExecutionContext createRestTestExecutionContext( getClusterStateFeatures(adminSearchClient), semanticNodeVersions ); - final TestFeatureService combinedTestFeatureService = new TestFeatureService() { - @Override - public boolean clusterHasFeature(String featureId) { - return testFeatureService.clusterHasFeature(featureId) && searchTestFeatureService.clusterHasFeature(featureId); - } + final TestFeatureService combinedTestFeatureService = featureId -> testFeatureService.clusterHasFeature(featureId) + && searchTestFeatureService.clusterHasFeature(featureId); - @Override - public Set getAllSupportedFeatures() { - return Sets.intersection( - testFeatureService.getAllSupportedFeatures(), - searchTestFeatureService.getAllSupportedFeatures() - ); - } - }; final Set combinedOsSet = Stream.concat(osSet.stream(), Stream.of(searchOs)).collect(Collectors.toSet()); final Set combinedNodeVersions = Stream.concat(nodesVersions.stream(), searchNodeVersions.stream()) .collect(Collectors.toSet()); diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java index eff9dfc554133..c57112d0455c6 100644 --- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java +++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java @@ -21,13 +21,13 @@ import org.elasticsearch.test.cluster.util.Version; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.ObjectPath; +import org.elasticsearch.test.rest.TestFeatureService; import org.junit.AfterClass; import org.junit.Before; import java.util.Arrays; import java.util.Locale; import java.util.Map; -import java.util.Set; import static org.elasticsearch.upgrades.FullClusterRestartUpgradeStatus.OLD; import static org.elasticsearch.upgrades.FullClusterRestartUpgradeStatus.UPGRADED; @@ -42,7 +42,7 @@ public abstract class ParameterizedFullClusterRestartTestCase extends ESRestTest private static boolean upgradeFailed = false; private static boolean upgraded = false; - private static Set oldClusterFeatures; + private static TestFeatureService oldClusterTestFeatureService; private final FullClusterRestartUpgradeStatus requestedUpgradeStatus; public ParameterizedFullClusterRestartTestCase(@Name("cluster") FullClusterRestartUpgradeStatus upgradeStatus) { @@ -55,11 +55,10 @@ public static Iterable parameters() throws Exception { } @Before - public void extractOldClusterFeatures() { - if (upgraded == false && oldClusterFeatures == null) { - assert testFeatureServiceInitialized() - : "Old cluster features can be extracted only after testFeatureService has been initialized. See ESRestTestCase#initClient"; - oldClusterFeatures = Set.copyOf(testFeatureService.getAllSupportedFeatures()); + public void retainOldClusterTestFeatureService() { + if (upgraded == false && oldClusterTestFeatureService == null) { + assert testFeatureServiceInitialized() : "testFeatureService must be initialized, see ESRestTestCase#initClient"; + oldClusterTestFeatureService = testFeatureService; } } @@ -124,7 +123,7 @@ public void maybeUpgrade() throws Exception { public static void resetUpgrade() { upgraded = false; upgradeFailed = false; - oldClusterFeatures = null; + oldClusterTestFeatureService = null; } public boolean isRunningAgainstOldCluster() { @@ -136,8 +135,9 @@ public static String getOldClusterVersion() { } protected static boolean oldClusterHasFeature(String featureId) { - assert oldClusterFeatures != null : "Old cluster features cannot be accessed before initialization is completed"; - return oldClusterFeatures.contains(featureId); + assert oldClusterTestFeatureService != null + : "testFeatureService of old cluster cannot be accessed before initialization is completed"; + return oldClusterTestFeatureService.clusterHasFeature(featureId); } protected static boolean oldClusterHasFeature(NodeFeature feature) { diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/100_tsdb.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/100_tsdb.yml index 274fc92e64d2c..466dcb838b5d1 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/100_tsdb.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/100_tsdb.yml @@ -1,8 +1,8 @@ --- setup: # Create a local tsdb index with a tsid the doesn't overlap with the remote cluster. - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -59,8 +59,8 @@ setup: --- teardown: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -70,8 +70,8 @@ teardown: --- aggregate tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml index ba4bf691f2329..0ee9f19dd39d1 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml @@ -107,8 +107,8 @@ --- "Get field caps from remote cluster with index filter": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: Index filter support was added in 7.9 - do: @@ -158,8 +158,8 @@ --- "Field caps with with include_empty_fields false": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: include_empty_fields has been added in 8.13.0 - do: indices.create: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml index 8c59c0c7eaaf7..c9e02c63fde73 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml @@ -159,8 +159,8 @@ --- tsdb: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/qa/rolling-upgrade-legacy/src/test/resources/rest-api-spec/test/old_cluster/20_camel_case_on_format.yml b/qa/rolling-upgrade-legacy/src/test/resources/rest-api-spec/test/old_cluster/20_camel_case_on_format.yml index 22db10f32250e..ce53526ab85e6 100644 --- a/qa/rolling-upgrade-legacy/src/test/resources/rest-api-spec/test/old_cluster/20_camel_case_on_format.yml +++ b/qa/rolling-upgrade-legacy/src/test/resources/rest-api-spec/test/old_cluster/20_camel_case_on_format.yml @@ -1,9 +1,10 @@ --- "Create index with camel case on format (allowed with warning in 7.x)": - skip: - version: "8.0.0 - " + cluster_features: ["gte_v8.0.0"] reason: "at version 8.0.0, camel case is not allowed" - features: "warnings" + - requires: + test_runner_features: "warnings" - do: warnings: - "Camel case format name strictDateOptionalTime is deprecated and will be removed in a future version. Use snake case name strict_date_optional_time instead." @@ -41,10 +42,10 @@ --- "Create index with camel case on format (when bwc version is > 8.0.0)": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "at version 8.0.0, camel case is not allowed" - features: "warnings" + test_runner_features: "warnings" - do: indices.create: index: camel_case_on_format diff --git a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java index 1981b3e32cc34..63ed54d05adf2 100644 --- a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java +++ b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java @@ -24,6 +24,7 @@ import org.elasticsearch.test.cluster.util.Version; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.ObjectPath; +import org.elasticsearch.test.rest.TestFeatureService; import org.junit.AfterClass; import org.junit.Before; import org.junit.ClassRule; @@ -71,7 +72,7 @@ public static Iterable parameters() { } private static final Set upgradedNodes = new HashSet<>(); - private static final Set oldClusterFeatures = new HashSet<>(); + private static TestFeatureService oldClusterTestFeatureService = null; private static boolean upgradeFailed = false; private static IndexVersion oldIndexVersion; @@ -83,8 +84,8 @@ protected ParameterizedRollingUpgradeTestCase(@Name("upgradedNodes") int upgrade @Before public void extractOldClusterFeatures() { - if (isOldCluster() && oldClusterFeatures.isEmpty()) { - oldClusterFeatures.addAll(testFeatureService.getAllSupportedFeatures()); + if (isOldCluster() && oldClusterTestFeatureService == null) { + oldClusterTestFeatureService = testFeatureService; } } @@ -149,7 +150,7 @@ public void upgradeNode() throws Exception { public static void resetNodes() { oldIndexVersion = null; upgradedNodes.clear(); - oldClusterFeatures.clear(); + oldClusterTestFeatureService = null; upgradeFailed = false; } @@ -159,8 +160,8 @@ protected static String getOldClusterVersion() { } protected static boolean oldClusterHasFeature(String featureId) { - assert oldClusterFeatures.isEmpty() == false; - return oldClusterFeatures.contains(featureId); + assert oldClusterTestFeatureService != null; + return oldClusterTestFeatureService.clusterHasFeature(featureId); } protected static boolean oldClusterHasFeature(NodeFeature feature) { diff --git a/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/20_tsdb_consistency.yml b/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/20_tsdb_consistency.yml index c8ad5f18bc7c9..aa2a49da8a78f 100644 --- a/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/20_tsdb_consistency.yml +++ b/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/20_tsdb_consistency.yml @@ -2,8 +2,8 @@ # rest-api-spec we would, but it requires painless. setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -67,8 +67,8 @@ setup: --- "index with replicas and shards is green": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -78,8 +78,8 @@ setup: --- "each shard has unique _tsids": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/30_desired_balance.yml b/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/30_desired_balance.yml index 92905243fdb12..2815dfd8ff0c0 100644 --- a/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/30_desired_balance.yml +++ b/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/30_desired_balance.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "API added in in 8.6.0" --- @@ -67,8 +67,8 @@ setup: --- "Test cluster_balance_stats": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "cluster_balance_stats added in in 8.7.0" - do: @@ -115,8 +115,8 @@ setup: --- "Test tier_preference": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "tier_preference added in in 8.8.0" - do: @@ -140,8 +140,8 @@ setup: --- "Test cluster_info": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "cluster_info added in in 8.8.0" - do: @@ -152,8 +152,8 @@ setup: --- "Test undesired_shard_allocation_count": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "undesired_shard_allocation_count added in in 8.12.0" - do: @@ -190,8 +190,8 @@ setup: --- "Test unassigned_shards, total_allocations, undesired_allocations and undesired_allocations_fraction": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "undesired_shard_allocation_count added in in 8.12.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/bulk/12_noop.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/bulk/12_noop.yml index d0efcc0b67006..ac4d33f0b82e3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/bulk/12_noop.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/bulk/12_noop.yml @@ -1,7 +1,7 @@ --- "Noop": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: fixed in 8.14.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.allocation/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.allocation/10_basic.yml index 6d8e1205867b0..4f18b331325a4 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.allocation/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.allocation/10_basic.yml @@ -1,8 +1,8 @@ --- "Help": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast are added in 8.14.0" - do: @@ -29,8 +29,8 @@ --- "One index": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -70,8 +70,8 @@ --- "Node ID": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -110,8 +110,8 @@ --- "All Nodes": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -148,8 +148,8 @@ --- "Column headers": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -230,8 +230,8 @@ --- "Bytes": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -281,8 +281,8 @@ --- "Node forecasts": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "write_load.forecast and disk.indices.forecast columns added in 8.14.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.templates/20_matching.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.templates/20_matching.yml index 2540451a716a6..0ad5144491671 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.templates/20_matching.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.templates/20_matching.yml @@ -134,8 +134,8 @@ setup: --- "Reject request containing comma": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "validation only added in 7.16.0" - do: catch: bad_request diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/10_basic.yml index 7e08f2dbe5423..1d1aa524ffb21 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/10_basic.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "API added in in 8.1.0 but modified in 8.13 (node_version field removed)" --- teardown: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/11_old_format.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/11_old_format.yml index ed5ca16edad4e..4df1252bef273 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/11_old_format.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/11_old_format.yml @@ -1,8 +1,11 @@ --- setup: - skip: - version: " - 8.2.99, 8.12.99 - " - reason: "API added in in 8.1.0, modified in 8.3 and then again in 8.13.0" + cluster_features: ["gte_v8.13.0"] + reason: "API modified in 8.3 8.13.0" + - requires: + cluster_features: ["gte_v8.3.0"] + reason: "API added in in 8.1.0 but modified in 8.3" --- teardown: - do: @@ -146,7 +149,7 @@ teardown: --- "Test settings are validated": - skip: - version: "8.9.99 - " + cluster_features: ["gte_v8.9.99"] reason: "We started skipping setting validations in 8.10" - do: cluster.state: {} @@ -172,7 +175,7 @@ teardown: --- "Test unknown settings are forbidden in known versions": - skip: - version: "8.9.99 - " + cluster_features: ["gte_v8.9.99"] reason: "We started skipping setting validations in 8.10" - do: cluster.state: {} @@ -198,7 +201,7 @@ teardown: --- "Test unknown settings are allowed in future versions": - skip: - version: "8.9.99 - " + cluster_features: ["gte_v8.9.99"] reason: "We started skipping setting validations in 8.10" - do: _internal.update_desired_nodes: @@ -211,7 +214,7 @@ teardown: --- "Test some settings can be overridden": - skip: - version: "8.9.99 - " + cluster_features: ["gte_v8.9.99"] reason: "We started skipping setting validations in 8.10" - do: cluster.state: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/20_dry_run.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/20_dry_run.yml index 56a693febec82..ac9a3437df0c1 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/20_dry_run.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/20_dry_run.yml @@ -10,8 +10,8 @@ teardown: --- "Test dry run doesn't update empty desired nodes": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "version_node removed from version 8.13 onwards, require the new api" - do: cluster.state: {} @@ -40,8 +40,8 @@ teardown: --- "Test dry run doesn't update existing desired nodes": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "version_node removed from version 8.13 onwards, require the new api" - do: cluster.state: {} @@ -120,8 +120,8 @@ teardown: - match: { error.suppressed.0.reason: "unknown setting [random_setting] please check that any required plugins are installed, or check the breaking changes documentation for removed settings" } --- "Test misspelled dry run": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "version_node removed from version 8.13 onwards" - do: cluster.state: { } diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/delete/70_tsdb.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/delete/70_tsdb.yml index 83f8aab34e02a..303e4901476c4 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/delete/70_tsdb.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/delete/70_tsdb.yml @@ -1,7 +1,7 @@ --- "basic tsdb delete": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.get_features/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.get_features/10_basic.yml index 55a5c26e5e5cf..4dcec00650df4 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.get_features/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.get_features/10_basic.yml @@ -1,8 +1,8 @@ --- "Get Features": - - skip: - features: contains - version: " - 7.11.99" + - requires: + test_runner_features: contains + cluster_features: ["gte_v7.12.0"] reason: "This API was added in 7.12.0" - do: { features.get_features: {}} - contains: {'features': {'name': 'tasks'}} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.reset_features/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.reset_features/10_basic.yml index 5bdd6852412a7..e21703f8f26f0 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.reset_features/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.reset_features/10_basic.yml @@ -1,8 +1,8 @@ --- "Get Features": - - skip: - features: contains - version: " - 7.12.99" + - requires: + test_runner_features: contains + cluster_features: ["gte_v7.13.0"] reason: "This API was added in 7.13.0" - do: { features.get_features: {}} - contains: {'features': {'name': 'tasks'}} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/10_basic.yml index ad641f83b47ad..14e827bbd2ad6 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/10_basic.yml @@ -164,8 +164,8 @@ setup: --- "Get field caps with fields in body": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: re-added support for fields in the request body in 8.5 - do: field_caps: @@ -229,8 +229,8 @@ setup: --- "Field caps for number field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -241,8 +241,8 @@ setup: --- "Field caps for date field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -253,8 +253,8 @@ setup: --- "Field caps for keyword field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -265,8 +265,8 @@ setup: --- "Field caps for boolean field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -277,8 +277,8 @@ setup: --- "Field caps for ip field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -289,8 +289,8 @@ setup: --- "Field caps for geo_point field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -397,8 +397,8 @@ setup: --- "Field caps with include_unmapped": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: include_unmapped has been added in 7.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/20_meta.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/20_meta.yml index e1b7cc3abfa4b..8089102edb757 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/20_meta.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/20_meta.yml @@ -1,7 +1,7 @@ --- "Merge metadata across multiple indices": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: Metadata support was added in 7.6 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/30_index_filter.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/30_index_filter.yml index 31e8661c9e472..a5b8d507999c3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/30_index_filter.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/30_index_filter.yml @@ -59,8 +59,8 @@ setup: --- "Field caps with index filter": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: Index filter support was added in 7.9 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/40_time_series.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/40_time_series.yml index e0d4b19a1a228..2d43d22da4ccf 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/40_time_series.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/40_time_series.yml @@ -105,8 +105,8 @@ setup: --- "Get simple time series field caps": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -167,8 +167,8 @@ setup: --- "Get time series field caps with conflicts": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/60_non_empty_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/60_non_empty_fields.yml index 24fe21a169f22..293ec40ea2b81 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/60_non_empty_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/60_non_empty_fields.yml @@ -22,8 +22,8 @@ setup: --- "Field caps with with include_empty_fields false": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: include_empty_fields has been added in 8.13.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml index b0149160b9f51..4133a13ebd7d6 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml @@ -1,6 +1,6 @@ keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -37,8 +37,8 @@ keyword: --- fetch without refresh also produces synthetic source: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -82,8 +82,8 @@ fetch without refresh also produces synthetic source: --- force_synthetic_source_ok: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -131,8 +131,8 @@ force_synthetic_source_ok: --- force_synthetic_source_bad_mapping: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -175,8 +175,8 @@ force_synthetic_source_bad_mapping: --- stored text: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -248,8 +248,8 @@ stored text: --- stored keyword: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -289,8 +289,8 @@ stored keyword: --- doc values keyword with ignore_above: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -372,8 +372,8 @@ doc values keyword with ignore_above: --- stored keyword with ignore_above: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -457,8 +457,8 @@ stored keyword with ignore_above: --- indexed dense vectors: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -501,8 +501,8 @@ indexed dense vectors: --- non-indexed dense vectors: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -544,8 +544,8 @@ non-indexed dense vectors: --- _source filtering: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -586,8 +586,8 @@ _source filtering: --- _doc_count: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: introduced in 8.6.0 - do: @@ -715,8 +715,8 @@ _doc_count: --- ip with ignore_malformed: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: introduced in 8.6.0 - do: @@ -812,8 +812,8 @@ ip with ignore_malformed: --- flattened field: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: support for synthetic source on flattened fields added in 8.8.0 - do: @@ -904,8 +904,8 @@ flattened field: --- flattened field no doc values: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: support for synthetic source on flattened fields added in 8.8.0 - do: @@ -923,8 +923,8 @@ flattened field no doc values: --- flattened field with ignore_above: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: support for synthetic source on flattened fields added in 8.8.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/110_ignore_malformed.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/110_ignore_malformed.yml index ffb1e3861a618..ddfdc69af1b48 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/110_ignore_malformed.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/110_ignore_malformed.yml @@ -1,7 +1,7 @@ --- ip: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/70_require_alias.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/70_require_alias.yml index d718a5a9704de..736fc7dd53d25 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/70_require_alias.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/70_require_alias.yml @@ -1,7 +1,7 @@ --- "Set require_alias flag": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "require_alias flag added in 7.10" - do: catch: missing diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/80_date_nanos.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/80_date_nanos.yml index 4e552f8441d59..8915d41f70307 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/80_date_nanos.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/80_date_nanos.yml @@ -1,8 +1,8 @@ --- "date_nanos requires dates after 1970 and before 2262": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: error message changed in 8.8.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/90_geo_point.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/90_geo_point.yml index 87f40553617e3..50a74610cdf46 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/90_geo_point.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/90_geo_point.yml @@ -39,8 +39,8 @@ --- "null value in array": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: fixed in 8.3.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/91_metrics_no_subobjects.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/91_metrics_no_subobjects.yml index 4e4b20a22d511..94c19a4d69e17 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/91_metrics_no_subobjects.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/91_metrics_no_subobjects.yml @@ -1,8 +1,8 @@ --- "Metrics object indexing": - - skip: - features: allowed_warnings_regex - version: " - 8.2.99" + - requires: + test_runner_features: allowed_warnings_regex + cluster_features: ["gte_v8.3.0"] reason: added in 8.3.0 - do: @@ -64,9 +64,9 @@ --- "Root without subobjects": - - skip: - features: allowed_warnings_regex - version: " - 8.2.99" + - requires: + test_runner_features: allowed_warnings_regex + cluster_features: ["gte_v8.3.0"] reason: added in 8.3.0 - do: @@ -123,9 +123,9 @@ --- "Metrics object indexing with synthetic source": - - skip: - features: allowed_warnings_regex - version: " - 8.3.99" + - requires: + test_runner_features: allowed_warnings_regex + cluster_features: ["gte_v8.4.0"] reason: added in 8.4.0 - do: @@ -190,9 +190,9 @@ --- "Root without subobjects with synthetic source": - - skip: - features: allowed_warnings_regex - version: " - 8.3.99" + - requires: + test_runner_features: allowed_warnings_regex + cluster_features: ["gte_v8.4.0"] reason: added in 8.4.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml index b7e84d2fd5266..68fcac8126c67 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml @@ -1,7 +1,7 @@ --- "Basic test for index blocks": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "index block APIs have only been made available in 7.9.0" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml index d5007d29f3715..6072096257c3a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml @@ -28,8 +28,8 @@ setup: --- "Clone index via API": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: index cloning was added in 7.4.0 # make it read-only - do: @@ -84,8 +84,8 @@ setup: --- "Create illegal clone indices": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: index cloning was added in 7.4.0 # try to do an illegal clone with illegal number_of_shards - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml index 625f574fa73de..2c3ba97f0d293 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml @@ -1,7 +1,7 @@ --- "Clone index ignores target template mapping": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: index cloning was added in 7.4.0 # create index - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml index 503cc15609072..74e431860be69 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml @@ -1,9 +1,9 @@ --- "Copy settings during clone index": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: index cloning was added in 7.4.0 - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml index 9a59773893d63..20ffc0c89e5af 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml @@ -135,8 +135,8 @@ --- "Create with alias containing date math": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "date math support for aliases was added in 7.13" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml index b4e5507f42be5..62a4e240a5b5d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml @@ -1,6 +1,6 @@ invalid: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: @@ -18,8 +18,8 @@ invalid: --- nested is disabled: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/30_dynamic_template.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/30_dynamic_template.yml index 15b49e8d2fbec..e5f48f49c697f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/30_dynamic_template.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/30_dynamic_template.yml @@ -23,8 +23,8 @@ --- "Create index with dynamic_mappings, using lists for some match/unmatch sections": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: Arrays in dynamic templates added in 8.9 - do: indices.create: @@ -62,8 +62,8 @@ --- "Create index with dynamic_mappings, with wildcard match_mapping_type and an unmatch_mapping_type array": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: unmatch_mapping_type in dynamic templates added in 8.13 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.flush/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.flush/10_basic.yml index 6df2b6acf4e55..290d1cb0ac046 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.flush/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.flush/10_basic.yml @@ -28,8 +28,8 @@ --- "Flush parameters validation": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: flush parameters validation is introduced in 7.2.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml index ace4c1703e63d..e884ff28a7ef1 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml @@ -11,8 +11,8 @@ --- "Force merge with incompatible only_expunge_deletes and max_num_segments values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: only_expunge_deletes and max_num_segments are mutually exclusive since 8.0 - do: @@ -32,8 +32,8 @@ --- "Force merge with wait_for_completion parameter": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: wait_for_completion is introduced since 8.1 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml index c64b872c3e8ad..e2fd28e745f0e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml @@ -172,8 +172,8 @@ setup: --- "Should return only selected features": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "features option added in 8.1.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml index 1878ae0997649..b077cbe98b28b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml @@ -54,9 +54,9 @@ setup: --- "Get field mapping with local parameter should fail": - - skip: - features: ["warnings"] - version: " - 7.99.99" + - requires: + test_runner_features: ["warnings"] + cluster_features: ["gte_v8.0.0"] reason: "local parameter for get field mapping API was allowed before v8" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/10_basic.yml index 75a80f94c62bf..577665486da6e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/10_basic.yml @@ -181,8 +181,8 @@ setup: --- "Get index template always shows composed_of": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "A bug was fixed in 8.13.0 to make `composed_of` always returned" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/20_get_missing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/20_get_missing.yml index b9fa29297b48c..2edb26755a560 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/20_get_missing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/20_get_missing.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - do: @@ -10,8 +10,8 @@ setup: --- "Get missing template": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - do: @@ -23,8 +23,8 @@ setup: --- "Get non-matching wildcard": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - do: @@ -37,8 +37,8 @@ setup: --- "Reject request containing comma": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "validation only added in 7.16.0" - do: catch: bad_request diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml index c6ff83345c6a0..853837f1375ff 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml @@ -125,8 +125,8 @@ setup: ignore_unavailable: true --- "Get test-* with wildcard_expansion=none ignore_unavailable=false": - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "bug fixed in 8.6" - do: catch: missing diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml index 76dfa552b5630..9101475fc9055 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml @@ -69,8 +69,8 @@ --- "Close index with wait_for_active_shards set to all": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "closed indices are replicated starting version 7.2.0" - do: @@ -124,10 +124,10 @@ --- "?wait_for_active_shards=index-setting is deprecated": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "required deprecation warning is only emitted in 8.0 and later" - features: ["warnings"] + test_runner_features: ["warnings"] - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml index efeb97aa9ec0e..61c7561c3c433 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml @@ -79,8 +79,8 @@ --- "Can create filtered alias with a date_nanos range query": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "skipping older version until backport" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/10_basic.yml index 561a9dfc9b39d..81068f460b2b3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/10_basic.yml @@ -1,9 +1,9 @@ --- "Put index template": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -32,10 +32,10 @@ --- "Put multiple index templates": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -72,10 +72,10 @@ --- "Put index template with 'create' flag": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -110,8 +110,8 @@ --- "Put index template without index_patterns": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - do: @@ -122,10 +122,10 @@ --- "Delete multiple templates": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "not yet backported" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml index 890162787f04a..280a645318dd9 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml @@ -1,9 +1,9 @@ --- "Component and index template composition": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: @@ -87,10 +87,10 @@ --- "Index template priority": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -130,10 +130,10 @@ --- "Component template only composition": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: @@ -175,10 +175,10 @@ --- "Index template without component templates": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -203,10 +203,10 @@ --- "Index template mapping merging": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "index template v2 mapping merging not available before 7.9" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: @@ -289,10 +289,10 @@ --- "Index template ignore_missing_component_template valid": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "index template v2 ignore_missing_component_template config not available before 8.7" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: @@ -326,10 +326,10 @@ --- "Index template ignore_missing_component_template invalid": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "index template v2 ignore_missing_component_template config not available before 8.7" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml index d7731c0073140..06865d2f620e3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml @@ -43,10 +43,10 @@ --- "Indices recovery test for closed index": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: closed indices are replicated starting version 7.2.0 - features: ["allowed_warnings"] + test_runner_features: ["allowed_warnings"] - do: indices.create: @@ -137,8 +137,8 @@ - match: { $body: {} } --- "Indices recovery test with detailed parameter": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: bug with detailed parameter fixed in 7.3 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml index f35ade2b3cb10..ba341e0d220e1 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - features: allowed_warnings + test_runner_features: allowed_warnings - do: indices.create: @@ -25,8 +25,8 @@ setup: --- "Resolve cluster with indices and aliases": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: @@ -51,8 +51,8 @@ setup: --- "Resolve cluster with closed index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: @@ -86,8 +86,8 @@ setup: --- "Resolve cluster using alias": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: @@ -110,8 +110,8 @@ setup: --- "Resolve cluster using alias and index that does not exist": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: @@ -136,8 +136,8 @@ setup: --- "Test resolve cluster optional params are accepted": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/20_resolve_system_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/20_resolve_system_index.yml index 796034525e6e6..0773d58758486 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/20_resolve_system_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/20_resolve_system_index.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - features: "warnings" + test_runner_features: "warnings" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml index cb06911a4fa3f..f7252d0a9a89c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index introduced in 7.9" - features: allowed_warnings + test_runner_features: allowed_warnings - do: indices.create: @@ -36,8 +36,8 @@ setup: --- "Resolve index with indices and aliases": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index introduced in 7.9" - do: @@ -64,8 +64,8 @@ setup: --- "Resolve index with hidden and closed indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index introduced in 7.9" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/20_resolve_system_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/20_resolve_system_index.yml index 316cefb250d4c..56e6305493271 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/20_resolve_system_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/20_resolve_system_index.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "system index attribute introduced in 8.2" - features: "warnings" + test_runner_features: "warnings" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/10_basic.yml index fd7d4c5b857ac..a53365721cf0c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/10_basic.yml @@ -151,8 +151,8 @@ --- "Will not rollover with only min_* conditions": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/25_max_shard_doc_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/25_max_shard_doc_condition.yml index 36d33175881fa..d2710ebd057c1 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/25_max_shard_doc_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/25_max_shard_doc_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with max_primary_shard_docs condition": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/35_max_primary_shard_size_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/35_max_primary_shard_size_condition.yml index 1f07d9fff7134..e608a272539c9 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/35_max_primary_shard_size_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/35_max_primary_shard_size_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with max_primary_shard_size condition": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_primary_shard_size condition was introduced in 7.12.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/50_min_age_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/50_min_age_condition.yml index 125d00b2faff9..334a5e37c935c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/50_min_age_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/50_min_age_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_age condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/55_min_docs_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/55_min_docs_condition.yml index 99fa37ecfdcb6..45bc360e29e45 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/55_min_docs_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/55_min_docs_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_docs condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/60_min_primary_shard_docs_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/60_min_primary_shard_docs_condition.yml index c4226590d70ff..c6256ec2babb6 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/60_min_primary_shard_docs_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/60_min_primary_shard_docs_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_primary_shard_docs condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/65_min_primary_shard_size_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/65_min_primary_shard_size_condition.yml index fde9b8c5a922b..983bd9fa442f2 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/65_min_primary_shard_size_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/65_min_primary_shard_size_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_primary_shard_size condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/70_min_size_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/70_min_size_condition.yml index 400858d7942a7..71023f55f9caa 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/70_min_size_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/70_min_size_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_size condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml index 4950f9bbf2dc5..6790014be9951 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml @@ -1,9 +1,9 @@ --- "Simulate index template without new template in the body": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "simulate index template API is only in 7.8.0+" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -30,10 +30,10 @@ --- "Simulate index template specifying a new template": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "simulate index template API is only in 7.8.0+" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -85,10 +85,10 @@ --- "Simulate index template with index not matching any template": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "simulate index template API is only in 7.8.0+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -115,10 +115,10 @@ --- "Simulate index matches overlapping legacy and composable templates": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "simulate index template API is only in 7.8.0+" - features: ["allowed_warnings", "default_shards"] + test_runner_features: ["allowed_warnings", "default_shards"] - do: indices.put_template: @@ -178,10 +178,10 @@ --- "Simulate an index for and index or alias that already exists": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "simulating index template API for an existing index has not yet been backported" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -226,10 +226,10 @@ --- "Simulate index template with lifecycle and include defaults": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Data stream lifecycle with effective retention was released in 8.14" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_template/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_template/10_basic.yml index 2e27a694f4705..ff53a762b75ef 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_template/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_template/10_basic.yml @@ -1,9 +1,9 @@ --- "Simulate template without a template in the body": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "only available in 7.9+" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -30,10 +30,10 @@ --- "Simulate index template specifying a new template": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "only available in 7.9+" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -84,10 +84,10 @@ --- "Simulate template matches overlapping legacy and composable templates": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "only available in 7.9+" - features: ["allowed_warnings", "default_shards"] + test_runner_features: ["allowed_warnings", "default_shards"] - do: indices.put_template: @@ -147,10 +147,10 @@ --- "Simulate replacing a template with a newer version": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "not yet backported" - features: ["allowed_warnings", "default_shards"] + test_runner_features: ["allowed_warnings", "default_shards"] - do: indices.put_index_template: @@ -201,10 +201,10 @@ --- "Simulate template with lifecycle and include defaults": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Data stream lifecycle with effective retention was released in 8.14" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/10_basic.yml index 97616684e70f9..bec1bfba0d1b4 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/10_basic.yml @@ -95,8 +95,8 @@ setup: --- "Split from 1 to N": - - skip: - version: " - 6.99.99" + - requires: + cluster_features: ["gte_v7.0.0"] reason: automatic preparation for splitting was added in 7.0.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/50_routing_required.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/50_routing_required.yml index 3de89793a1b00..38bf9d72ef8ff 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/50_routing_required.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/50_routing_required.yml @@ -99,8 +99,8 @@ routing required: --- nested: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "fixed in 8.5.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/100_search_idle.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/100_search_idle.yml index 226458ce475bb..d0ff1dbf69f3d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/100_search_idle.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/100_search_idle.yml @@ -14,8 +14,8 @@ setup: --- "Search idle stats": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "search idle stats added in 8.9.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/20_translog.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/20_translog.yml index 49f57ac5df03f..75d41be06d4d7 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/20_translog.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/20_translog.yml @@ -51,8 +51,8 @@ --- "Translog retention settings are no long supported": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "translog retention settings are no longer supported in 8.0" - do: catch: /illegal_argument_exception/ diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/30_segments.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/30_segments.yml index 72fab59cc6cd7..6e827ef929828 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/30_segments.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/30_segments.yml @@ -15,8 +15,8 @@ setup: --- "Segment Stats": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: forbid_closed_indices is not supported in ealier version - do: @@ -66,8 +66,8 @@ setup: --- "Indices Stats API with extended files stats": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: segment files stats extended in 7.13.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/50_disk_usage.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/50_disk_usage.yml index 3fe6edf0823e7..089d8e339b4fc 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/50_disk_usage.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/50_disk_usage.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: analyze index disk usage API is introduced in 7.15 - do: @@ -110,8 +110,8 @@ setup: --- "Star": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: star is resolved in 8.2+ - do: @@ -130,8 +130,8 @@ setup: --- "Dense vectors": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: dense vector support was added in 8.4 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/70_write_load.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/70_write_load.yml index be2eaf518181b..ce5d93a8eb38e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/70_write_load.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/70_write_load.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: Indices write load stats were introduced in 8.6 --- "Write load average is tracked at shard level": diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/90_global_ordinals.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/90_global_ordinals.yml index 692728348febf..6b01a9fe50cf5 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/90_global_ordinals.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/90_global_ordinals.yml @@ -54,8 +54,8 @@ setup: --- "global_ordinals - blank": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "global_ordinals introduced in 8.8.0" - do: @@ -69,8 +69,8 @@ setup: --- "global_ordinals - fields": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "global_ordinals introduced in 8.8.0" - do: @@ -124,8 +124,8 @@ setup: --- "global_ordinals - fields and metrics": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "global_ordinals introduced in 8.8.0" - do: @@ -163,8 +163,8 @@ setup: --- "global_ordinals - fielddata_fields": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "global_ordinals introduced in 8.8.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml index 484934c21209a..95b1fbd7c0419 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml @@ -169,8 +169,8 @@ --- "Aliases with date math": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "date math support for aliases was added in 7.13" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/40_must_exist.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/40_must_exist.yml index fa3c740612872..0c4f90ea73343 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/40_must_exist.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/40_must_exist.yml @@ -1,8 +1,8 @@ --- "Remove alias with must_exist": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "must_exist does not work until 7.11" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml index dc6e730248860..8dfd499b7d32c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml @@ -155,8 +155,8 @@ --- "Test Get Summarized Pipelines": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "summary option added in 7.13" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml index 8e0bd87905e0a..7c8061e36e790 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml @@ -1,7 +1,7 @@ --- "Multi Get with alias that resolves to multiple indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "message was changed to fix grammar in 7.9" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/40_routing.yml index 7a2706ffe3863..50482aa6f86fb 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/40_routing.yml @@ -35,8 +35,8 @@ routing: --- requires routing: - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "fails with an unexpected message in 7.x" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml index 39cf7ba41d46d..2935c0c1c41b5 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml @@ -1,6 +1,6 @@ keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -48,8 +48,8 @@ keyword: --- stored text: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -97,8 +97,8 @@ stored text: --- force_synthetic_source_ok: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -161,8 +161,8 @@ force_synthetic_source_ok: --- force_synthetic_source_bad_mapping: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: message changed in 8.5 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/10_get_feature_upgrade_status.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/10_get_feature_upgrade_status.yml index c4d48933aae73..13d98aab2d1d9 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/10_get_feature_upgrade_status.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/10_get_feature_upgrade_status.yml @@ -1,7 +1,7 @@ "Get feature upgrade status": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Endpoint added in 7.16.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/20_post_feature_upgrade.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/20_post_feature_upgrade.yml index c2a99fdcde77d..b1d6b0630d0a7 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/20_post_feature_upgrade.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/20_post_feature_upgrade.yml @@ -1,7 +1,7 @@ "Get feature upgrade status": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Endpoint added in 7.16.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mtermvectors/30_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mtermvectors/30_routing.yml index a9e1893ea764c..ba88ed8104f3e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mtermvectors/30_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mtermvectors/30_routing.yml @@ -41,8 +41,8 @@ routing: --- requires routing: - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "fails with an unexpected message in 7.x" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/10_basic.yml index df5e04a942d1e..94064ab1953bd 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/10_basic.yml @@ -13,10 +13,10 @@ setup: --- "node_info role test": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "node roles were not sorted before 7.8.0" - features: [no_xpack] + test_runner_features: [no_xpack] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/40_aggs.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/40_aggs.yml index 415121823adf1..b7a9356ee2db1 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/40_aggs.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/40_aggs.yml @@ -1,9 +1,9 @@ --- "node_info test aggregations": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "aggregation info only supported in 7.9.10+" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.reload_secure_settings/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.reload_secure_settings/10_basic.yml index e96df35d5714f..ce8fdb7e5cefb 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.reload_secure_settings/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.reload_secure_settings/10_basic.yml @@ -3,8 +3,8 @@ setup: features: [arbitrary_key] --- "node_reload_secure_settings test wrong password": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "support for reloading password protected keystores was introduced in 7.7.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml index b119a1a1d94f3..1a7da98af9129 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml @@ -234,9 +234,9 @@ --- "Metric - segments include_unloaded_segments": - - skip: - features: [arbitrary_key] - version: " - 7.12.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.13.0"] reason: "support for include_unloaded_segments only added in 7.13" - do: nodes.info: {} @@ -266,9 +266,9 @@ --- "Metric - _all include_unloaded_segments": - - skip: - features: [arbitrary_key] - version: " - 7.12.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.13.0"] reason: "support for include_unloaded_segments only added in 7.13" - do: nodes.info: {} @@ -296,9 +296,9 @@ --- "Metric - http": - - skip: - features: [arbitrary_key] - version: " - 7.12.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.13.0"] reason: "HTTP client stats added in 7.13.0" - do: nodes.info: {} @@ -327,9 +327,9 @@ --- "Metric - blank for indices shard_stats": - - skip: - features: [arbitrary_key] - version: " - 7.15.0" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.15.1"] reason: "total shard count added in version 7.15.0, and fixed in 7.15.1" - do: nodes.info: {} @@ -344,9 +344,9 @@ --- "Metric - _all for indices shard_stats": - - skip: - features: [arbitrary_key] - version: " - 7.15.0" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.15.1"] reason: "total shard count added in version 7.15.0, and fixed in 7.15.1" - do: nodes.info: {} @@ -363,9 +363,9 @@ --- "indices shard_stats total count test": - - skip: - features: ["allowed_warnings", arbitrary_key] - version: " - 7.15.0" + - requires: + test_runner_features: ["allowed_warnings", arbitrary_key] + cluster_features: ["gte_v7.15.1"] reason: "total shard count added in version 7.15.0, and fixed in 7.15.1" - do: @@ -396,9 +396,9 @@ --- "Metric - blank for indices mappings": - - skip: - features: [arbitrary_key] - version: " - 8.4.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v8.5.0"] reason: "mappings added in version 8.5.0" - do: nodes.info: {} @@ -415,9 +415,9 @@ --- "indices mappings exact count test for indices level": - - skip: - features: [arbitrary_key] - version: " - 8.4.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v8.5.0"] reason: "mappings added in version 8.5.0" - do: @@ -509,9 +509,9 @@ --- "indices mappings does not exist in shards level": - - skip: - features: [arbitrary_key] - version: " - 8.4.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v8.5.0"] reason: "mappings added in version 8.5.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/40_store_stats.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/40_store_stats.yml index 5c416c4f9e844..e18e47765841c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/40_store_stats.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/40_store_stats.yml @@ -1,8 +1,8 @@ --- "Store stats": - - skip: - features: [arbitrary_key] - version: " - 7.12.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.13.0"] reason: "total_data_set_size added in 7.13" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml index c08f8579e6ece..de8167ee71e8e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml @@ -1,9 +1,9 @@ --- "Indexing pressure stats": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "indexing_pressure was added in 7.9" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} @@ -31,10 +31,10 @@ - gte: { nodes.$node_id.indexing_pressure.memory.total.replica_rejections: 0 } --- "Indexing pressure memory limit": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "memory limit was added in 7.10" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/60_transport_stats.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/60_transport_stats.yml index 4ce6198a11f42..175b66bafea5a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/60_transport_stats.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/60_transport_stats.yml @@ -23,10 +23,10 @@ --- "Transport handling time histogram": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "handling_time_histograms were added in 8.1" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/70_repository_throttling_stats.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/70_repository_throttling_stats.yml index 1e8dc106092ba..0731d6a5dcf43 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/70_repository_throttling_stats.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/70_repository_throttling_stats.yml @@ -1,9 +1,9 @@ --- "Repository throttling stats (no repository exists)": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "repository throttling stats was added in 8.9.0" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} @@ -19,10 +19,10 @@ --- "Repository throttling stats (some repositories exist)": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "repository throttling stats was added in 8.9.0" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/80_allocation_stats.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/80_allocation_stats.yml index a2e1117073cde..b2f5acd1507b8 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/80_allocation_stats.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/80_allocation_stats.yml @@ -1,9 +1,9 @@ --- "Allocation stats": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "allocation stats was added in 8.14.0" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml index f3cb3f7810e3c..48ad549e94059 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml @@ -392,8 +392,8 @@ setup: --- "Date range rounding": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "This part tests rounding behaviour changed in 7.7" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/20_get_script_context.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/20_get_script_context.yml index 64efeb7dfb4ba..5b8bb7f06a38c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/20_get_script_context.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/20_get_script_context.yml @@ -1,6 +1,6 @@ "Action to get all contexts": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: "get_all_contexts introduced in 7.6.0" - do: get_script_context: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/25_get_script_languages.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/25_get_script_languages.yml index f4d764324e2dd..855e2c161dff3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/25_get_script_languages.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/25_get_script_languages.yml @@ -1,6 +1,6 @@ "Action to get script languages": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: "get_script_languages introduced in 7.6.0" - do: get_script_languages: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/10_unified.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/10_unified.yml index 4607ae758b91f..a26bc22df8936 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/10_unified.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/10_unified.yml @@ -25,8 +25,8 @@ setup: --- teardown: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "setting added in 8.10.0" - do: @@ -49,8 +49,8 @@ teardown: --- "Basic combined_fields query": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "combined fields query was introduced in 7.13" - do: search: @@ -64,8 +64,8 @@ teardown: --- "Disable weight matches": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml index a832ca222288a..cba72e6b5e8e7 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml @@ -69,8 +69,8 @@ setup: --- "Highlight multiple documents": - - skip: - version: " - 7.10.1" + - requires: + cluster_features: ["gte_v7.10.2"] reason: Bug fixed in 7.10.2 - do: search: @@ -93,8 +93,8 @@ setup: --- "Highlight multiple nested documents": - - skip: - version: " - 7.10.1" + - requires: + cluster_features: ["gte_v7.10.2"] reason: Bug fixed in 7.10.2 - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml index edc69b4e22a35..d732fb084db3d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml @@ -40,8 +40,8 @@ setup: --- "Unified highlighter on a field WITHOUT OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: @@ -66,8 +66,8 @@ setup: --- "Plain highlighter on a field WITHOUT OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: @@ -103,8 +103,8 @@ setup: --- "Plain highlighter on a field WITH OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: @@ -117,8 +117,8 @@ setup: --- "Plain highlighter with max_analyzed_offset < 0 should FAIL": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/40_keyword_ignore.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/40_keyword_ignore.yml index 5849ed195265f..bad4247b35ee7 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/40_keyword_ignore.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/40_keyword_ignore.yml @@ -25,8 +25,8 @@ setup: --- "Plain Highligher should skip highlighting ignored keyword values": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "skip highlighting of ignored values was introduced in 7.7" - do: search: @@ -46,8 +46,8 @@ setup: --- "Unified Highligher should skip highlighting ignored keyword values": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "skip highlighting of ignored values was introduced in 7.7" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml index 26e2eff5c3d3c..a2fd448f5044d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -199,8 +199,8 @@ text multi plain: --- text single unified from reanalysis: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -218,8 +218,8 @@ text single unified from reanalysis: --- text multi unified from reanalysis: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -237,8 +237,8 @@ text multi unified from reanalysis: --- text single unified from positions: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -256,8 +256,8 @@ text single unified from positions: --- text multi unified from positions: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -275,8 +275,8 @@ text multi unified from positions: --- text single unified from vectors: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -294,8 +294,8 @@ text single unified from vectors: --- text multi unified from vectors: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -313,8 +313,8 @@ text multi unified from vectors: --- text single fvh source order: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -332,8 +332,8 @@ text single fvh source order: --- text multi fvh source order: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -351,8 +351,8 @@ text multi fvh source order: --- text single fvh score order: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -371,8 +371,8 @@ text single fvh score order: --- text multi fvh score order: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml index 136dc807a89d4..43d820e03481f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml @@ -41,8 +41,8 @@ setup: --- "Field mapping stats": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "Cluster mappings stats for indexed dense vector was added in 8.4" - do: { cluster.stats: { } } - length: { indices.mappings.field_types: 1 } diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/90_sparse_vector.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/90_sparse_vector.yml index 7b8ce0b961b93..fa89a43561764 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/90_sparse_vector.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/90_sparse_vector.yml @@ -1,8 +1,8 @@ --- "Indexing and searching sparse vectors in >=8.11": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "sparse_vector field type reintroduced in 8.11" - do: @@ -151,9 +151,10 @@ --- "Sparse vector in 7.x": + - requires: + test_runner_features: ["allowed_warnings"] - skip: - features: ["allowed_warnings"] - version: "8.0.0 - " + cluster_features: ["gte_v8.0.0"] reason: "sparse_vector field type supported in 7.x" - do: allowed_warnings: @@ -183,7 +184,10 @@ --- "Sparse vector in 8.0.0 <= x < 8.11.0": - skip: - version: " - 7.99.99, 8.11.0 - " + cluster_features: ["gte_v8.11.0"] + reason: "sparse_vector field type not supported in 8.x until 8.11.0" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "sparse_vector field type not supported in 8.x until 8.11.0" - do: catch: /The \[sparse_vector\] field type .* supported/ diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/110_field_collapsing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/110_field_collapsing.yml index 4f79cbabbbeb8..76207fd76e45b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/110_field_collapsing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/110_field_collapsing.yml @@ -517,8 +517,8 @@ setup: - gte: { hits.hits.2.inner_hits.sub_hits.hits.hits.1._primary_term: 1 } --- "Test collapse with inner_hits and missing name fails": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: fixed in 8.13 - do: catch: bad_request diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/111_field_collapsing_with_max_score.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/111_field_collapsing_with_max_score.yml index fc63ac5c5876a..3c0364bb78341 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/111_field_collapsing_with_max_score.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/111_field_collapsing_with_max_score.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Collapse with max score was fixed in 8.10.0 - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/161_exists_query_within_nested_query.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/161_exists_query_within_nested_query.yml index 4dfba3652d7db..9a9fbdfe4519c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/161_exists_query_within_nested_query.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/161_exists_query_within_nested_query.yml @@ -539,8 +539,8 @@ setup: --- "Test exists query within nested query on mapped binary field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -558,8 +558,8 @@ setup: --- "Test exists query within nested query on mapped boolean field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -577,8 +577,8 @@ setup: --- "Test exists query within nested query on mapped date field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -596,8 +596,8 @@ setup: --- "Test exists query within nested query on mapped geo_point field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -616,8 +616,8 @@ setup: --- "Test exists query within nested query on mapped ip field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -635,8 +635,8 @@ setup: --- "Test exists query within nested query on mapped keyword field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -654,8 +654,8 @@ setup: --- "Test exists query within nested query on mapped byte field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -673,8 +673,8 @@ setup: --- "Test exists query within nested query on mapped double field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -692,8 +692,8 @@ setup: --- "Test exists query within nested query on mapped float field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -711,8 +711,8 @@ setup: --- "Test exists query within nested query on mapped half_float field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -730,8 +730,8 @@ setup: --- "Test exists query within nested query on mapped integer field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -749,8 +749,8 @@ setup: --- "Test exists query within nested query on mapped long field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -768,8 +768,8 @@ setup: --- "Test exists query within nested query on mapped short field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -787,8 +787,8 @@ setup: --- "Test exists query within nested query on mapped object field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -806,8 +806,8 @@ setup: --- "Test exists query within nested query on mapped object inner field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/200_ignore_malformed.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/200_ignore_malformed.yml index b08f532585fde..3304e11154164 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/200_ignore_malformed.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/200_ignore_malformed.yml @@ -92,8 +92,8 @@ setup: --- "ignored_field_values is returned by default": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: ignored_field_values was added in 8.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/220_total_hits_object.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/220_total_hits_object.yml index 0f352de9c414b..d8119c96853cf 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/220_total_hits_object.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/220_total_hits_object.yml @@ -55,8 +55,8 @@ setup: --- "hits.total as an object": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: hits.total is rendered as an object in 7.0.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/230_interval_query.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/230_interval_query.yml index ea29e5b208b23..82fb18a879346 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/230_interval_query.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/230_interval_query.yml @@ -322,8 +322,8 @@ setup: --- "Test overlapping": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: search: @@ -345,8 +345,8 @@ setup: --- "Test before": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: search: @@ -365,8 +365,8 @@ setup: --- "Test after": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: search: @@ -386,8 +386,8 @@ setup: --- "Test prefix": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "Implemented in 7.3" - do: search: @@ -406,8 +406,8 @@ setup: --- "Test wildcard": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "Implemented in 7.3" - do: search: @@ -426,8 +426,8 @@ setup: --- "Test fuzzy match": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: "Implemented in 7.6" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml index f35bf691fbdce..a3f5517e29f02 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml @@ -137,8 +137,8 @@ setup: --- "date histogram aggregation with date and date_nanos mapping": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml index e00d7bbb72363..f55248eb54116 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/30_limits.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/30_limits.yml index 286e203ef5c7d..bea52c22e151f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/30_limits.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/30_limits.yml @@ -28,8 +28,8 @@ setup: --- "Request with negative from value url parameter": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: change was only made in 8.0.0 - do: @@ -42,8 +42,8 @@ setup: --- "Request with negative from value in body": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: change was only made in 8.0.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/310_match_bool_prefix.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/310_match_bool_prefix.yml index d0b4246ca4b86..0ea884164292c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/310_match_bool_prefix.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/310_match_bool_prefix.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "added in 7.2.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/320_disallow_queries.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/320_disallow_queries.yml index b301d64eb834f..dcb265bcd98b7 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/320_disallow_queries.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/320_disallow_queries.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -34,8 +34,8 @@ setup: --- teardown: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -46,8 +46,8 @@ teardown: --- "Test disallow expensive queries": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" ### Check for initial setting = null -> false diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml index 03a2129c76598..fd3d31f8245ea 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml @@ -90,8 +90,8 @@ --- "Test disable source": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "behaviour of fields when source is disabled changed in 8.4.0" - do: @@ -263,8 +263,8 @@ --- "Test token count": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "support for token_count was instroduced in 7.10" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/340_flattened.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/340_flattened.yml index b461a6c4defb2..ea919ba3fd4ff 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/340_flattened.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/340_flattened.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "Flattened fields were moved from xpack to core in 7.13." --- @@ -183,8 +183,8 @@ setup: --- "Test fetching flattened subfields via fields option": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: fetching flattened subfields introduced in 7.13.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_binary_field.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_binary_field.yml index d58e1f7dc2c18..e53ef79b0627d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_binary_field.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_binary_field.yml @@ -1,8 +1,8 @@ --- "binary": - - skip: - features: ["headers"] - version: " - 7.99.99" + - requires: + test_runner_features: ["headers"] + cluster_features: ["gte_v8.0.0"] reason: "docvalues_fields on binary field were corrected in 8.0" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_point_in_time.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_point_in_time.yml index 71ea09d33e81d..da20c3f937dcc 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_point_in_time.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_point_in_time.yml @@ -40,8 +40,8 @@ setup: --- "basic": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "point in time is introduced in server in 7.13" - do: open_point_in_time: @@ -139,8 +139,8 @@ setup: --- "point-in-time with slicing": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: "support for slicing was added in 7.15" - do: open_point_in_time: @@ -169,8 +169,8 @@ setup: --- "wildcard": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "point in time is introduced in 7.10" - do: open_point_in_time: @@ -204,8 +204,8 @@ setup: --- "msearch": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "point in time is introduced in 7.10" - do: open_point_in_time: @@ -242,8 +242,8 @@ setup: --- "point-in-time with index filter": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "support for index filter was added in 8.12" - do: open_point_in_time: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/360_combined_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/360_combined_fields.yml index 2b38a72c70a06..1ee1ab19f1612 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/360_combined_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/360_combined_fields.yml @@ -24,8 +24,8 @@ setup: --- "Test combined_fields query": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "combined fields query was introduced in 7.13" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/370_profile.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/370_profile.yml index 0ead7b87f8acf..201bba70ca5a5 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/370_profile.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/370_profile.yml @@ -467,10 +467,10 @@ dfs profile for search with dfs_query_then_fetch: - is_false: profile.shards.0.dfs --- composite_id_parsed: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: node_id, shard_id, index and cluster fields added in 8.10.0 - features: "contains" + test_runner_features: "contains" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml index 04d6f72175023..34852a7b49624 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml @@ -1,9 +1,9 @@ --- "Test that index segments are sorted on timestamp field if @timestamp field is defined in mapping": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "sorting segments was added in 7.16" - features: allowed_warnings + test_runner_features: allowed_warnings - do: indices.create: @@ -49,10 +49,10 @@ --- "Test that index segments are NOT sorted on timestamp field when @timestamp field is dynamically added": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "sorting segments was added in 7.16" - features: allowed_warnings + test_runner_features: allowed_warnings - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_doc_values_search.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_doc_values_search.yml index cef4bbc187c84..aa8323edaa6e3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_doc_values_search.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_doc_values_search.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: @@ -243,8 +243,8 @@ setup: --- "Test distance_feature query on date field where only doc values are enabled": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: @@ -399,8 +399,8 @@ setup: --- "Test geo shape query on geo_point field where only doc values are enabled": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: @@ -417,8 +417,8 @@ setup: --- "Test distance_feature query on geo_point field where only doc values are enabled": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_lookup_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_lookup_fields.yml index abe4146e66a8d..8b92ec9e70f7e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_lookup_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_lookup_fields.yml @@ -26,8 +26,8 @@ setup: --- "Retrieve lookup fields": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Lookup fields are introduced in 8.2" - do: search: @@ -52,8 +52,8 @@ setup: --- "Fails to query or aggregate on lookup fields": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Lookup fields are introduced in 8.2" - do: catch: /Field \[location\] of type \[lookup\] does not support match queries/ diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml index e013992e06c9e..75d488427a903 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml @@ -1,6 +1,6 @@ keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -36,8 +36,8 @@ keyword: --- stored text: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -74,8 +74,8 @@ stored text: --- stored keyword: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -112,8 +112,8 @@ stored keyword: --- stored keyword without sibling fields: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -157,8 +157,8 @@ stored keyword without sibling fields: --- force_synthetic_source_ok: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -210,8 +210,8 @@ force_synthetic_source_ok: --- force_synthetic_source_bad_mapping: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -260,8 +260,8 @@ force_synthetic_source_bad_mapping: --- doc values keyword with ignore_above: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -328,8 +328,8 @@ doc values keyword with ignore_above: --- stored keyword with ignore_above: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -398,8 +398,8 @@ stored keyword with ignore_above: --- _source filtering: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -439,8 +439,8 @@ _source filtering: --- _doc_count: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: bug caused by many not having _doc_count fixed in 8.7.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/410_named_queries.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/410_named_queries.yml index e1384a0b8d19b..e31628c8dafde 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/410_named_queries.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/410_named_queries.yml @@ -1,6 +1,6 @@ named_queries: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: introduced in 8.8.0 - do: @@ -47,8 +47,8 @@ named_queries: --- named_queries_with_score: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: introduced in 8.8.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml index 2f1b42b94afb1..76057b5a364fb 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.5.0" + - requires: + cluster_features: ["gte_v8.5.1"] reason: fixed in 8.5.1 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/510_range_query_out_of_bounds.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/510_range_query_out_of_bounds.yml index b2f35fe724410..54b284cd4853d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/510_range_query_out_of_bounds.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/510_range_query_out_of_bounds.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: fixed in 8.14.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/90_search_after.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/90_search_after.yml index e1f367e8c217e..1fefc8bffffa1 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/90_search_after.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/90_search_after.yml @@ -155,8 +155,8 @@ --- "date_nanos": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: fixed in 7.10.0 - do: @@ -221,9 +221,9 @@ --- "_shard_doc sort": - - skip: - version: " - 7.11.99" - reason: _shard_doc sort was added in 7.12 + - requires: + cluster_features: ["gte_v7.12.0"] + reason: _shard_doc sort was added in 7.12 - do: indices.create: @@ -245,8 +245,8 @@ --- "Format sort values": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: Format sort output is introduced in 7.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.clone/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.clone/10_basic.yml index fb289355e08fb..65e1ac796b0aa 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.clone/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.clone/10_basic.yml @@ -33,8 +33,8 @@ setup: --- "Clone a snapshot": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "Clone snapshot functionality was introduced in 7.10" - do: snapshot.clone: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.create/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.create/10_basic.yml index f7c522b712244..d17d88c2728a8 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.create/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.create/10_basic.yml @@ -40,8 +40,8 @@ setup: --- "Create a snapshot and clean up repository": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: cleanup introduced in 7.4 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get/10_basic.yml index bec14f0628501..ca79a4419b813 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get/10_basic.yml @@ -96,8 +96,8 @@ setup: --- "Get snapshot info contains include_global_state": - - skip: - version: " - 6.1.99" + - requires: + cluster_features: ["gte_v6.2.0"] reason: "include_global_state field has been added in the response in 6.2.0" - do: @@ -156,8 +156,8 @@ setup: --- "Get snapshot info with metadata": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "Introduced with 7.3" - do: @@ -195,8 +195,8 @@ setup: --- "Get snapshot info with index details": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "Introduced in 7.13.0" - do: @@ -235,8 +235,8 @@ setup: --- "Get snapshot info without index names": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "Introduced in 8.3.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get_repository/20_repository_uuid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get_repository/20_repository_uuid.yml index 0532d208d0cba..f151fef556a6e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get_repository/20_repository_uuid.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get_repository/20_repository_uuid.yml @@ -1,7 +1,7 @@ --- "Get repository returns UUID": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: repository UUIDs introduced in 7.12.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/100_synonyms_no_system_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/100_synonyms_no_system_index.yml index f32d31c6b5246..3a7cf91a780b1 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/100_synonyms_no_system_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/100_synonyms_no_system_index.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 --- "Get synonyms sets returns not found when no index exists": diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml index e85769a359da5..bcd58f3f7bd64 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 --- diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml index 5fbc48bd5a084..0ed97d1b0f308 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml index 1ee71e58d4eae..351ff4e186d8a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml index f2d29bf863a8f..723c41e163eb8 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml index 73b07852ad6c2..f3711bb0774ca 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml index 4a00cf3aca0b3..79c666e44661a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml index 10eef66d4ddaa..a4853b0b6d414 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml index 6b7766bb8515f..f6d09a4540eb7 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Loading synonyms from index is introduced in 8.10.0 # Create a new synonyms set diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml index c965da31e0d24..dc94b36222402 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml @@ -1,7 +1,7 @@ --- "Reload analyzers for specific synonym set": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Reloading analyzers for specific synonym set is introduced in 8.10.0 # Create synonyms_set1 diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml index 598919d75047d..3af4c1ff90394 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml @@ -6,8 +6,8 @@ setup: --- add time series mappings: - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: introduced in 7.16.0 - do: @@ -56,8 +56,8 @@ add time series mappings: --- can't shadow dimensions: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -121,8 +121,8 @@ can't shadow dimensions: --- can't shadow metrics: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -186,8 +186,8 @@ can't shadow metrics: --- # Test that _tsid field is not added if an index is not a time-series index no _tsid in standard indices: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: time series params only on time series indices introduced in 8.5.0 - do: @@ -217,8 +217,8 @@ no _tsid in standard indices: --- no nested dimensions: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/100_composite.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/100_composite.yml index e546c60c5916a..920111fafb07b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/100_composite.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/100_composite.yml @@ -63,8 +63,8 @@ setup: --- composite aggregation on tsid: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -113,8 +113,8 @@ composite aggregation on tsid: --- composite aggregation on tsid with after: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/10_settings.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/10_settings.yml index 4a6626577d5ee..7efb5f5e56926 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/10_settings.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/10_settings.yml @@ -6,8 +6,8 @@ setup: --- enable: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -50,8 +50,8 @@ enable: --- no sort field: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -70,8 +70,8 @@ no sort field: --- no sort order: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -90,8 +90,8 @@ no sort order: --- no sort mode: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -110,8 +110,8 @@ no sort mode: --- no sort missing: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -130,8 +130,8 @@ no sort missing: --- no partitioning: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -151,8 +151,8 @@ no partitioning: --- routing_path required: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: the message was changed in 8.2.0 - do: @@ -170,8 +170,8 @@ routing_path required: --- routing_path is not allowed in standard mode: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -185,8 +185,8 @@ routing_path is not allowed in standard mode: --- routing required: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -207,8 +207,8 @@ routing required: --- empty routing_path: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: the message was changed in 8.2.0 - do: @@ -227,8 +227,8 @@ empty routing_path: --- empty start end times: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -247,8 +247,8 @@ empty start end times: --- set start_time and end_time: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -310,8 +310,8 @@ set start_time and end_time: --- set start_time and end_time without timeseries mode: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -336,8 +336,8 @@ set start_time and end_time without timeseries mode: --- set bad start_time and end_time: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -377,8 +377,8 @@ set bad start_time and end_time: --- check start_time and end_time with data_nano: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -437,8 +437,8 @@ check start_time and end_time with data_nano: --- check start_time boundary with data_nano: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -488,8 +488,8 @@ check start_time boundary with data_nano: --- check end_time boundary with data_nano: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -540,8 +540,8 @@ check end_time boundary with data_nano: --- check time_series default time bound value: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -573,8 +573,8 @@ check time_series default time bound value: --- check time_series empty time bound value: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/110_field_caps.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/110_field_caps.yml index 03d8d952136e3..4192bdf0cf2fb 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/110_field_caps.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/110_field_caps.yml @@ -83,8 +83,8 @@ setup: --- field caps on time_series indices: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: metric params only on time series indexes introduced in 8.4.0 - do: @@ -145,8 +145,8 @@ field caps on time_series indices: --- field caps on standard indices: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: metric params only on time series indexes introduced in 8.4.0 - do: @@ -188,8 +188,8 @@ field caps on standard indices: --- field caps on mixed indices: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: metric params only on time series indexes introduced in 8.4.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/120_counter_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/120_counter_fields.yml index 5767252060bd4..f507857d5927e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/120_counter_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/120_counter_fields.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "counter field support added in 8.10" - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml index cb897c918305e..3783e58e42562 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "position metric introduced in 8.8.0, synthetic source shows up in the mapping in 8.10 and on, may trigger assert failures in mixed cluster tests" - do: @@ -51,9 +51,9 @@ setup: --- multi-valued fields unsupported: - - skip: - features: contains - version: " - 8.7.99" + - requires: + test_runner_features: contains + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: bulk: @@ -73,8 +73,8 @@ multi-valued fields unsupported: --- "avg aggregation on position field unsupported": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: position metric introduced in 8.8.0, but exception message changed in 8.10.0 - do: catch: /Field \[location\] of type \[geo_point\]\[position\] is not supported for aggregation \[avg\]/ @@ -88,10 +88,10 @@ multi-valued fields unsupported: --- "geo_bounds on position field": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - features: close_to + test_runner_features: close_to - do: search: @@ -111,10 +111,10 @@ multi-valued fields unsupported: --- "geo_centroid on position field": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - features: close_to + test_runner_features: close_to - do: search: @@ -131,8 +131,8 @@ multi-valued fields unsupported: --- "geo bounding box query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -151,8 +151,8 @@ multi-valued fields unsupported: --- "geo shape intersects query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -168,8 +168,8 @@ multi-valued fields unsupported: --- "geo shape within query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -186,8 +186,8 @@ multi-valued fields unsupported: --- "geo shape disjoint query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -204,8 +204,8 @@ multi-valued fields unsupported: --- "geo shape contains query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -222,8 +222,8 @@ multi-valued fields unsupported: --- "geo distance query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -239,10 +239,10 @@ multi-valued fields unsupported: --- "geo_distance sort": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - features: close_to + test_runner_features: close_to - do: search: @@ -269,10 +269,10 @@ multi-valued fields unsupported: --- "distance_feature query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - features: close_to + test_runner_features: close_to - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/140_routing_path.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/140_routing_path.yml index 2ee2391458b03..6eb7a8dcad7aa 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/140_routing_path.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/140_routing_path.yml @@ -1,8 +1,8 @@ --- missing routing path field: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -89,8 +89,8 @@ missing routing path field: --- missing dimension on routing path field: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: error message changed in 8.14.0 - do: @@ -120,9 +120,9 @@ missing dimension on routing path field: --- multi-value routing path field: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/150_runtime_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/150_runtime_fields.yml index 8cb2802c2ef95..005cf38cd5cac 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/150_runtime_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/150_runtime_fields.yml @@ -1,7 +1,7 @@ --- tsdb_execute_painless_api: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: fixed in 8.12.0 and later - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml index 1b61785ba3134..9f9d59317454b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml @@ -6,8 +6,8 @@ setup: --- date: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -54,8 +54,8 @@ date: --- date_nanos: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -102,8 +102,8 @@ date_nanos: --- automatically add with date: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -148,8 +148,8 @@ automatically add with date: --- reject @timestamp with wrong type: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -172,8 +172,8 @@ reject @timestamp with wrong type: --- reject timestamp meta field with wrong type: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -195,8 +195,8 @@ reject timestamp meta field with wrong type: --- enable timestamp meta field: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -223,8 +223,8 @@ enable timestamp meta field: --- reject bad timestamp meta field: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -245,8 +245,8 @@ reject bad timestamp meta field: --- write without timestamp: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -284,8 +284,8 @@ write without timestamp: --- explicitly enable timestamp meta field: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -338,8 +338,8 @@ explicitly enable timestamp meta field: --- unable to create a time series index with @timestamp runtime field: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml index 807f60a0faf35..b710f6b313da0 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml @@ -6,8 +6,8 @@ setup: --- ecs style: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: index.mode and routing_path introduced in 8.1.0 - do: @@ -62,8 +62,8 @@ ecs style: --- top level wildcard dim object: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: routing_path object type check improve in 8.2.0 - do: @@ -120,8 +120,8 @@ top level wildcard dim object: --- exact match object type: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: routing_path error message updated in 8.14.0 - do: @@ -153,8 +153,8 @@ exact match object type: --- non keyword matches routing_path: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: routing_path error message updated in 8.14.0 - do: @@ -198,8 +198,8 @@ non keyword matches routing_path: --- runtime field matching routing path: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -240,8 +240,8 @@ runtime field matching routing path: --- "dynamic: runtime matches routing_path": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: routing_path error message updated in 8.8.0 and has_dynamic_mapping condition fixed in 8.14.0 - do: @@ -277,9 +277,9 @@ runtime field matching routing path: --- "dynamic: false matches routing_path": - - skip: - features: contains - version: " - 8.1.99" + - requires: + test_runner_features: contains + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -315,8 +315,8 @@ runtime field matching routing path: --- nested dimensions: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: message changed in 8.2.0 - do: @@ -344,8 +344,8 @@ nested dimensions: --- nested fields: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: message changed in 8.2.0 - do: @@ -375,8 +375,8 @@ nested fields: --- "Unable to define a metric type for a runtime field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - do: @@ -424,8 +424,8 @@ nested fields: --- "Synthetic source": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Synthetic source shows up in the mapping in 8.10 - do: @@ -455,8 +455,8 @@ nested fields: --- regular source: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: synthetic source - do: @@ -486,8 +486,8 @@ regular source: time_series_dimension: true --- disabled source: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: synthetic source - do: @@ -518,8 +518,8 @@ disabled source: --- source include/exclude: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: synthetic source - do: @@ -576,8 +576,8 @@ source include/exclude: --- Supported metric type position: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "position introduced in 8.8.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml index 9d27507d0e32b..b0e1595f3d0e3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -20,10 +20,10 @@ teardown: --- "Create a snapshot and then restore it": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - features: ["allowed_warnings"] + test_runner_features: ["allowed_warnings"] # Create index - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml index 5b779894a2cb1..962926ca81fad 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml @@ -63,8 +63,8 @@ setup: --- query a dimension: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -79,8 +79,8 @@ query a dimension: --- query a metric: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -96,8 +96,8 @@ query a metric: --- "query tsid fails": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -111,8 +111,8 @@ query a metric: --- fetch a dimension: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -130,8 +130,8 @@ fetch a dimension: --- fetch a metric: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -150,8 +150,8 @@ fetch a metric: --- fetch a tag: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -170,8 +170,8 @@ fetch a tag: --- "fetch the tsid": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -189,8 +189,8 @@ fetch a tag: --- aggregate a dimension: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -211,8 +211,8 @@ aggregate a dimension: --- aggregate a metric: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -239,8 +239,8 @@ aggregate a metric: --- aggregate a tag: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -265,8 +265,8 @@ aggregate a tag: --- "aggregate the tsid": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -289,8 +289,8 @@ aggregate a tag: --- "aggregate filter the tsid fails": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -308,8 +308,8 @@ aggregate a tag: --- sort by tsid: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/50_alias.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/50_alias.yml index 829e26a90805a..5c5dc02ad4d09 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/50_alias.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/50_alias.yml @@ -63,8 +63,8 @@ setup: --- search an alias: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -92,8 +92,8 @@ search an alias: --- index into alias: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml index b30c03c4797da..6c2d54d7365b2 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml @@ -1,7 +1,7 @@ --- add dimensions with put_mapping: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -53,8 +53,8 @@ add dimensions with put_mapping: --- add dimensions to no dims with dynamic_template over index: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -101,8 +101,8 @@ add dimensions to no dims with dynamic_template over index: --- add dimensions to no dims with dynamic_template over bulk: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -149,8 +149,8 @@ add dimensions to no dims with dynamic_template over bulk: --- add dimensions to some dims with dynamic_template over index: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -201,8 +201,8 @@ add dimensions to some dims with dynamic_template over index: --- add dimensions to some dims with dynamic_template over bulk: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/70_dimension_types.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/70_dimension_types.yml index 6398fee265fef..80cfa09105ae4 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/70_dimension_types.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/70_dimension_types.yml @@ -1,8 +1,8 @@ --- keyword dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 @@ -74,9 +74,9 @@ keyword dimension: --- flattened dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 @@ -162,9 +162,9 @@ flattened dimension: --- flattened empty dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 @@ -243,9 +243,9 @@ flattened empty dimension: --- flattened field missing routing path field: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -338,9 +338,9 @@ flattened field missing routing path field: --- flattened field misspelled routing path field: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -430,9 +430,9 @@ flattened field misspelled routing path field: --- long dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -505,9 +505,9 @@ long dimension: --- ip dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -580,8 +580,8 @@ ip dimension: --- runtime time series dimension: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/80_index_resize.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/80_index_resize.yml index 486e5bf8dc607..12b29f68050bd 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/80_index_resize.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/80_index_resize.yml @@ -85,8 +85,8 @@ setup: --- split: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -101,8 +101,8 @@ split: --- shrink: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -128,8 +128,8 @@ shrink: --- clone: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml index 57ad446eaf637..5f1368abcf436 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml @@ -65,8 +65,8 @@ setup: --- index with routing: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -88,8 +88,8 @@ index with routing: --- index with routing over _bulk: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -103,8 +103,8 @@ index with routing over _bulk: --- noop update: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -125,8 +125,8 @@ noop update: --- update: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 # We fail even though the document isn't found. @@ -150,8 +150,8 @@ update: --- update over _bulk: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -164,8 +164,8 @@ update over _bulk: --- search with routing: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 # We fail even though the document isn't found. @@ -177,8 +177,8 @@ search with routing: --- alias with routing: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -191,8 +191,8 @@ alias with routing: --- alias with search_routing: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -205,8 +205,8 @@ alias with search_routing: --- sort by _id: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -219,8 +219,8 @@ sort by _id: --- aggregate on _id: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -236,8 +236,8 @@ aggregate on _id: --- synthetic source text field: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "synthetic source introduced in 8.7.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/100_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/100_synthetic_source.yml index 2ad71d3b6ed55..f74fde7eb2a24 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/100_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/100_synthetic_source.yml @@ -1,6 +1,6 @@ keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -57,8 +57,8 @@ keyword: --- stored text: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/90_error.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/90_error.yml index 4dd48f3462a4f..33e3500e0c697 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/90_error.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/90_error.yml @@ -1,7 +1,7 @@ --- 'Misspelled fields get "did you mean"': - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: Implemented in 7.6 - do: catch: /\[UpdateRequest\] unknown field \[dac\] did you mean \[doc\]\?/ diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/95_require_alias.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/95_require_alias.yml index b8cd9c6eb0a38..65fe4927513e3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/95_require_alias.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/95_require_alias.yml @@ -1,7 +1,7 @@ --- "Set require_alias flag": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "require_alias flag added in 7.10" - do: catch: missing diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml index 3019a77957fee..8806918703abe 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings_regex" diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml index f68372b4474e9..b368975fa5e5b 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml @@ -1,18 +1,16 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "allowed_warnings_regex" --- Basic test for upgrade indices: - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "_upgrade api is deprecated since 7.11.0" - features: + test_runner_features: - "warnings" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml index 19c6a2e2bbadf..043e525a8e9b5 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings" diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml index a78130342519b..c64e80d0f6a03 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "allowed_warnings_regex" diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml index 98ff9065dd472..c3b3c4320be97 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" --- diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml index 591f60578b819..b7df872ff0a86 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "allowed_warnings_regex" - do: diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml index 964cd2d6c8741..3f3eac1e59e1a 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings" - do: diff --git a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksService.java b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksService.java index 5d3624238d0ce..3ea4b19f77a45 100644 --- a/server/src/main/java/org/elasticsearch/persistent/PersistentTasksService.java +++ b/server/src/main/java/org/elasticsearch/persistent/PersistentTasksService.java @@ -49,19 +49,6 @@ public PersistentTasksService(ClusterService clusterService, ThreadPool threadPo this.threadPool = threadPool; } - /** - * Notifies the master node to create new persistent task and to assign it to a node. - */ - @Deprecated(forRemoval = true) - public void sendStartRequest( - final String taskId, - final String taskName, - final Params taskParams, - final ActionListener> listener - ) { - sendStartRequest(taskId, taskName, taskParams, null, listener); - } - /** * Notifies the master node to create new persistent task and to assign it to a node. Accepts operation timeout as optional parameter */ @@ -156,11 +143,6 @@ void sendUpdateStateRequest( execute(request, UpdatePersistentTaskStatusAction.INSTANCE, listener); } - @Deprecated(forRemoval = true) - public void sendRemoveRequest(final String taskId, final ActionListener> listener) { - sendRemoveRequest(taskId, null, listener); - } - /** * Notifies the master node to remove a persistent task from the cluster state. Accepts operation timeout as optional parameter */ diff --git a/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java index 5a33a958646df..fb10d3e28dab2 100644 --- a/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java +++ b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java @@ -1994,7 +1994,7 @@ public long getRestoreThrottleTimeInNanos() { return restoreRateLimitingTimeInNanos.count(); } - protected void assertSnapshotOrStatelessPermittedThreadPool() { + private void assertSnapshotOrStatelessPermittedThreadPool() { // The Stateless plugin adds custom thread pools for object store operations assert ThreadPool.assertCurrentThreadPool( ThreadPool.Names.SNAPSHOT, diff --git a/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java index 0e4818701c5f5..7c0d6af4a92cf 100644 --- a/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java +++ b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java @@ -225,12 +225,7 @@ private Repository createRepository() { clusterService, MockBigArrays.NON_RECYCLING_INSTANCE, new RecoverySettings(Settings.EMPTY, new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS)) - ) { - @Override - protected void assertSnapshotOrStatelessPermittedThreadPool() { - // eliminate thread name check as we create repo manually - } - }; + ); clusterService.addStateApplier(event -> repository.updateState(event.state())); // Apply state once to initialize repo properly like RepositoriesService would repository.updateState(clusterService.state()); diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java index 185f4582e7377..303493a2e5d2d 100644 --- a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java @@ -2121,19 +2121,7 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() { transportService, Collections.singletonMap( FsRepository.TYPE, - metadata -> new FsRepository( - metadata, - environment, - xContentRegistry(), - clusterService, - bigArrays, - recoverySettings - ) { - @Override - protected void assertSnapshotOrStatelessPermittedThreadPool() { - // eliminate thread name check as we create repo in the test thread - } - } + metadata -> new FsRepository(metadata, environment, xContentRegistry(), clusterService, bigArrays, recoverySettings) ), emptyMap(), threadPool, diff --git a/test/external-modules/error-query/src/yamlRestTest/resources/rest-api-spec/test/error_query/20_stall_time.yml b/test/external-modules/error-query/src/yamlRestTest/resources/rest-api-spec/test/error_query/20_stall_time.yml index a2ff4da6cfbd3..8956f44749813 100644 --- a/test/external-modules/error-query/src/yamlRestTest/resources/rest-api-spec/test/error_query/20_stall_time.yml +++ b/test/external-modules/error-query/src/yamlRestTest/resources/rest-api-spec/test/error_query/20_stall_time.yml @@ -3,8 +3,8 @@ --- "Error query with stall time": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: stall_time_seconds error_query field added in 8.10 - do: diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 4c1980fb1f673..1afedeb37114a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -129,6 +129,7 @@ import static org.elasticsearch.client.RestClient.IGNORE_RESPONSE_CODES_PARAM; import static org.elasticsearch.cluster.ClusterState.VERSION_INTRODUCING_TRANSPORT_VERSIONS; import static org.elasticsearch.core.Strings.format; +import static org.elasticsearch.test.rest.TestFeatureService.ALL_FEATURES; import static org.elasticsearch.xcontent.ToXContent.EMPTY_PARAMS; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.containsString; @@ -240,20 +241,6 @@ public enum ProductFeature { private static EnumSet availableFeatures; private static Set nodesVersions; - private static final TestFeatureService ALL_FEATURES = new TestFeatureService() { - @Override - public boolean clusterHasFeature(String featureId) { - return true; - } - - @Override - public Set getAllSupportedFeatures() { - throw new UnsupportedOperationException( - "Only available to properly initialized TestFeatureService. See ESRestTestCase#createTestFeatureService" - ); - } - }; - protected static TestFeatureService testFeatureService = ALL_FEATURES; protected static Set getCachedNodesVersions() { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java index dde6784f47b06..c9c39b206ada8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java @@ -35,12 +35,22 @@ import java.util.Map; import java.util.Set; import java.util.function.BiConsumer; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static java.util.Collections.emptySet; class ESRestTestFeatureService implements TestFeatureService { + + /** + * In order to migrate from version checks to cluster feature checks, + * we provide synthetic features derived from versions, e.g. "gte_v8.0.0". + */ + private static final Pattern VERSION_FEATURE_PATTERN = Pattern.compile("gte_v(\\d+\\.\\d+\\.\\d+)"); + private final Set allSupportedFeatures; private final Set knownHistoricalFeatureNames; + private final Version version; ESRestTestFeatureService(List featureSpecs, Collection nodeVersions, Set clusterStateFeatures) { List specs = new ArrayList<>(featureSpecs); @@ -50,10 +60,8 @@ class ESRestTestFeatureService implements TestFeatureService { } var historicalFeatures = FeatureData.createFromSpecifications(specs).getHistoricalFeatures(); this.knownHistoricalFeatureNames = historicalFeatures.lastEntry().getValue(); - var minVersion = nodeVersions.stream().min(Comparator.naturalOrder()); - var supportedHistoricalFeatures = minVersion.map(v -> historicalFeatures.floorEntry(v).getValue()) - .orElse(knownHistoricalFeatureNames); - this.allSupportedFeatures = Sets.union(clusterStateFeatures, supportedHistoricalFeatures); + this.version = nodeVersions.stream().min(Comparator.naturalOrder()).orElse(Version.CURRENT); + this.allSupportedFeatures = Sets.union(clusterStateFeatures, historicalFeatures.floorEntry(version).getValue()); } public static boolean hasFeatureMetadata() { @@ -62,9 +70,33 @@ public static boolean hasFeatureMetadata() { @Override public boolean clusterHasFeature(String featureId) { - if (hasFeatureMetadata() - && MetadataHolder.FEATURE_NAMES.contains(featureId) == false - && knownHistoricalFeatureNames.contains(featureId) == false) { + if (allSupportedFeatures.contains(featureId)) { + return true; + } + if (MetadataHolder.FEATURE_NAMES.contains(featureId) || knownHistoricalFeatureNames.contains(featureId)) { + return false; // feature known but not present + } + + // check synthetic version features (used to migrate from version checks to feature checks) + Matcher matcher = VERSION_FEATURE_PATTERN.matcher(featureId); + if (matcher.matches()) { + Version extractedVersion = Version.fromString(matcher.group(1)); + if (Version.V_8_14_0.before(extractedVersion)) { + // As of version 8.14.0 REST tests have been migrated to use features only. + // For migration purposes we provide a synthetic version feature gte_vX.Y.Z for any version at or before 8.14.0. + throw new IllegalArgumentException( + Strings.format( + "Synthetic version features are only available before [%s] for migration purposes! " + + "Please add a cluster feature to an appropriate FeatureSpecification; features only necessary for " + + "testing can be supplied via ESRestTestCase#createAdditionalFeatureSpecifications()", + Version.V_8_14_0 + ) + ); + } + return version.onOrAfter(extractedVersion); + } + + if (hasFeatureMetadata()) { throw new IllegalArgumentException( Strings.format( "Unknown feature %s: check the feature has been added to the correct FeatureSpecification in the relevant module or, " @@ -74,12 +106,7 @@ public boolean clusterHasFeature(String featureId) { ) ); } - return allSupportedFeatures.contains(featureId); - } - - @Override - public Set getAllSupportedFeatures() { - return allSupportedFeatures; + return false; } private static class MetadataHolder { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/TestFeatureService.java b/test/framework/src/main/java/org/elasticsearch/test/rest/TestFeatureService.java index 332a00ce895a0..8b3ba874e1678 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/TestFeatureService.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/TestFeatureService.java @@ -8,10 +8,8 @@ package org.elasticsearch.test.rest; -import java.util.Set; - public interface TestFeatureService { - boolean clusterHasFeature(String featureId); + TestFeatureService ALL_FEATURES = feature -> true; - Set getAllSupportedFeatures(); + boolean clusterHasFeature(String featureId); } diff --git a/test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java b/test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java index 94b80fcc3fab3..7e547e3ec02dc 100644 --- a/test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java +++ b/test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java @@ -24,18 +24,6 @@ public class ClientYamlTestExecutionContextTests extends ESTestCase { - private static class MockTestFeatureService implements TestFeatureService { - @Override - public boolean clusterHasFeature(String featureId) { - return true; - } - - @Override - public Set getAllSupportedFeatures() { - return Set.of(); - } - } - public void testHeadersSupportStashedValueReplacement() throws IOException { final AtomicReference> headersRef = new AtomicReference<>(); final String version = randomAlphaOfLength(10); @@ -44,7 +32,7 @@ public void testHeadersSupportStashedValueReplacement() throws IOException { null, randomBoolean(), Set.of(version), - new MockTestFeatureService(), + TestFeatureService.ALL_FEATURES, Set.of("os") ) { @Override @@ -82,7 +70,7 @@ public void testStashHeadersOnException() throws IOException { null, randomBoolean(), Set.of(version), - new MockTestFeatureService(), + TestFeatureService.ALL_FEATURES, Set.of("os") ) { @Override diff --git a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/auto_follow.yml b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/auto_follow.yml index 66f9d5df3d9d0..780bb7acc7b4c 100644 --- a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/auto_follow.yml +++ b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/auto_follow.yml @@ -54,8 +54,8 @@ name: my_pattern --- "Test put and delete auto follow pattern without specifying exclusion patterns": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: "auto-follow exclusion patterns is supported since 7.14.0" - do: @@ -114,8 +114,8 @@ name: my_pattern --- "Test put and delete auto follow pattern with exclusion patterns": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: "auto-follow exclusion patterns is supported since 7.14.0" - do: @@ -175,8 +175,8 @@ name: my_pattern --- "Test pause and resume auto follow pattern": - - skip: - version: " - 7.4.99" + - requires: + cluster_features: ["gte_v7.5.0"] reason: "pause/resume auto-follow patterns is supported since 7.5.0" - do: diff --git a/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml b/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml index 2362f21d77d86..247611823a761 100644 --- a/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml +++ b/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "Downsampling executed using persistent task framework from version 8.10" - do: @@ -87,8 +87,8 @@ setup: --- "Downsample index": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "Downsampling executed using persistent task framework from version 8.10" - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml index b8443bb2554aa..0bcd35cc69038 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -296,8 +296,8 @@ setup: --- "Downsample index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -394,8 +394,8 @@ setup: --- "Downsample non-existing index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -410,10 +410,10 @@ setup: --- "Downsample failure": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "#103615 merged to 8.13.0 and later" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -442,8 +442,8 @@ setup: --- "Downsample to existing index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -461,8 +461,8 @@ setup: } --- "Downsample using multiple indices": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -531,8 +531,8 @@ setup: --- "Downsample not time_series index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -552,8 +552,8 @@ setup: --- "Downsample no metric index": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Downsample of time series index without metric allowed from version 8.8.0" - do: @@ -645,8 +645,8 @@ setup: --- "Downsample no metric no label index": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Downsample of time series index without metric allowed from version 8.8.0" - do: @@ -730,8 +730,8 @@ setup: --- "Downsample a downsampled index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -823,8 +823,8 @@ setup: --- "Downsample a downsampled index with wrong intervals": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Rollup of rollups introduced in 8.5.0" - do: @@ -869,8 +869,8 @@ setup: --- "Downsample histogram as label": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -971,8 +971,8 @@ setup: --- "Downsample date_nanos timestamp field using custom format": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Bug fixed in 8.8.0" - do: @@ -1073,8 +1073,8 @@ setup: --- "Downsample date timestamp field using strict_date_optional_time_nanos format": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Bug fixed in 8.8.0" - do: @@ -1175,8 +1175,8 @@ setup: --- "Downsample using coarse grained timestamp": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Downsample GA version 8.7.0" - do: @@ -1281,8 +1281,8 @@ setup: --- "Downsample object field": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -1349,8 +1349,8 @@ setup: --- "Downsample empty and missing labels": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -1410,8 +1410,8 @@ setup: --- "Downsample label with ignore_above": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -1537,8 +1537,8 @@ setup: --- "Downsample index with empty dimension": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -1620,8 +1620,8 @@ setup: --- "Downsample index with empty dimension on routing path": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/20_unsupported_aggs.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/20_unsupported_aggs.yml index bf5f92f628444..13b7ebd1c0f3d 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/20_unsupported_aggs.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/20_unsupported_aggs.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: @@ -42,8 +42,8 @@ setup: --- "Histogram aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: @@ -67,8 +67,8 @@ setup: --- "Range aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample: unsupported aggregations errors added in 8.5.0" - do: @@ -99,8 +99,8 @@ setup: --- "Cardinality aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: @@ -122,8 +122,8 @@ setup: --- "Percentiles aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: @@ -146,8 +146,8 @@ setup: --- "Top-metrics aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/30_date_histogram.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/30_date_histogram.yml index 4d64127e2fb88..89ec88162ffcd 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/30_date_histogram.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/30_date_histogram.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup: unsupported aggregations errors added in 8.5.0" - do: @@ -41,10 +41,10 @@ setup: --- "Date histogram aggregation on time series index and rollup indices": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup: unsupported aggregations errors added in 8.5.0" - features: close_to + test_runner_features: close_to - do: indices.put_settings: @@ -232,8 +232,8 @@ setup: --- timezone support - 15m: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "timezone support added in 8.13" - do: @@ -432,8 +432,8 @@ timezone support - 15m: --- timezone support - 1h: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "timezone support added in 8.13" - do: @@ -632,8 +632,8 @@ timezone support - 1h: --- timezone support - 1d: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "timezone support added in 8.13" - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/40_runtime_fields.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/40_runtime_fields.yml index b9dbf621c60dc..1106930c648eb 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/40_runtime_fields.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/40_runtime_fields.yml @@ -1,9 +1,9 @@ --- "Runtime fields accessing metric fields in downsample target index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - features: close_to + test_runner_features: close_to - do: indices.create: @@ -162,8 +162,8 @@ --- "Runtime field accessing dimension fields in downsample target index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -283,8 +283,8 @@ --- "Runtime field accessing label fields in downsample target index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/50_auto_date_histogram.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/50_auto_date_histogram.yml index 050b16f0674ca..b5b08b84ac678 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/50_auto_date_histogram.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/50_auto_date_histogram.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Downsample GA version 8.7.0" - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/60_settings.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/60_settings.yml index e533db97b3f7e..3cd58e3fd1c11 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/60_settings.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/60_settings.yml @@ -1,7 +1,7 @@ --- "Downsample index with pipeline": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -92,10 +92,10 @@ --- "Downsample datastream with tier preference": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/x-pack/plugin/downsample/qa/with-security/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml b/x-pack/plugin/downsample/qa/with-security/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml index a1f7ac650141a..c95bb34732dad 100644 --- a/x-pack/plugin/downsample/qa/with-security/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml +++ b/x-pack/plugin/downsample/qa/with-security/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -292,8 +292,8 @@ setup: --- "Downsample index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/199_query_rulesets_before_setup.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/199_query_rulesets_before_setup.yml index 0f2a3feea0885..cbe4f98370300 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/199_query_rulesets_before_setup.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/199_query_rulesets_before_setup.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.9.99" - reason: Introduced in 8.10.0 + - requires: + cluster_features: ["gte_v8.10.0"] + reason: Introduced in 8.10.0 --- "Get query ruleset returns a 404 when no query rulesets exist": diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/200_query_ruleset_put.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/200_query_ruleset_put.yml index 76676521ae2ce..7868919dd6d1f 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/200_query_ruleset_put.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/200_query_ruleset_put.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/225_query_ruleset_list.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/225_query_ruleset_list.yml index 4d9022e04206b..0183dc8930d75 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/225_query_ruleset_list.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/225_query_ruleset_list.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: query_ruleset.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/250_query_ruleset_delete.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/250_query_ruleset_delete.yml index 7bd590b2c0acb..cfc847b33f665 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/250_query_ruleset_delete.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/250_query_ruleset_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: query_ruleset.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/260_rule_query_search.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/260_rule_query_search.yml index edd9d7c2e140d..688cf57a85b98 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/260_rule_query_search.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/260_rule_query_search.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: @@ -71,8 +71,8 @@ setup: --- "Perform a rule query specifying a ruleset that does not exist": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Bugfix that was broken in previous versions - do: @@ -91,8 +91,8 @@ setup: --- "Perform a rule query with malformed rule": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Bugfix that was broken in previous versions - do: @@ -276,8 +276,8 @@ setup: --- "Perform a rule query with an organic query that must be rewritten to another query type": - - skip: - version: " - 8.12.1" + - requires: + cluster_features: ["gte_v8.12.2"] reason: Bugfix that was broken in previous versions - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/300_connector_put.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/300_connector_put.yml index e3fad98fd90d4..878d81e095960 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/300_connector_put.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/300_connector_put.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/305_connector_post.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/305_connector_post.yml index 8eedc06a025d5..b724b50a726a8 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/305_connector_post.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/305_connector_post.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/310_connector_list.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/310_connector_list.yml index e7b30aeb281cf..10e4620ca5603 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/310_connector_list.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/310_connector_list.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/320_connector_delete.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/320_connector_delete.yml index c0603d0eefd1b..03eebb18ceefe 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/320_connector_delete.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/320_connector_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/330_connector_update_pipeline.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/330_connector_update_pipeline.yml index 8d0bfe0232932..e552030d3cc02 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/330_connector_update_pipeline.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/330_connector_update_pipeline.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/331_connector_update_scheduling.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/331_connector_update_scheduling.yml index dd74fa7e27c2f..ba76d64c25743 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/331_connector_update_scheduling.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/331_connector_update_scheduling.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/332_connector_update_filtering.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/332_connector_update_filtering.yml index abb43806ec793..ac102db163767 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/332_connector_update_filtering.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/332_connector_update_filtering.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/333_connector_check_in.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/333_connector_check_in.yml index 39b7b2d03e68f..02f4aa3643c12 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/333_connector_check_in.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/333_connector_check_in.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - features: is_after + test_runner_features: is_after - do: connector.put: connector_id: test-connector diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/334_connector_update_last_sync_stats.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/334_connector_update_last_sync_stats.yml index 08bde123541ac..235ac238a8563 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/334_connector_update_last_sync_stats.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/334_connector_update_last_sync_stats.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_configuration.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_configuration.yml index 418a3cf6de94a..e0a54962b1d5e 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_configuration.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_configuration.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_error.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_error.yml index 70021e3899525..5ca285677a95e 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_error.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_error.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/336_connector_update_name.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/336_connector_update_name.yml index bf1c7254b9b99..3f7c50a010ebf 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/336_connector_update_name.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/336_connector_update_name.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/337_connector_update_service_type.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/337_connector_update_service_type.yml index 53cef9f5067b7..9723d7628b5c6 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/337_connector_update_service_type.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/337_connector_update_service_type.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/338_connector_update_index_name.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/338_connector_update_index_name.yml index 9b2d46bc056dc..4ffa5435a3d7b 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/338_connector_update_index_name.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/338_connector_update_index_name.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/339_connector_update_native.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/339_connector_update_native.yml index 2cfed61272e91..77c57532ad479 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/339_connector_update_native.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/339_connector_update_native.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/340_connector_update_status.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/340_connector_update_status.yml index 8463a19919dd1..e5a8b17b6dd23 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/340_connector_update_status.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/340_connector_update_status.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/341_connector_update_api_key_id.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/341_connector_update_api_key_id.yml index 3d82c53acae50..524f474a83aa7 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/341_connector_update_api_key_id.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/341_connector_update_api_key_id.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/400_connector_sync_job_post.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/400_connector_sync_job_post.yml index 5b5177d83dd17..cb8b8d44b7311 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/400_connector_sync_job_post.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/400_connector_sync_job_post.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/410_connector_sync_job_delete.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/410_connector_sync_job_delete.yml index d75cd65e3e5bc..3b5a65ee3aa30 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/410_connector_sync_job_delete.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/410_connector_sync_job_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/420_connector_sync_job_check_in.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/420_connector_sync_job_check_in.yml index caa6543b6985a..3cada2facf689 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/420_connector_sync_job_check_in.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/420_connector_sync_job_check_in.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - features: is_after + test_runner_features: is_after - do: connector.put: connector_id: test-connector diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/430_connector_sync_job_cancel.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/430_connector_sync_job_cancel.yml index eea4ca197614d..b7c1560df751d 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/430_connector_sync_job_cancel.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/430_connector_sync_job_cancel.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/440_connector_sync_job_get.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/440_connector_sync_job_get.yml index 58b449a92c302..e42106ee1fa58 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/440_connector_sync_job_get.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/440_connector_sync_job_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/450_connector_sync_job_error.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/450_connector_sync_job_error.yml index 78cfdb845b10e..08751573bdd86 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/450_connector_sync_job_error.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/450_connector_sync_job_error.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/460_connector_sync_job_update_stats.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/460_connector_sync_job_update_stats.yml index 94572870f9164..3353e7a8dec25 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/460_connector_sync_job_update_stats.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/460_connector_sync_job_update_stats.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/470_connector_sync_job_list.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/470_connector_sync_job_list.yml index 82d9a18bb51e9..2d4ec3271413d 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/470_connector_sync_job_list.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/470_connector_sync_job_list.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml index 6a4ee3ba7f6cb..ed0f7b9309e08 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/505_connector_secret_put.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/505_connector_secret_put.yml index 1762e454b094d..54edeb0ab10a0 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/505_connector_secret_put.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/505_connector_secret_put.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml index 8fd676bb977b6..62b1b4176dc4d 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/520_connector_secret_delete.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/520_connector_secret_delete.yml index ed50fc55a81e0..04920673d6ad3 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/520_connector_secret_delete.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/520_connector_secret_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 --- diff --git a/x-pack/plugin/esql/build.gradle b/x-pack/plugin/esql/build.gradle index 86245e1c93e97..7705e34cadaa0 100644 --- a/x-pack/plugin/esql/build.gradle +++ b/x-pack/plugin/esql/build.gradle @@ -40,23 +40,10 @@ dependencies { internalClusterTestImplementation project(":modules:mapper-extras") } -/* - * IntelliJ will always put the java files generated by the annotation processor - * into src/main/java/generated so we make gradle play along. This block makes - * it put the generated files into the same spot and the next block stops it from - * trying to compile the generated files in the regular compile - it'll regenerate - * them and *then* compile them. - */ tasks.named("compileJava").configure { - options.compilerArgs.addAll(["-s", "${projectDir}/src/main/java/generated"]) -} - -tasks.named("javadoc").configure { - include("${projectDir}/src/main/java/generated") -} - -sourceSets.main.java { - exclude 'generated/**' + options.compilerArgs.addAll(["-s", "${projectDir}/src/main/generated"]) + // IntelliJ sticks generated files here and we can't stop it.... + exclude { it.file.toString().startsWith("${projectDir}/src/main/generated-src/generated") } } tasks.named("test").configure { @@ -149,7 +136,8 @@ pluginManager.withPlugin('com.diffplug.spotless') { // for some reason "${outputPath}/EsqlBaseParser*.java" does not match the same files... targetExclude "src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer*.java", "src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser*.java", - "src/main/java/generated/**/*.java" + "src/main/generated/**/*.java", + "src/main/generated-src/generated/**/*.java" } } } @@ -250,6 +238,8 @@ tasks.register("regen") { tasks.named("spotlessJava") { dependsOn stringTemplates } tasks.named('checkstyleMain').configure { excludes = [ "**/*.java.st" ] + exclude { it.file.toString().startsWith("${projectDir}/src/main/generated-src/generated") } + exclude { it.file.toString().startsWith("${projectDir}/src/main/generated") } } def prop(Type, type, TYPE, BYTES, Array) { diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java index 6b218fab7affb..1c28acfd6a23b 100644 --- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java +++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java @@ -41,6 +41,7 @@ public Set getSupportedAnnotationTypes() { "org.elasticsearch.xpack.esql.expression.function.Param", "org.elasticsearch.rest.ServerlessScope", "org.elasticsearch.xcontent.ParserConstructor", + "org.elasticsearch.core.UpdateForV9", Fixed.class.getName() ); } diff --git a/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java b/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java index 0446a11240f6f..5153d7a2a6d9d 100644 --- a/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java +++ b/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java @@ -10,6 +10,7 @@ import org.elasticsearch.Version; import org.elasticsearch.features.NodeFeature; import org.elasticsearch.test.cluster.ElasticsearchCluster; +import org.elasticsearch.test.rest.TestFeatureService; import org.elasticsearch.xpack.esql.qa.rest.EsqlSpecTestCase; import org.elasticsearch.xpack.ql.CsvSpecReader.CsvTestCase; import org.junit.AfterClass; @@ -17,8 +18,6 @@ import org.junit.ClassRule; import java.io.IOException; -import java.util.HashSet; -import java.util.Set; import static org.elasticsearch.xpack.esql.CsvTestUtils.isEnabled; import static org.elasticsearch.xpack.esql.qa.rest.EsqlSpecTestCase.Mode.ASYNC; @@ -34,20 +33,18 @@ protected String getTestRestCluster() { static final Version bwcVersion = Version.fromString(System.getProperty("tests.old_cluster_version")); - private static final Set oldClusterFeatures = new HashSet<>(); - private static boolean oldClusterFeaturesInitialized = false; + private static TestFeatureService oldClusterTestFeatureService = null; @Before public void extractOldClusterFeatures() { - if (oldClusterFeaturesInitialized == false) { - oldClusterFeatures.addAll(testFeatureService.getAllSupportedFeatures()); - oldClusterFeaturesInitialized = true; + if (oldClusterTestFeatureService == null) { + oldClusterTestFeatureService = testFeatureService; } } protected static boolean oldClusterHasFeature(String featureId) { - assert oldClusterFeaturesInitialized; - return oldClusterFeatures.contains(featureId); + assert oldClusterTestFeatureService != null; + return oldClusterTestFeatureService.clusterHasFeature(featureId); } protected static boolean oldClusterHasFeature(NodeFeature feature) { @@ -56,8 +53,7 @@ protected static boolean oldClusterHasFeature(NodeFeature feature) { @AfterClass public static void cleanUp() { - oldClusterFeaturesInitialized = false; - oldClusterFeatures.clear(); + oldClusterTestFeatureService = null; } public MixedClusterEsqlSpecIT(String fileName, String groupName, String testName, Integer lineNumber, CsvTestCase testCase, Mode mode) { diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/meta.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/meta.csv-spec index cb448dca55596..4c7feb9416e13 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/meta.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/meta.csv-spec @@ -57,7 +57,7 @@ double pi() "double pow(base:double|integer|long|unsigned_long, exponent:double|integer|long|unsigned_long)" "keyword replace(string:keyword|text, regex:keyword|text, newString:keyword|text)" "keyword right(string:keyword|text, length:integer)" -"double round(number:double, ?decimals:integer)" +"double|integer|long|unsigned_long round(number:double|integer|long|unsigned_long, ?decimals:integer)" "keyword|text rtrim(string:keyword|text)" "double signum(number:double|integer|long|unsigned_long)" "double sin(angle:double|integer|long|unsigned_long)" @@ -135,7 +135,7 @@ date_parse |[datePattern, dateString] |["keyword|text", "keyword|te date_trunc |[interval, date] |["date_period|time_duration", date] |[Interval; expressed using the timespan literal syntax., Date expression] e |null |null |null ends_with |[str, suffix] |["keyword|text", "keyword|text"] |[, ] -floor |number |"double|integer|long|unsigned_long" |[""] +floor |number |"double|integer|long|unsigned_long" |Numeric expression. If `null`, the function returns `null`. greatest |first |"integer|long|double|boolean|keyword|text|ip|version" |[""] least |first |"integer|long|double|boolean|keyword|text|ip|version" |[""] left |[string, length] |["keyword|text", integer] |[The string from which to return a substring., The number of characters to return.] @@ -164,10 +164,10 @@ mv_zip |[string1, string2, delim] |["keyword|text", "keyword|te now |null |null |null percentile |[number, percentile] |["double|integer|long", "double|integer|long"] |[, ] pi |null |null |null -pow |[base, exponent] |["double|integer|long|unsigned_long", "double|integer|long|unsigned_long"] |[, ] +pow |[base, exponent] |["double|integer|long|unsigned_long", "double|integer|long|unsigned_long"] |["Numeric expression for the base. If `null`\, the function returns `null`.", "Numeric expression for the exponent. If `null`\, the function returns `null`."] replace |[string, regex, newString] |["keyword|text", "keyword|text", "keyword|text"] |[, , ] right |[string, length] |["keyword|text", integer] |[, ] -round |[number, decimals] |[double, integer] |[The numeric value to round, The number of decimal places to round to. Defaults to 0.] +round |[number, decimals] |["double|integer|long|unsigned_long", integer] |["The numeric value to round. If `null`\, the function returns `null`.", "The number of decimal places to round to. Defaults to 0. If `null`\, the function returns `null`."] rtrim |string |"keyword|text" |[""] signum |number |"double|integer|long|unsigned_long" |"Numeric expression. If `null`, the function returns `null`." sin |angle |"double|integer|long|unsigned_long" |An angle, in radians. If `null`, the function returns `null`. @@ -244,7 +244,7 @@ date_extract |Extracts parts of a date, like year, month, day, hour. date_format |Returns a string representation of a date, in the provided format. date_parse |Parses a string into a date value date_trunc |Rounds down a date to the closest interval. -e |Euler’s number. +e |Returns {wikipedia}/E_(mathematical_constant)[Euler's number]. ends_with |Returns a boolean that indicates whether a keyword string ends with another string floor |Round a number down to the nearest integer. greatest |Returns the maximum value from many columns. @@ -274,11 +274,11 @@ mv_sum |Converts a multivalued field into a single valued field containin mv_zip |Combines the values from two multivalued fields with a delimiter that joins them together. now |Returns current date and time. percentile |The value at which a certain percentage of observed values occur. -pi |The ratio of a circle’s circumference to its diameter. -pow |Returns the value of a base raised to the power of an exponent. +pi |Returns {wikipedia}/Pi[Pi], the ratio of a circle's circumference to its diameter. +pow |Returns the value of `base` raised to the power of `exponent`. replace |The function substitutes in the string any match of the regular expression with the replacement string. right |Return the substring that extracts length chars from the string starting from the right. -round |Rounds a number to the closest number with the specified number of digits. +round |Rounds a number to the specified number of decimal places. Defaults to 0, which returns the nearest integer. If the precision is a negative number, rounds to the number of digits left of the decimal point. rtrim |Removes trailing whitespaces from a string. signum |Returns the sign of the given number. It returns `-1` for negative numbers, `0` for `0` and `1` for positive numbers. sin |Returns ths {wikipedia}/Sine_and_cosine[Sine] trigonometric function of an angle. @@ -390,7 +390,7 @@ pi |double pow |double |[false, false] |false |false replace |keyword |[false, false, false] |false |false right |keyword |[false, false] |false |false -round |double |[false, true] |false |false +round |"double|integer|long|unsigned_long" |[false, true] |false |false rtrim |"keyword|text" |false |false |false signum |double |false |false |false sin |double |false |false |false diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsBoolsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsBoolsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsBoolsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsBoolsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsGeometriesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsGeometriesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsGeometriesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsGeometriesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsKeywordsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsKeywordsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsKeywordsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsKeywordsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EqualsLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanKeywordsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanKeywordsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanKeywordsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanKeywordsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualKeywordsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualKeywordsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualKeywordsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualKeywordsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/GreaterThanOrEqualLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/InsensitiveEqualsConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/InsensitiveEqualsConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/InsensitiveEqualsConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/InsensitiveEqualsConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/InsensitiveEqualsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/InsensitiveEqualsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/InsensitiveEqualsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/InsensitiveEqualsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanKeywordsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanKeywordsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanKeywordsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanKeywordsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualKeywordsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualKeywordsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualKeywordsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualKeywordsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/LessThanOrEqualLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsBoolsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsBoolsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsBoolsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsBoolsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsGeometriesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsGeometriesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsGeometriesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsGeometriesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsKeywordsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsKeywordsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsKeywordsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsKeywordsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/comparison/NotEqualsLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/logical/NotEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/logical/NotEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/logical/NotEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/evaluator/predicate/operator/logical/NotEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestBytesRefEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestBytesRefEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestBytesRefEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestBytesRefEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/GreatestLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastBytesRefEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastBytesRefEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastBytesRefEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastBytesRefEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/LeastLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToBooleanFromUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToCartesianPointFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToCartesianPointFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToCartesianPointFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToCartesianPointFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToCartesianShapeFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToCartesianShapeFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToCartesianShapeFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToCartesianShapeFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatetimeFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatetimeFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatetimeFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatetimeFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDegreesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDegreesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDegreesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDegreesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDoubleFromUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoPointFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoPointFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoPointFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoPointFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToGeoShapeFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIPFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIPFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIPFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIPFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToIntegerFromUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToLongFromUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToRadiansEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToRadiansEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToRadiansEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToRadiansEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromCartesianPointEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromCartesianPointEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromCartesianPointEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromCartesianPointEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromCartesianShapeEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromCartesianShapeEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromCartesianShapeEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromCartesianShapeEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromDatetimeEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromDatetimeEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromDatetimeEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromDatetimeEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromGeoPointEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromGeoPointEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromGeoPointEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromGeoPointEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromGeoShapeEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromGeoShapeEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromGeoShapeEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromGeoShapeEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromIPEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromIPEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromIPEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromIPEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromVersionEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromVersionEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromVersionEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToStringFromVersionEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToUnsignedLongFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToVersionFromStringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToVersionFromStringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToVersionFromStringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToVersionFromStringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateDiffConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateDiffConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateDiffConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateDiffConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateDiffEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateDiffEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateDiffEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateDiffEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateParseConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateParseConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateParseConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateParseConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateParseEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateParseEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateParseEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateParseEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateTruncEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateTruncEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateTruncEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateTruncEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/NowEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/NowEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/NowEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/NowEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/ip/CIDRMatchEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/ip/CIDRMatchEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/ip/CIDRMatchEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/ip/CIDRMatchEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AbsLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AcosEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AcosEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AcosEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AcosEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AsinEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AsinEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AsinEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AsinEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Atan2Evaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Atan2Evaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Atan2Evaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Atan2Evaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AtanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AtanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AtanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/AtanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastIntToUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastLongToDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastLongToDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastLongToDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastLongToDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastLongToUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastLongToUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastLongToUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastLongToUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastUnsignedLongToDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastUnsignedLongToDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastUnsignedLongToDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CastUnsignedLongToDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CeilDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CeilDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CeilDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CeilDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CosEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CosEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CosEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CosEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CoshEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CoshEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CoshEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/CoshEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/FloorDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/FloorDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/FloorDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/FloorDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10DoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10DoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10DoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10DoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10IntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10IntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10IntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10IntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10LongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10LongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10LongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10LongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10UnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10UnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10UnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/Log10UnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/LogConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/LogConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/LogConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/LogConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/LogEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/LogEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/LogEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/LogEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/PowEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/PowEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/PowEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/PowEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundDoubleNoDecimalsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundDoubleNoDecimalsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundDoubleNoDecimalsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundDoubleNoDecimalsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SignumUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SinEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SinEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SinEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SinEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SinhEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SinhEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SinhEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SinhEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/SqrtUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/TanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/TanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/TanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/TanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/TanhEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/TanhEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/TanhEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/math/TanhEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvAvgUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstBytesRefEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstBytesRefEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstBytesRefEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstBytesRefEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvFirstLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastBytesRefEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastBytesRefEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastBytesRefEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastBytesRefEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvLastLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxBytesRefEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxBytesRefEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxBytesRefEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxBytesRefEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMaxLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinBytesRefEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinBytesRefEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinBytesRefEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinBytesRefEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMinLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceBooleanEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceBooleanEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceBooleanEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceBooleanEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceBytesRefEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceBytesRefEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceBytesRefEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceBytesRefEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSliceLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumDoubleEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumDoubleEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumDoubleEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumIntEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumIntEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumIntEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumUnsignedLongEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumUnsignedLongEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvSumUnsignedLongEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvZipEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvZipEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvZipEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvZipEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianPointDocValuesAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianPointDocValuesAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianPointDocValuesAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianPointDocValuesAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianPointDocValuesAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianPointDocValuesAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianPointDocValuesAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianPointDocValuesAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianSourceAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianSourceAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianSourceAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianSourceAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianSourceAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianSourceAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianSourceAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsCartesianSourceAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoPointDocValuesAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoPointDocValuesAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoPointDocValuesAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoPointDocValuesAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoPointDocValuesAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoPointDocValuesAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoPointDocValuesAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoPointDocValuesAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoSourceAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoSourceAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoSourceAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoSourceAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoSourceAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoSourceAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoSourceAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialContainsGeoSourceAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianPointDocValuesAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianPointDocValuesAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianPointDocValuesAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianPointDocValuesAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianPointDocValuesAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianPointDocValuesAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianPointDocValuesAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianPointDocValuesAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianSourceAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianSourceAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianSourceAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianSourceAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianSourceAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianSourceAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianSourceAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointCartesianSourceAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoPointDocValuesAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialDisjointGeoSourceAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianPointDocValuesAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianPointDocValuesAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianPointDocValuesAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianPointDocValuesAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianPointDocValuesAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianPointDocValuesAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianPointDocValuesAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianPointDocValuesAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianSourceAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianSourceAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianSourceAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianSourceAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianSourceAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianSourceAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianSourceAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsCartesianSourceAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoPointDocValuesAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoPointDocValuesAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoPointDocValuesAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoPointDocValuesAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoPointDocValuesAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoPointDocValuesAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoPointDocValuesAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoPointDocValuesAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoSourceAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoSourceAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoSourceAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoSourceAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoSourceAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoSourceAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoSourceAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialIntersectsGeoSourceAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianPointDocValuesAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianPointDocValuesAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianPointDocValuesAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianPointDocValuesAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianPointDocValuesAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianPointDocValuesAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianPointDocValuesAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianPointDocValuesAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianSourceAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianSourceAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianSourceAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianSourceAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianSourceAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianSourceAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianSourceAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinCartesianSourceAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoPointDocValuesAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoPointDocValuesAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoPointDocValuesAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoPointDocValuesAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoPointDocValuesAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoPointDocValuesAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoPointDocValuesAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoPointDocValuesAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoSourceAndConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoSourceAndConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoSourceAndConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoSourceAndConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoSourceAndSourceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoSourceAndSourceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoSourceAndSourceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/SpatialWithinGeoSourceAndSourceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StXFromWKBEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StXFromWKBEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StXFromWKBEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StXFromWKBEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StYFromWKBEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StYFromWKBEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StYFromWKBEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/StYFromWKBEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/AutomataMatchEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/AutomataMatchEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/AutomataMatchEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/AutomataMatchEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ConcatEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ConcatEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ConcatEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ConcatEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/EndsWithEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/EndsWithEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/EndsWithEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/EndsWithEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LTrimEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LTrimEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LTrimEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LTrimEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LeftEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LeftEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LeftEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LeftEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LengthEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LengthEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LengthEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LengthEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LocateEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LocateEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LocateEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LocateEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LocateNoStartEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LocateNoStartEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LocateNoStartEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/LocateNoStartEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/RTrimEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/RTrimEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/RTrimEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/RTrimEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ReplaceConstantEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ReplaceConstantEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ReplaceConstantEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ReplaceConstantEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ReplaceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ReplaceEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ReplaceEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ReplaceEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/RightEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/RightEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/RightEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/RightEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SplitSingleByteEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SplitSingleByteEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SplitSingleByteEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SplitSingleByteEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SplitVariableEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SplitVariableEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SplitVariableEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SplitVariableEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/StartsWithEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/StartsWithEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/StartsWithEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/StartsWithEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SubstringEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SubstringEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SubstringEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SubstringEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SubstringNoLengthEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SubstringNoLengthEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SubstringNoLengthEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SubstringNoLengthEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLowerEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLowerEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLowerEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLowerEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToUpperEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToUpperEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToUpperEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToUpperEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/TrimEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/TrimEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/TrimEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/TrimEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddDatetimesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddDatetimesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddDatetimesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddDatetimesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddUnsignedLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddUnsignedLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddUnsignedLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/AddUnsignedLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivUnsignedLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivUnsignedLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivUnsignedLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DivUnsignedLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModUnsignedLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModUnsignedLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModUnsignedLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/ModUnsignedLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulUnsignedLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulUnsignedLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulUnsignedLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/MulUnsignedLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/NegLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubDatetimesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubDatetimesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubDatetimesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubDatetimesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubDoublesEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubDoublesEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubDoublesEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubDoublesEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubIntsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubIntsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubIntsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubIntsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubUnsignedLongsEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubUnsignedLongsEvaluator.java similarity index 100% rename from x-pack/plugin/esql/src/main/java/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubUnsignedLongsEvaluator.java rename to x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/SubUnsignedLongsEvaluator.java diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/E.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/E.java index 3497a945f1562..f68283d356e8d 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/E.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/E.java @@ -7,6 +7,7 @@ package org.elasticsearch.xpack.esql.expression.function.scalar.math; +import org.elasticsearch.xpack.esql.expression.function.Example; import org.elasticsearch.xpack.esql.expression.function.FunctionInfo; import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.tree.Source; @@ -17,7 +18,11 @@ * Function that emits Euler's number. */ public class E extends DoubleConstantFunction { - @FunctionInfo(returnType = "double", description = "Euler’s number.") + @FunctionInfo( + returnType = "double", + description = "Returns {wikipedia}/E_(mathematical_constant)[Euler's number].", + examples = @Example(file = "math", tag = "e") + ) public E(Source source) { super(source); } diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Floor.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Floor.java index d4d71bb59ec77..224d037816ee8 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Floor.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Floor.java @@ -9,6 +9,7 @@ import org.elasticsearch.compute.ann.Evaluator; import org.elasticsearch.compute.operator.EvalOperator.ExpressionEvaluator; +import org.elasticsearch.xpack.esql.expression.function.Example; import org.elasticsearch.xpack.esql.expression.function.FunctionInfo; import org.elasticsearch.xpack.esql.expression.function.Param; import org.elasticsearch.xpack.esql.expression.function.scalar.UnaryScalarFunction; @@ -32,9 +33,21 @@ public class Floor extends UnaryScalarFunction { @FunctionInfo( returnType = { "double", "integer", "long", "unsigned_long" }, - description = "Round a number down to the nearest integer." + description = "Round a number down to the nearest integer.", + note = """ + This is a noop for `long` (including unsigned) and `integer`. + For `double` this picks the closest `double` value to the integer + similar to {javadoc}/java.base/java/lang/Math.html#floor(double)[Math.floor].""", + examples = @Example(file = "math", tag = "floor") ) - public Floor(Source source, @Param(name = "number", type = { "double", "integer", "long", "unsigned_long" }) Expression n) { + public Floor( + Source source, + @Param( + name = "number", + type = { "double", "integer", "long", "unsigned_long" }, + description = "Numeric expression. If `null`, the function returns `null`." + ) Expression n + ) { super(source, n); } diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Pi.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Pi.java index a58bffd1dcbad..e7ba8def13f86 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Pi.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Pi.java @@ -7,6 +7,7 @@ package org.elasticsearch.xpack.esql.expression.function.scalar.math; +import org.elasticsearch.xpack.esql.expression.function.Example; import org.elasticsearch.xpack.esql.expression.function.FunctionInfo; import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.tree.Source; @@ -18,7 +19,11 @@ */ public class Pi extends DoubleConstantFunction { - @FunctionInfo(returnType = "double", description = "The ratio of a circle’s circumference to its diameter.") + @FunctionInfo( + returnType = "double", + description = "Returns {wikipedia}/Pi[Pi], the ratio of a circle's circumference to its diameter.", + examples = @Example(file = "math", tag = "pi") + ) public Pi(Source source) { super(source); } diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Pow.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Pow.java index 0f9acaffb1c4a..8eb7a4dd497a8 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Pow.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Pow.java @@ -9,6 +9,7 @@ import org.elasticsearch.compute.ann.Evaluator; import org.elasticsearch.compute.operator.EvalOperator.ExpressionEvaluator; +import org.elasticsearch.xpack.esql.expression.function.Example; import org.elasticsearch.xpack.esql.expression.function.FunctionInfo; import org.elasticsearch.xpack.esql.expression.function.Param; import org.elasticsearch.xpack.esql.expression.function.scalar.EsqlScalarFunction; @@ -34,11 +35,26 @@ public class Pow extends EsqlScalarFunction implements OptionalArgument { private final Expression base, exponent; private final DataType dataType; - @FunctionInfo(returnType = "double", description = "Returns the value of a base raised to the power of an exponent.") + @FunctionInfo( + returnType = "double", + description = "Returns the value of `base` raised to the power of `exponent`.", + note = "It is still possible to overflow a double result here; in that case, null will be returned.", + examples = { @Example(file = "math", tag = "powDI"), @Example(file = "math", tag = "powID-sqrt", description = """ + The exponent can be a fraction, which is similar to performing a root. + For example, the exponent of `0.5` will give the square root of the base:"""), } + ) public Pow( Source source, - @Param(name = "base", type = { "double", "integer", "long", "unsigned_long" }) Expression base, - @Param(name = "exponent", type = { "double", "integer", "long", "unsigned_long" }) Expression exponent + @Param( + name = "base", + type = { "double", "integer", "long", "unsigned_long" }, + description = "Numeric expression for the base. If `null`, the function returns `null`." + ) Expression base, + @Param( + name = "exponent", + type = { "double", "integer", "long", "unsigned_long" }, + description = "Numeric expression for the exponent. If `null`, the function returns `null`." + ) Expression exponent ) { super(source, Arrays.asList(base, exponent)); this.base = base; diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Round.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Round.java index 2edb1c7c3a159..adef1bb128403 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Round.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Round.java @@ -11,6 +11,7 @@ import org.elasticsearch.compute.ann.Evaluator; import org.elasticsearch.compute.operator.EvalOperator.ExpressionEvaluator; import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException; +import org.elasticsearch.xpack.esql.expression.function.Example; import org.elasticsearch.xpack.esql.expression.function.FunctionInfo; import org.elasticsearch.xpack.esql.expression.function.Param; import org.elasticsearch.xpack.esql.expression.function.scalar.EsqlScalarFunction; @@ -44,15 +45,23 @@ public class Round extends EsqlScalarFunction implements OptionalArgument { private final Expression field, decimals; // @TODO: add support for "integer", "long", "unsigned_long" once tests are fixed - @FunctionInfo(returnType = "double", description = "Rounds a number to the closest number with the specified number of digits.") + @FunctionInfo(returnType = { "double", "integer", "long", "unsigned_long" }, description = """ + Rounds a number to the specified number of decimal places. + Defaults to 0, which returns the nearest integer. If the + precision is a negative number, rounds to the number of digits left + of the decimal point.""", examples = @Example(file = "docs", tag = "round")) public Round( Source source, - @Param(name = "number", type = "double", description = "The numeric value to round") Expression field, + @Param( + name = "number", + type = { "double", "integer", "long", "unsigned_long" }, + description = "The numeric value to round. If `null`, the function returns `null`." + ) Expression field, @Param( optional = true, name = "decimals", - type = { "integer" }, - description = "The number of decimal places to round to. Defaults to 0." + type = { "integer" }, // TODO long is supported here too + description = "The number of decimal places to round to. Defaults to 0. If `null`, the function returns `null`." ) Expression decimals ) { super(source, decimals != null ? Arrays.asList(field, decimals) : Arrays.asList(field)); diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/version/EsqlVersion.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/version/EsqlVersion.java index 9e3c43491e1e8..23f6ab6da5f16 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/version/EsqlVersion.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/version/EsqlVersion.java @@ -9,12 +9,51 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.VersionId; +import org.elasticsearch.core.UpdateForV9; +import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvAvg; import java.util.Arrays; import java.util.Comparator; import java.util.LinkedHashMap; import java.util.Map; +/** + * The version of the ESQL language being processed. + *

+ * ESQL is a young language and we don't have the benefit of self-hosting + * its compiler. So we're going to make a lot of mistakes when designing it. + * As such, we expect it to change in backwards incompatible ways several + * times in 2024 and 2025. Hopefully we'll have learned our lesson and we'll + * settle down to one change every couple of years after that. + *

+ *

+ * For example, maybe we realize we've made a mistake with the {@link MvAvg} + * function and decide it should return the type of its input field rather + * than always returning a {@code double}. If we decide to make this change + * we'd have to bump the language version. We plan to batch changes like this + * into the {@link EsqlVersion#SNAPSHOT} version for a while and from time to + * time release them as a new version. + *

+ *

+ * We require a version to be sent on every request to the ESQL APIs so + * changing the version of a query is always opt-in. There is no REST request + * you can send to any ESQL endpoint that will default to a version of ESQL. + * That means we can release new versions of ESQL in a minor release of + * Elasticsearch. We can and we will. + *

+ *

+ * So users of Elasticsearch's clients don't need to think about the version + * of ESQL when they are getting started they we have a concept of "base version". + * This "base version" will remain constant for an entire major release of + * Elasticsearch and clients will send that version with ESQL requests unless + * otherwise configured. + *

+ *

+ * This is marked with {@link UpdateForV9} to remind us that we need to + * update the "base version" of ESQL in the client specification when + * we cut a new major. We'll need to do that on every major - and also bump the {@link UpdateForV9} annotation. + *

+ */ public enum EsqlVersion implements VersionId { /** * Breaking changes go here until the next version is released. diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java index 4450773ef6139..b2d00a98dfa6c 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java @@ -1111,6 +1111,9 @@ private static void renderTypes(List argNames) throws IOException { table.add(b.toString()); } Collections.sort(table); + if (table.isEmpty()) { + table.add(signatures.values().iterator().next().typeName()); + } String rendered = DOCS_WARNING + """ *Supported types* @@ -1211,7 +1214,7 @@ private static void renderKibanaInlineDocs(String name, FunctionInfo info) throw """); builder.append("### ").append(name.toUpperCase(Locale.ROOT)).append("\n"); - builder.append(info.description()).append("\n\n"); + builder.append(removeAsciidocLinks(info.description())).append("\n\n"); if (info.examples().length > 0) { Example example = info.examples()[0]; @@ -1220,7 +1223,7 @@ private static void renderKibanaInlineDocs(String name, FunctionInfo info) throw builder.append("```\n"); } if (Strings.isNullOrEmpty(info.note()) == false) { - builder.append("Note: ").append(info.note()).append("\n"); + builder.append("Note: ").append(removeAsciidocLinks(info.note())).append("\n"); } String rendered = builder.toString(); LogManager.getLogger(getTestClass()).info("Writing kibana inline docs for [{}]:\n{}", functionName(), rendered); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/ETests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/ETests.java index d055eac087808..0b786eabc1ad6 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/ETests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/ETests.java @@ -12,11 +12,10 @@ import org.elasticsearch.compute.data.Block; import org.elasticsearch.compute.data.DoubleBlock; +import org.elasticsearch.xpack.esql.expression.function.AbstractFunctionTestCase; import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; -import org.elasticsearch.xpack.esql.expression.function.scalar.AbstractScalarFunctionTestCase; import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.tree.Source; -import org.elasticsearch.xpack.ql.type.DataType; import org.elasticsearch.xpack.ql.type.DataTypes; import org.hamcrest.Matcher; @@ -25,7 +24,7 @@ import static org.hamcrest.Matchers.equalTo; -public class ETests extends AbstractScalarFunctionTestCase { +public class ETests extends AbstractFunctionTestCase { public ETests(@Name("TestCase") Supplier testCaseSupplier) { this.testCase = testCaseSupplier.get(); } @@ -47,16 +46,6 @@ protected Expression build(Source source, List args) { return new E(Source.EMPTY); } - @Override - protected List argSpec() { - return List.of(); - } - - @Override - protected DataType expectedType(List argTypes) { - return DataTypes.DOUBLE; - } - @Override protected void assertSimpleWithNulls(List data, Block value, int nullBlock) { assertThat(((DoubleBlock) value).asVector().getDouble(0), equalTo(Math.E)); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/PiTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/PiTests.java index c04c1271f89e7..faa860536e001 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/PiTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/PiTests.java @@ -12,11 +12,10 @@ import org.elasticsearch.compute.data.Block; import org.elasticsearch.compute.data.DoubleBlock; +import org.elasticsearch.xpack.esql.expression.function.AbstractFunctionTestCase; import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; -import org.elasticsearch.xpack.esql.expression.function.scalar.AbstractScalarFunctionTestCase; import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.tree.Source; -import org.elasticsearch.xpack.ql.type.DataType; import org.elasticsearch.xpack.ql.type.DataTypes; import org.hamcrest.Matcher; @@ -25,7 +24,7 @@ import static org.hamcrest.Matchers.equalTo; -public class PiTests extends AbstractScalarFunctionTestCase { +public class PiTests extends AbstractFunctionTestCase { public PiTests(@Name("TestCase") Supplier testCaseSupplier) { this.testCase = testCaseSupplier.get(); } @@ -47,16 +46,6 @@ protected Expression build(Source source, List args) { return new Pi(Source.EMPTY); } - @Override - protected List argSpec() { - return List.of(); - } - - @Override - protected DataType expectedType(List argTypes) { - return DataTypes.DOUBLE; - } - @Override protected void assertSimpleWithNulls(List data, Block value, int nullBlock) { assertThat(((DoubleBlock) value).asVector().getDouble(0), equalTo(Math.PI)); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundTests.java index 6bf816ce4c734..30460828aaa91 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/RoundTests.java @@ -10,154 +10,215 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.compute.data.Block; +import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.xpack.esql.expression.function.AbstractFunctionTestCase; import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier; -import org.elasticsearch.xpack.esql.expression.function.scalar.AbstractScalarFunctionTestCase; import org.elasticsearch.xpack.ql.expression.Expression; import org.elasticsearch.xpack.ql.expression.predicate.operator.math.Maths; import org.elasticsearch.xpack.ql.tree.Source; import org.elasticsearch.xpack.ql.type.DataType; import org.elasticsearch.xpack.ql.type.DataTypes; +import org.elasticsearch.xpack.ql.util.NumericUtils; +import java.util.ArrayList; import java.util.List; +import java.util.function.BiFunction; +import java.util.function.Function; import java.util.function.Supplier; -import static org.elasticsearch.compute.data.BlockUtils.toJavaObject; +import static org.elasticsearch.test.ESTestCase.randomDouble; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class RoundTests extends AbstractScalarFunctionTestCase { +public class RoundTests extends AbstractFunctionTestCase { public RoundTests(@Name("TestCase") Supplier testCaseSupplier) { this.testCase = testCaseSupplier.get(); } @ParametersFactory public static Iterable parameters() { - return parameterSuppliersFromTypedData(List.of(new TestCaseSupplier("round(, )", () -> { - double number = 1 / randomDouble(); - int precision = between(-30, 30); - return new TestCaseSupplier.TestCase( - List.of( - new TestCaseSupplier.TypedData(number, DataTypes.DOUBLE, "number"), - new TestCaseSupplier.TypedData(precision, DataTypes.INTEGER, "precision") - ), - "RoundDoubleEvaluator[val=Attribute[channel=0], decimals=CastIntToLongEvaluator[v=Attribute[channel=1]]]", + List suppliers = new ArrayList<>(); + suppliers.add( + supplier( + "", DataTypes.DOUBLE, - equalTo(Maths.round(number, precision)) - ); - }), new TestCaseSupplier("round([], )", () -> { - double number = 1 / randomDouble(); - int precision = between(-30, 30); - return new TestCaseSupplier.TestCase( - List.of( - new TestCaseSupplier.TypedData(List.of(number), DataTypes.DOUBLE, "number"), - new TestCaseSupplier.TypedData(precision, DataTypes.INTEGER, "precision") - ), - "RoundDoubleEvaluator[val=Attribute[channel=0], decimals=CastIntToLongEvaluator[v=Attribute[channel=1]]]", + () -> 1 / randomDouble(), + "RoundDoubleNoDecimalsEvaluator[val=Attribute[channel=0]]", + d -> Maths.round(d, 0) + ) + ); + suppliers.add( + supplier( + ", ", DataTypes.DOUBLE, - equalTo(Maths.round(number, precision)) - ); - }), new TestCaseSupplier("round([], )", () -> { + () -> 1 / randomDouble(), + DataTypes.INTEGER, + () -> between(-30, 30), + "RoundDoubleEvaluator[val=Attribute[channel=0], decimals=CastIntToLongEvaluator[v=Attribute[channel=1]]]", + Maths::round + ) + ); + // TODO randomized cases for more types + // TODO errorsForCasesWithoutExamples + suppliers = anyNullIsNull( + suppliers, + (nullPosition, nullValueDataType, original) -> nullPosition == 0 ? nullValueDataType : original.expectedType(), + (nullPosition, original) -> original + ); + + suppliers.add(new TestCaseSupplier("two doubles", List.of(DataTypes.DOUBLE, DataTypes.INTEGER), () -> { double number1 = 1 / randomDouble(); double number2 = 1 / randomDouble(); int precision = between(-30, 30); return new TestCaseSupplier.TestCase( List.of( new TestCaseSupplier.TypedData(List.of(number1, number2), DataTypes.DOUBLE, "number"), - new TestCaseSupplier.TypedData(precision, DataTypes.INTEGER, "precision") + new TestCaseSupplier.TypedData(precision, DataTypes.INTEGER, "decimals") ), "RoundDoubleEvaluator[val=Attribute[channel=0], decimals=CastIntToLongEvaluator[v=Attribute[channel=1]]]", DataTypes.DOUBLE, is(nullValue()) ).withWarning("Line -1:-1: evaluation of [] failed, treating result as null. Only first 20 failures recorded.") .withWarning("Line -1:-1: java.lang.IllegalArgumentException: single-value function encountered multi-value"); - }))); - } + })); - public void testExamples() { - assertEquals(123, process(123)); - assertEquals(123, process(123, randomIntBetween(0, 1024))); - assertEquals(120, process(123, -1)); - assertEquals(123.5, process(123.45, 1)); - assertEquals(123.0, process(123.45, 0)); - assertEquals(123.0, process(123.45)); - assertEquals(123L, process(123L, 0)); - assertEquals(123L, process(123L, 5)); - assertEquals(120L, process(123L, -1)); - assertEquals(100L, process(123L, -2)); - assertEquals(0L, process(123L, -3)); - assertEquals(0L, process(123L, -100)); - assertEquals(1000L, process(999L, -1)); - assertEquals(1000.0, process(999.0, -1)); - assertEquals(130L, process(125L, -1)); - assertEquals(12400L, process(12350L, -2)); - assertEquals(12400.0, process(12350.0, -2)); - assertEquals(12300.0, process(12349.0, -2)); - assertEquals(-12300L, process(-12349L, -2)); - assertEquals(-12400L, process(-12350L, -2)); - assertEquals(-12400.0, process(-12350.0, -2)); - assertEquals(-100L, process(-123L, -2)); - assertEquals(-120.0, process(-123.45, -1)); - assertEquals(-123.5, process(-123.45, 1)); - assertEquals(-124.0, process(-123.5, 0)); - assertEquals(-123.0, process(-123.45)); - assertEquals(123.456, process(123.456, Integer.MAX_VALUE)); - assertEquals(0.0, process(123.456, Integer.MIN_VALUE)); - assertEquals(0L, process(0L, 0)); - assertEquals(0, process(0, 0)); - assertEquals(Long.MAX_VALUE, process(Long.MAX_VALUE)); - assertEquals(Long.MAX_VALUE, process(Long.MAX_VALUE, 5)); - assertEquals(Long.MIN_VALUE, process(Long.MIN_VALUE)); - assertEquals(Long.MIN_VALUE, process(Long.MIN_VALUE, 5)); - } + // Integer or Long without a decimals parameter is a noop + suppliers.add(supplier("", DataTypes.INTEGER, ESTestCase::randomInt, "Attribute[channel=0]", Function.identity())); + suppliers.add(supplier("", DataTypes.LONG, ESTestCase::randomLong, "Attribute[channel=0]", Function.identity())); + suppliers.add( + supplier( + "", + DataTypes.UNSIGNED_LONG, + ESTestCase::randomLong, + "Attribute[channel=0]", + NumericUtils::unsignedLongAsBigInteger + ) + ); + + suppliers.add(supplier(0, 0)); + suppliers.add(supplier(123.45, 123)); + suppliers.add(supplier(0, 0, 0)); + suppliers.add(supplier(123.45, 0, 123)); + suppliers.add(supplier(123.45, 1, 123.5)); + suppliers.add(supplier(999.0, -1, 1000.0)); + suppliers.add(supplier(12350.0, -2, 12400.0)); + suppliers.add(supplier(12349.0, -2, 12300.0)); + suppliers.add(supplier(-12350.0, -2, -12400.0)); + suppliers.add(supplier(-123.45, -1, -120.0)); + suppliers.add(supplier(-123.45, 1, -123.5)); + suppliers.add(supplier(-123.5, 0, -124.0)); + suppliers.add(supplier(-123.45, -123.0)); + suppliers.add(supplier(123.456, Integer.MAX_VALUE, 123.456)); + suppliers.add(supplier(123.456, Integer.MIN_VALUE, 0.0)); - private Object process(Number val) { - try ( - Block block = evaluator(new Round(Source.EMPTY, field("val", typeOf(val)), null)).get(driverContext()).eval(row(List.of(val))) - ) { - return toJavaObject(block, 0); - } + suppliers.add(supplier(123L, 0, 123)); + suppliers.add(supplier(123L, 5, 123)); + suppliers.add(supplier(123L, -1, 120)); + suppliers.add(supplier(123L, -2, 100)); + suppliers.add(supplier(123L, -3, 0)); + suppliers.add(supplier(123L, -100, 0)); + suppliers.add(supplier(999L, -1, 1000)); + suppliers.add(supplier(-123L, -2, -100)); + suppliers.add(supplier(125L, -1, 130)); + suppliers.add(supplier(12350L, -2, 12400)); + suppliers.add(supplier(-12349L, -2, -12300)); + suppliers.add(supplier(-12350L, -2, -12400)); + suppliers.add(supplier(Long.MAX_VALUE, 5, Long.MAX_VALUE)); + suppliers.add(supplier(Long.MIN_VALUE, 5, Long.MIN_VALUE)); + + suppliers.add(supplier(0, 0, 0)); + suppliers.add(supplier(123, 2, 123)); + suppliers.add(supplier(123, -1, 120)); + return parameterSuppliersFromTypedData(suppliers); } - private Object process(Number val, int decimals) { - try ( - Block block = evaluator(new Round(Source.EMPTY, field("val", typeOf(val)), field("decimals", DataTypes.INTEGER))).get( - driverContext() - ).eval(row(List.of(val, decimals))) - ) { - return toJavaObject(block, 0); - } + private static TestCaseSupplier supplier(double v, double expected) { + return supplier( + "round(" + v + ") -> " + expected, + DataTypes.DOUBLE, + () -> v, + "RoundDoubleNoDecimalsEvaluator[val=Attribute[channel=0]]", + value -> expected + ); } - private DataType typeOf(Number val) { - if (val instanceof Integer) { - return DataTypes.INTEGER; - } - if (val instanceof Long) { - return DataTypes.LONG; - } - if (val instanceof Double) { - return DataTypes.DOUBLE; - } - throw new UnsupportedOperationException("unsupported type [" + val.getClass() + "]"); + private static TestCaseSupplier supplier(double v, int decimals, double expected) { + return supplier( + "round(" + v + ", " + decimals + ") -> " + expected, + DataTypes.DOUBLE, + () -> v, + DataTypes.INTEGER, + () -> decimals, + "RoundDoubleEvaluator[val=Attribute[channel=0], decimals=CastIntToLongEvaluator[v=Attribute[channel=1]]]", + (value, de) -> expected + ); } - @Override - protected DataType expectedType(List argTypes) { - return argTypes.get(0); + private static TestCaseSupplier supplier(long v, int decimals, long expected) { + return supplier( + "round(" + v + "L, " + decimals + ") -> " + expected, + DataTypes.LONG, + () -> v, + DataTypes.INTEGER, + () -> decimals, + "RoundLongEvaluator[val=Attribute[channel=0], decimals=CastIntToLongEvaluator[v=Attribute[channel=1]]]", + (value, de) -> expected + ); } - public void testNoDecimalsToString() { - assertThat( - evaluator(new Round(Source.EMPTY, field("val", DataTypes.DOUBLE), null)).get(driverContext()).toString(), - equalTo("RoundDoubleNoDecimalsEvaluator[val=Attribute[channel=0]]") + private static TestCaseSupplier supplier(int v, int decimals, int expected) { + return supplier( + "round(" + v + ", " + decimals + ") -> " + expected, + DataTypes.INTEGER, + () -> v, + DataTypes.INTEGER, + () -> decimals, + "RoundIntEvaluator[val=Attribute[channel=0], decimals=CastIntToLongEvaluator[v=Attribute[channel=1]]]", + (value, de) -> expected ); } - @Override - protected List argSpec() { - return List.of(required(numerics()), optional(integers())); + private static TestCaseSupplier supplier( + String name, + DataType numberType, + Supplier numberSupplier, + String expectedEvaluatorName, + Function expected + ) { + return new TestCaseSupplier(name, List.of(numberType), () -> { + N number = numberSupplier.get(); + return new TestCaseSupplier.TestCase( + List.of(new TestCaseSupplier.TypedData(number, numberType, "number")), + expectedEvaluatorName, + numberType, + equalTo(expected.apply(number)) + ); + }); + } + + private static TestCaseSupplier supplier( + String name, + DataType numberType, + Supplier numberSupplier, + DataType decimalsType, + Supplier decimalsSupplier, + String expectedEvaluatorName, + BiFunction expected + ) { + return new TestCaseSupplier(name, List.of(numberType, decimalsType), () -> { + N number = numberSupplier.get(); + D decimals = decimalsSupplier.get(); + return new TestCaseSupplier.TestCase( + List.of( + new TestCaseSupplier.TypedData(number, numberType, "number"), + new TestCaseSupplier.TypedData(decimals, decimalsType, "decimals") + ), + expectedEvaluatorName, + numberType, + equalTo(expected.apply(number, decimals)) + ); + }); } @Override diff --git a/x-pack/plugin/ilm/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ilm/70_downsampling.yml b/x-pack/plugin/ilm/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ilm/70_downsampling.yml index a947c7bfa6e31..8dba8c05e5bb8 100644 --- a/x-pack/plugin/ilm/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ilm/70_downsampling.yml +++ b/x-pack/plugin/ilm/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ilm/70_downsampling.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Downsample ILM validations added in 8.5.0" - do: @@ -9,8 +9,8 @@ setup: --- "Test downsample in hot phase without rollover": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Downsample ILM validations added in 8.5.0" - do: @@ -65,8 +65,8 @@ setup: --- "Test downsample timeout parameter": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "Downsample timeout added in version 8.10.0" - do: diff --git a/x-pack/plugin/mapper-constant-keyword/src/yamlRestTest/resources/rest-api-spec/test/20_synthetic_source.yml b/x-pack/plugin/mapper-constant-keyword/src/yamlRestTest/resources/rest-api-spec/test/20_synthetic_source.yml index 635e09d82c41e..b64fb7b822713 100644 --- a/x-pack/plugin/mapper-constant-keyword/src/yamlRestTest/resources/rest-api-spec/test/20_synthetic_source.yml +++ b/x-pack/plugin/mapper-constant-keyword/src/yamlRestTest/resources/rest-api-spec/test/20_synthetic_source.yml @@ -1,6 +1,6 @@ constant_keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml index be77cd4ec11c5..c2e5de20690d2 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "unsigned_long was added in 7.10" - do: @@ -302,8 +302,8 @@ setup: --- "Composite aggregations": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "unsigned_long support for composite aggs was fixed in 7.11" - do: @@ -379,9 +379,9 @@ setup: --- "Decay": - - skip: - features: close_to - version: " - 8.8.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.9.0"] reason: "decay functions not supported for unsigned_long" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/20_null_value.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/20_null_value.yml index 9b2c4a62474ec..6a3fa28b73f66 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/20_null_value.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/20_null_value.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "unsigned_long was added in 7.10" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/30_multi_fields.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/30_multi_fields.yml index ad8cff79601d4..db985b1066074 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/30_multi_fields.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/30_multi_fields.yml @@ -1,7 +1,7 @@ --- "Multi keyword and unsigned_long fields": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "unsigned_long was added in 7.10" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/40_different_numeric.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/40_different_numeric.yml index 22285a01c3723..93ba06ff9f00f 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/40_different_numeric.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/40_different_numeric.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "unsigned_long was added in 7.10" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml index 8b56e37d13d6f..7f82ed3733fd0 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: "unsigned long script fields api was added in 7.15.0" - do: @@ -293,8 +293,8 @@ setup: --- "Scripted Metric": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "context for scripted metric was added in 8.1" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/60_collapse.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/60_collapse.yml index 8c03684bc470b..0c87424a88fed 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/60_collapse.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/60_collapse.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "collapse on unsigned_long was added in 8.0" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/70_time_series.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/70_time_series.yml index 5d4a971c6fd1b..7e47482bf97ed 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/70_time_series.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/70_time_series.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid introduced in 8.1.0 - do: @@ -49,8 +49,8 @@ setup: --- fetch the _tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - do: @@ -73,8 +73,8 @@ fetch the _tsid: --- fetch the _source: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: synthetic source support to unsigned long added in 8.7.0 - do: @@ -102,8 +102,8 @@ fetch the _source: # This is caused by the encoding of unsigned_long as a signed long before # being serialized in _tsid aggregate the _tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - do: @@ -134,8 +134,8 @@ aggregate the _tsid: # This is caused by the encoding of unsigned_long as a signed long before # being serialized in _tsid sort by tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - do: @@ -158,8 +158,8 @@ sort by tsid: --- composite aggregation on tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid introduced in 8.1.0 - do: diff --git a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml index 90cb04580c2bd..4ff2499ad7e72 100644 --- a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml +++ b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "synthetic source support added in 8.5.0" - do: diff --git a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml index 806735e8174cf..f603e884d8f1b 100644 --- a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml +++ b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "version script field support was added in 8.1.0" - do: diff --git a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/60_script_sort_values.yml b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/60_script_sort_values.yml index a2df0a3c55ee8..e822d4016be93 100644 --- a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/60_script_sort_values.yml +++ b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/60_script_sort_values.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "version script field sorting support was added in 8.3.0" - do: diff --git a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/40_text_expansion.yml b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/40_text_expansion.yml index 3ac52c2d45d0d..e1ec400ce64bd 100644 --- a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/40_text_expansion.yml +++ b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/40_text_expansion.yml @@ -145,8 +145,8 @@ teardown: --- "Test text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -166,8 +166,8 @@ teardown: --- "Test named, boosted text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: search: @@ -206,8 +206,8 @@ teardown: --- "Test text expansion search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -225,8 +225,8 @@ teardown: --- "Test text expansion search with weighted tokens rescoring only pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -246,8 +246,8 @@ teardown: --- "Test weighted tokens search": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -267,8 +267,8 @@ teardown: --- "Test weighted tokens search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -285,8 +285,8 @@ teardown: --- "Test weighted tokens search only scoring pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -305,8 +305,8 @@ teardown: --- "Test weighted tokens search that prunes tokens based on frequency": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: diff --git a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/40_text_expansion.yml b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/40_text_expansion.yml index 3ac52c2d45d0d..e1ec400ce64bd 100644 --- a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/40_text_expansion.yml +++ b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/40_text_expansion.yml @@ -145,8 +145,8 @@ teardown: --- "Test text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -166,8 +166,8 @@ teardown: --- "Test named, boosted text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: search: @@ -206,8 +206,8 @@ teardown: --- "Test text expansion search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -225,8 +225,8 @@ teardown: --- "Test text expansion search with weighted tokens rescoring only pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -246,8 +246,8 @@ teardown: --- "Test weighted tokens search": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -267,8 +267,8 @@ teardown: --- "Test weighted tokens search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -285,8 +285,8 @@ teardown: --- "Test weighted tokens search only scoring pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -305,8 +305,8 @@ teardown: --- "Test weighted tokens search that prunes tokens based on frequency": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/clear_cache.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/clear_cache.yml index 907ee4c975877..d81b30b2e6bbc 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/clear_cache.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/clear_cache.yml @@ -53,8 +53,8 @@ setup: --- "Clear searchable snapshots cache": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: searchable snapshots introduced in 7.8.0 - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/indices_stats.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/indices_stats.yml index 3ca2f7238beec..f70b9bbe3a861 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/indices_stats.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/indices_stats.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: segment files stats enhanced in 7.13.0 - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/mount.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/mount.yml index 454f6bb19c16b..2d9ae59aa9081 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/mount.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/mount.yml @@ -160,8 +160,8 @@ teardown: --- "Test Mount API with unknown request body field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "unknown request body fields are rejected starting version 8.5.0" - do: catch: bad_request diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/repository.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/repository.yml index 8c43c0682c33b..a12135d444ec3 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/repository.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/repository.yml @@ -53,8 +53,8 @@ setup: --- "Delete repository when a snapshot is mounted as an index": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "starting 8.0, an error occurs when a repository used by snapshot backed indices is deleted" - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/shared_cache_stats.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/shared_cache_stats.yml index 809a45bf938b1..5a067b6c7d3cf 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/shared_cache_stats.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/shared_cache_stats.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: node-level cache statistics added in 7.13.0 - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/stats.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/stats.yml index 11e5e052b871c..6e38079e11168 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/stats.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/stats.yml @@ -53,8 +53,8 @@ setup: --- "Tests searchable snapshots stats": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: searchable snapshots response format changed in 7.13.0 - do: diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPrewarmingIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPrewarmingIntegTests.java index 207df0faddd07..30c96b0a1ddda 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPrewarmingIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPrewarmingIntegTests.java @@ -448,13 +448,6 @@ public Map getRepositories( "tracking", (metadata) -> new FsRepository(metadata, env, namedXContentRegistry, clusterService, bigArrays, recoverySettings) { - @Override - protected void assertSnapshotOrStatelessPermittedThreadPool() { - if (enabled.get()) { - super.assertSnapshotOrStatelessPermittedThreadPool(); - } - } - @Override protected BlobStore createBlobStore() throws Exception { final BlobStore delegate = super.createBlobStore(); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/recovery/SearchableSnapshotRecoveryStateIntegrationTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/recovery/SearchableSnapshotRecoveryStateIntegrationTests.java index 4a15d00bc8168..4e5e6ab976330 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/recovery/SearchableSnapshotRecoveryStateIntegrationTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/recovery/SearchableSnapshotRecoveryStateIntegrationTests.java @@ -246,12 +246,7 @@ public Map getRepositories( ) { return Collections.singletonMap( "test-fs", - (metadata) -> new FsRepository(metadata, env, namedXContentRegistry, clusterService, bigArrays, recoverySettings) { - @Override - protected void assertSnapshotOrStatelessPermittedThreadPool() { - // ignore - } - } + (metadata) -> new FsRepository(metadata, env, namedXContentRegistry, clusterService, bigArrays, recoverySettings) ); } } diff --git a/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/store/SearchableSnapshotDirectoryTests.java b/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/store/SearchableSnapshotDirectoryTests.java index c54ead2bdbc45..1452847c65b4c 100644 --- a/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/store/SearchableSnapshotDirectoryTests.java +++ b/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/store/SearchableSnapshotDirectoryTests.java @@ -606,13 +606,7 @@ private void testDirectories( BlobStoreTestUtil.mockClusterService(repositoryMetadata), MockBigArrays.NON_RECYCLING_INSTANCE, new RecoverySettings(Settings.EMPTY, new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS)) - ) { - - @Override - protected void assertSnapshotOrStatelessPermittedThreadPool() { - // eliminate thread name check as we create repo manually on test/main threads - } - }; + ); repository.start(); releasables.add(repository::stop); diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_synthetic_source.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_synthetic_source.yml index 3e6ebdaca9f45..45ec59a419e13 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_synthetic_source.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_synthetic_source.yml @@ -1,6 +1,6 @@ constant_keyword: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: synthetic source support added in 8.5.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/10_basic.yml index 2aa78a91f4dbe..44758422ff415 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/10_basic.yml @@ -1,7 +1,7 @@ --- "Test exists query on aggregate metric field": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -57,8 +57,8 @@ --- "Test term query on aggregate metric field": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -133,8 +133,8 @@ --- "Test range query on aggregate metric field": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -210,8 +210,8 @@ --- "Sort": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -352,10 +352,10 @@ - match: { hits.hits.1.fields.metric.0.value_count: 10 } --- "deprecated use of multi-fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "deprecation added in 8.14" - features: warnings + test_runner_features: warnings - do: warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml index 0c765e39656c7..98a4d74b8d3e5 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: metric params only on time series indices introduced in 8.5.0 - do: @@ -77,8 +77,8 @@ setup: --- aggregate_metric on standard index: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: aggregate_metric_double field caps changed in 8.5.0 - do: @@ -92,8 +92,8 @@ aggregate_metric on standard index: --- aggregate_metric on standard index conflict with double: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: aggregate_metric_double field caps changed in 8.5.0 - do: @@ -120,8 +120,8 @@ aggregate_metric on standard index conflict with double: --- # Test field_caps on a rollup index field caps on rollup indices: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: metric params only on time series indices introduced in 8.5.0 - do: @@ -143,8 +143,8 @@ field caps on rollup indices: --- # Test field_caps on time-series index (mix of raw and rollup indices) field caps on time series indices: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: metric params only on time series indices introduced in 8.5.0 - do: @@ -174,8 +174,8 @@ field caps on time series indices: --- # Test field_caps on mixed standard and time-series (mix of raw and rollup) indices field caps on all indices: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: metric params only on time series indices introduced in 8.5.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/20_min_max_agg.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/20_min_max_agg.yml index 5872b45cc3525..88a0eb017fabe 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/20_min_max_agg.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/20_min_max_agg.yml @@ -31,8 +31,8 @@ setup: - '{"metric": {"min": -100, "max": -40} }' --- "Test min_max aggs": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -55,8 +55,8 @@ setup: --- "Test min_max aggs with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/30_sum_agg.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/30_sum_agg.yml index 669ba5c15c1f8..24323b46c4ed9 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/30_sum_agg.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/30_sum_agg.yml @@ -27,8 +27,8 @@ setup: - '{"metric": {"sum": -100, "value_count": 40} }' --- "Test sum agg": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -46,8 +46,8 @@ setup: --- "Test sum agg with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/40_avg_agg.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/40_avg_agg.yml index 4cdf8a1bf6ced..e378dae829bd3 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/40_avg_agg.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/40_avg_agg.yml @@ -27,8 +27,8 @@ setup: - '{"metric": {"sum": -100, "value_count": 40} }' --- "Test avg agg": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -46,8 +46,8 @@ setup: --- "Test avg agg with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/50_value_count_agg.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/50_value_count_agg.yml index f4ed2ea413dcb..7c58379d90b72 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/50_value_count_agg.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/50_value_count_agg.yml @@ -27,8 +27,8 @@ setup: - '{"metric": {"sum": -100, "value_count": 40} }' --- "Test value_count agg": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -46,8 +46,8 @@ setup: --- "Test value_count agg with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/80_raw_agg_metric_aggs.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/80_raw_agg_metric_aggs.yml index 9c13c95bc0af4..84207778d0ff7 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/80_raw_agg_metric_aggs.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/80_raw_agg_metric_aggs.yml @@ -58,8 +58,8 @@ setup: --- "Test mixed aggregations": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -93,8 +93,8 @@ setup: --- "Test mixed aggregations with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/90_tsdb_mappings.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/90_tsdb_mappings.yml index 2325a078764fc..f350a5b6163a5 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/90_tsdb_mappings.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/90_tsdb_mappings.yml @@ -1,6 +1,6 @@ aggregate_double_metric with time series mappings: - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: introduced in 7.16.0 - do: @@ -38,8 +38,8 @@ aggregate_double_metric with time series mappings: --- aggregate_double_metric with wrong time series mappings: - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: introduced in 7.16.0 - do: @@ -78,8 +78,8 @@ aggregate_double_metric with wrong time series mappings: --- "Field caps with tsdb": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Field caps fix in 8.9" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/100_tsdb.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/100_tsdb.yml index 099d8ad9171eb..286df84111cd9 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/100_tsdb.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/100_tsdb.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -62,8 +62,8 @@ setup: --- aggregate multi_terms: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -88,8 +88,8 @@ aggregate multi_terms: --- "multi_terms aggregation with time_series aggregation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "multi_terms for time series aggregation fixed in 8.13.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/boxplot.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/boxplot.yml index b65ab8a771c82..91eae1965fea6 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/boxplot.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/boxplot.yml @@ -195,10 +195,10 @@ setup: --- "Counter field": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "counter field support added in 8.10" - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/histogram.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/histogram.yml index b2f710e5ffed8..b719502ae8f28 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/histogram.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/histogram.yml @@ -174,8 +174,8 @@ setup: --- histogram with synthetic source: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -220,8 +220,8 @@ histogram with synthetic source: --- histogram with synthetic source and zero counts: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -255,8 +255,8 @@ histogram with synthetic source and zero counts: --- histogram with large count values: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: Support for `long` values was introduced in 8.11.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/matrix_stats.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/matrix_stats.yml index 4544a9beed307..d440e2292b644 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/matrix_stats.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/matrix_stats.yml @@ -53,10 +53,10 @@ setup: --- "matrix stats all fields available with two fields": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: bug fixed in 8.3.0 - features: close_to + test_runner_features: close_to - do: search: @@ -95,10 +95,10 @@ setup: --- "matrix stats all fields available with one field": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: bug fixed in 8.3.0 - features: close_to + test_runner_features: close_to - do: search: @@ -124,10 +124,10 @@ setup: --- "matrix stats field not in all indices bad request": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: bug fixed in 8.3.0 - features: close_to + test_runner_features: close_to - do: catch: bad_request @@ -147,10 +147,10 @@ setup: --- "matrix stats with bucket_selector": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: bug fixed in 8.4.0 - features: close_to + test_runner_features: close_to - do: search: @@ -209,10 +209,10 @@ setup: --- "Counter field": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "counter field support added in 8.10" - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/nested_top_metrics_sort.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/nested_top_metrics_sort.yml index 3b2c2a33b97d5..fec17af8cdebe 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/nested_top_metrics_sort.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/nested_top_metrics_sort.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: indices.create: @@ -106,8 +106,8 @@ teardown: --- "sort on top metrics keyword same version": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -158,8 +158,8 @@ teardown: --- "sort on top metrics keyword desc": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -209,8 +209,8 @@ teardown: --- "sort on top metrics keyword asc": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -260,8 +260,8 @@ teardown: --- "sort on top metrics numeric desc": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -311,8 +311,8 @@ teardown: --- "sort on top metrics numeric asc": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -362,8 +362,8 @@ teardown: --- "sort on top metrics non-existing field": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -395,8 +395,8 @@ teardown: --- "terms order by top metrics null values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -461,8 +461,8 @@ teardown: --- "terms order by top metrics date not null values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -548,8 +548,8 @@ teardown: --- "terms order by top metrics numeric not null integer values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -635,8 +635,8 @@ teardown: --- "terms order by top metrics numeric not null double values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 @@ -723,8 +723,8 @@ teardown: --- "terms order by top metrics size greater than 1 rewrite_to_filter_by_filter true": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -821,8 +821,8 @@ teardown: --- "terms order by top metrics missing metric rewrite_to_filter_by_filter true": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -867,8 +867,8 @@ teardown: --- "terms order by top metrics equal values sorted on term": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -954,8 +954,8 @@ teardown: --- "terms order by top metrics size greater than 1 rewrite_to_filter_by_filter false": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -1052,8 +1052,8 @@ teardown: --- "terms order by top metrics missing metric rewrite_to_filter_by_filter false": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/rate.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/rate.yml index ea1dd5bb99610..746919f1e8a5b 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/rate.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/rate.yml @@ -36,8 +36,8 @@ --- "rate with doc_count": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: bug fixed in 7.16.0 - do: bulk: @@ -208,10 +208,10 @@ --- "rate aggregation on counter field": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - features: close_to + test_runner_features: close_to - do: indices.create: @@ -331,10 +331,10 @@ --- "rate aggregation on counter field with unit": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - features: close_to + test_runner_features: close_to - do: indices.create: @@ -445,10 +445,10 @@ --- "rate aggregation on counter field partial bucket": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/reset_tracking_rate.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/reset_tracking_rate.yml index 62115b3b87081..45330256322e9 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/reset_tracking_rate.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/reset_tracking_rate.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.5.0" + - requires: + cluster_features: ["gte_v8.5.1"] reason: Reset tracking rate agg added in 8.6 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/top_metrics.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/top_metrics.yml index 74a741a8a2030..3d78fedee4246 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/top_metrics.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/top_metrics.yml @@ -710,8 +710,8 @@ --- "Counter field": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/usage.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/usage.yml index 6312281ac50a8..5b4f11712089c 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/usage.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/usage.yml @@ -14,8 +14,8 @@ setup: --- "Usage stats on analytics indices": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "stats is not working in earlier versions at the moment" - do: {xpack.usage: {}} diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/10_basic.yml index 393ae3fbe24fe..925005b98947f 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/10_basic.yml @@ -172,8 +172,8 @@ setup: --- "Auto date histogram interval is saved": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "interval is only serialized from 8.3 on" - do: async_search.submit: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/20-with-poin-in-time.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/20-with-poin-in-time.yml index 348f3bcd58433..5d89a41d87153 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/20-with-poin-in-time.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/20-with-poin-in-time.yml @@ -1,7 +1,7 @@ --- "Async search with point in time": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "point in time is introduced in 7.10" - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/constant_keyword/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/constant_keyword/10_basic.yml index ee08fcc3693d4..861247350c9f5 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/constant_keyword/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/constant_keyword/10_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "constant_keyword was added in 7.7" - do: @@ -202,8 +202,8 @@ setup: --- "Simple filter": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "constant_keyword was added in 7.7" - do: @@ -283,8 +283,8 @@ setup: --- "Filter with histogram": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "constant_keyword was added in 7.7" - do: @@ -452,10 +452,10 @@ Cardinality agg: - match: { aggregations.card.value: 1 } --- "deprecated use of multi-fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "deprecation added in 8.14" - features: warnings + test_runner_features: warnings - do: warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/10_basic.yml index e5ad63fa31153..a547571cf7760 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/10_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "counted_keyword was added in 8.12" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/20_no_index.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/20_no_index.yml index 1fe48207b5586..2925a0023ca30 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/20_no_index.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/20_no_index.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "index option on counted_keyword was added in 8.13" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/data_streams/10_data_stream_resolvability.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/data_streams/10_data_stream_resolvability.yml index 4d464cfcb4548..f8c3a4d660fee 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/data_streams/10_data_stream_resolvability.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/data_streams/10_data_stream_resolvability.yml @@ -1,9 +1,9 @@ --- "Verify data stream resolvability for xpack apis": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -52,10 +52,10 @@ --- "Verify data stream resolvability in ilm explain api": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: ilm.put_lifecycle: @@ -122,10 +122,10 @@ - is_true: acknowledged --- "Verify data stream resolvability rollup": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -157,10 +157,10 @@ --- "Verify data stream resolvability in ILM remove policy API": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: ilm.put_lifecycle: @@ -253,10 +253,10 @@ --- "Verify data stream resolvability for graph explore API": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -316,10 +316,10 @@ --- "Verify data stream resolvability in migrations API": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -355,10 +355,10 @@ --- "Verify data stream resolvability in async search": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -425,10 +425,10 @@ --- "Verify data stream resolvability in rollup search": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -497,10 +497,10 @@ --- "Verify data stream resolvability in EQL search API with no sequences": - - skip: - version: " - 7.9.1" + - requires: + cluster_features: ["gte_v7.9.2"] reason: "EQL data stream resolution only properly works from 7.9.2" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -561,10 +561,10 @@ --- "Verify data stream resolvability in EQL search API with sequences": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "EQL data stream resolution with queries using sequences only properly works from 7.10.0 (when point-in-time is introduced)" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -626,10 +626,10 @@ --- "Verify data stream resolvability in PIT searches": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "Point-In-Time was introduced in 7.10.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/deprecation/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/deprecation/10_basic.yml index 99e6cdc72faf8..b93241c09302b 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/deprecation/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/deprecation/10_basic.yml @@ -17,9 +17,10 @@ setup: --- "Test ml": - skip: - version: "7.0.0 - " - features: ["headers", "warnings"] + cluster_features: ["gte_v7.0.0"] reason: this test needs adjusting to contain syntax deprecated in 7.x and removed in 8.0 + - requires: + test_runner_features: ["headers", "warnings"] # Index the config directly to prevent the deprecated # use_dis_max field being rewritten by the parser. This diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/10_basic.yml index afe4bcabee3d9..c9b05c4e13a85 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/10_basic.yml @@ -62,10 +62,10 @@ setup: --- "Test using the deprecated elasticsearch_version field results in a warning": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "elasticsearch_version field deprecated in 8.12.0, to be removed in 9.0" - features: warnings + test_runner_features: warnings - do: warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/20_standard_index.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/20_standard_index.yml index 7a8e069714c41..c767e3baac38f 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/20_standard_index.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/20_standard_index.yml @@ -179,3 +179,11 @@ enrich documents over _bulk via an alias: _source: baz: slow c: 3 + + - do: + ingest.delete_pipeline: + id: test_alias_pipeline + + - do: + enrich.delete_policy: + name: test_alias_policy diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml index c72315312afce..412e23a768535 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml @@ -1,9 +1,9 @@ --- "Coalesce and to_ip functions": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "fixes in 8.12 or later" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: bulk: index: test @@ -58,8 +58,8 @@ --- "unsupported and invalid mapped fields": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "fixes in 8.13 or later" - do: indices.create: @@ -129,8 +129,8 @@ --- "null MappedFieldType on single value detection #103141": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "fixes in 8.13 or later" - do: indices.create: @@ -198,8 +198,8 @@ --- "text in functions #105379": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "fixes in 8.13 or later" - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml index e15372bc3088e..52d390e7b288b 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/110_all_null.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/110_all_null.yml index 0f8dbbb97f57f..a18dbba1abfab 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/110_all_null.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/110_all_null.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "feature added in 8.13" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/120_profile.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/120_profile.yml index c2e728535a408..17034de677b8d 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/120_profile.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/120_profile.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "profile option added in 8.12" - features: warnings + test_runner_features: warnings - do: indices.create: index: test @@ -120,8 +120,8 @@ setup: --- avg 8.14 or after: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "avg changed starting 8.14" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/130_spatial.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/130_spatial.yml index 8a9004d372d17..053d33ee9bf43 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/130_spatial.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/130_spatial.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Mixed cluster tests don't work with the changed error message from sort" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/20_aggs.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/20_aggs.yml index 820df8a3ff066..672dfa1503c40 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/20_aggs.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/20_aggs.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/25_aggs_on_null.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/25_aggs_on_null.yml index 9a050db5132b3..0684939932774 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/25_aggs_on_null.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/25_aggs_on_null.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "fixed in 8.13" - features: warnings + test_runner_features: warnings - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml index 8f1d64e169fde..9dded5d0855c6 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "more field loading added in 8.12+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex --- constant_keyword: @@ -621,8 +621,8 @@ version: --- id: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: indices.create: @@ -685,8 +685,8 @@ unsigned_long: --- _source: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: @@ -713,8 +713,8 @@ _source: --- _source keep all: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: @@ -748,8 +748,8 @@ _source keep all: --- _source disabled: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: @@ -871,8 +871,8 @@ synthetic _source text with parent keyword: --- geo_point: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "geo_point precision changed in 8.13.0" - do: indices.create: @@ -904,8 +904,8 @@ geo_point: --- cartesian_point: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "cartesian_point precision changed in 8.13.0" - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml index 26fc26d5c0449..7549d33b4de1c 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test @@ -107,8 +107,8 @@ setup: --- load everything: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: allowed_warnings_regex: @@ -233,8 +233,8 @@ from index pattern explicit counter use: --- _source: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml index 8b28776e42fcd..c34666bb12b02 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test @@ -109,8 +109,8 @@ setup: --- unsupported: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Latest types supported in ESQL as of 8.13.0" - do: @@ -289,8 +289,8 @@ unsupported: --- unsupported with sort: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Latest types supported in ESQL as of 8.13.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/45_non_tsdb_counter.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/45_non_tsdb_counter.yml index 13a88d0c2f79f..05ba568838fe4 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/45_non_tsdb_counter.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/45_non_tsdb_counter.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/50_index_patterns.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/50_index_patterns.yml index 87af58cf89898..d8aad27534433 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/50_index_patterns.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/50_index_patterns.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex --- disjoint_mappings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_enrich.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_enrich.yml index b294629dda073..8a5d3be6758e3 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_enrich.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_enrich.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: cities @@ -92,10 +92,10 @@ teardown: --- "Enrich on keyword": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Enriching with text field in the enrich fields list involves reading text from source, not supported before 8.13.0" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: @@ -166,8 +166,8 @@ teardown: --- "Enrich on text": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "TEXT field ENRICH support was added in 8.14.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml index 67dc4bbf2a06a..74c0e9ef1bb31 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Introduction of META tracking in 8.14+" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/61_enrich_ip.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/61_enrich_ip.yml index 77a6811b899f6..076bf116292d0 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/61_enrich_ip.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/61_enrich_ip.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: networks @@ -133,8 +133,8 @@ teardown: --- "IP text fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "ENRICH support for TEXT fields was added in 8.14.0" - do: @@ -161,8 +161,8 @@ teardown: --- "Invalid IP strings": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IP range ENRICH support was added in 8.14.0" - do: @@ -173,8 +173,8 @@ teardown: --- "IP": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IP range ENRICH support was added in 8.14.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/62_extra_enrich.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/62_extra_enrich.yml index ea5ecd0511596..19b08007fe18a 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/62_extra_enrich.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/62_extra_enrich.yml @@ -1,7 +1,7 @@ --- "Enrich fields includes match field": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "enrich match field was mistakenly excluded in 8.11" - do: indices.create: @@ -72,8 +72,8 @@ --- movies: # This is a subset of a demo that we use for ESQL's ENRICH command. - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "there's a bug in sub-fields in 8.12" - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/70_locale.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/70_locale.yml index bcae5e7cf24a2..e181f77f2bcef 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/70_locale.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/70_locale.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: events diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/80_text.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/80_text.yml index dcc055707b5c2..9607b64385721 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/80_text.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/80_text.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: @@ -123,10 +123,10 @@ setup: --- "IN on text": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IN on text fixed in v 8.14" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: - "No limit defined, adding default limit of \\[.*\\]" @@ -148,10 +148,10 @@ setup: --- "IN on text and itself": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IN on text fixed in v 8.14" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: - "No limit defined, adding default limit of \\[.*\\]" @@ -174,10 +174,10 @@ setup: --- "NOT IN on text": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IN on text fixed in v 8.14" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: - "No limit defined, adding default limit of \\[.*\\]" @@ -368,10 +368,10 @@ setup: --- "split text": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "functions fixed for text in v 8.14" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: - "No limit defined, adding default limit of \\[.*\\]" diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/81_text_exact_subfields.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/81_text_exact_subfields.yml index 3b58ee01edfa0..a3be4221712fc 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/81_text_exact_subfields.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/81_text_exact_subfields.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Exact subfields fixed in v 8.13" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/90_non_indexed.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/90_non_indexed.yml index c10554cebf300..f69854388baf3 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/90_non_indexed.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/90_non_indexed.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "extracting non-indexed fields available in 8.12+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/forecast.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/forecast.yml index 8d3bf93962d98..729f284bde95f 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/forecast.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/forecast.yml @@ -17,7 +17,7 @@ setup: "Test forecast unknown job": - skip: reason: "https://github.com/elastic/elasticsearch/issues/34747" - version: "6.5.0 - " + cluster_features: ["gte_v6.5.0"] - do: catch: missing diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/post_data.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/post_data.yml index e19a8c48a042f..9577f80f4592e 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/post_data.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/post_data.yml @@ -206,8 +206,9 @@ setup: "Test POST data with invalid parameters": - skip: reason: "https://github.com/elastic/elasticsearch/issues/34747" - version: "6.5.0 - " - features: + cluster_features: ["gte_v6.5.0"] + - requires: + test_runner_features: - "warnings" - do: @@ -264,7 +265,7 @@ setup: "Test Flush data with invalid parameters": - skip: reason: "https://github.com/elastic/elasticsearch/issues/34747" - version: "6.5.0 - " + cluster_features: ["gte_v6.5.0"] - do: catch: missing diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/search_knn_query_vector_builder.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/search_knn_query_vector_builder.yml index 869bba90345c4..56c0a58c666b6 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/search_knn_query_vector_builder.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/search_knn_query_vector_builder.yml @@ -105,8 +105,8 @@ setup: --- "Test vector search with query_vector_builder": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "introduced after 8.13" - do: search: @@ -124,8 +124,8 @@ setup: --- "nested kNN search with inner_hits size": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "introduced after 8.13" - do: headers: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/text_expansion_search.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/text_expansion_search.yml index f92870b61f1b1..8dee722bbb185 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/text_expansion_search.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/text_expansion_search.yml @@ -110,8 +110,8 @@ setup: --- "Test text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -131,8 +131,8 @@ setup: --- "Test named, boosted text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: search: @@ -171,8 +171,8 @@ setup: --- "Test text expansion search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -190,8 +190,8 @@ setup: --- "Test text expansion search with weighted tokens rescoring only pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -211,8 +211,8 @@ setup: --- "Test weighted tokens search": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -232,8 +232,8 @@ setup: --- "Test weighted tokens search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -250,8 +250,8 @@ setup: --- "Test weighted tokens search only scoring pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -270,8 +270,8 @@ setup: --- "Test weighted tokens search that prunes tokens based on frequency": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -290,8 +290,8 @@ setup: --- "Test text-expansion that displays error for invalid queried field type": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "validation for invalid field type introduced in 8.14.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/10_basic.yml index f94e2a5526752..42935ff090273 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/10_basic.yml @@ -327,8 +327,8 @@ teardown: --- "Test clear privileges cache": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "application privileges cache is available since 7.9.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/profiling/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/profiling/10_basic.yml index ffd5358a12d0a..9df3731a09941 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/profiling/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/profiling/10_basic.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Universal Profiling test infrastructure is available in 8.12+" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/put_job.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/put_job.yml index c203039d45db6..6560c6f470533 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/put_job.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/put_job.yml @@ -357,8 +357,8 @@ setup: --- "Test put_job with comma-delimited index pattern": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Comma delimited index pattern introduced in 8.2.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/rollup_search.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/rollup_search.yml index 8a771a8d1596d..c4aabc520ab5e 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/rollup_search.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/rollup_search.yml @@ -150,8 +150,8 @@ setup: --- "Basic Search with rest_total_hits_as_int": - - skip: - version: " - 6.5.99" + - requires: + cluster_features: ["gte_v6.6.0"] reason: rest_total_hits_as_int was introduced in 6.6.0 - do: rollup.rollup_search: @@ -910,10 +910,10 @@ setup: --- "Obsolete Timezone": - - skip: - version: " - 7.1.99" - reason: "IANA TZ deprecations in 7.2" - features: "warnings" + - requires: + cluster_features: ["gte_v7.2.0"] + reason: "IANA TZ deprecations in 7.2" + test_runner_features: "warnings" - do: indices.create: index: tz @@ -1055,9 +1055,9 @@ setup: --- "Obsolete BWC Timezone": - - skip: - version: " - 7.1.99" - reason: "IANA TZ deprecations in 7.2" + - requires: + cluster_features: ["gte_v7.2.0"] + reason: "IANA TZ deprecations in 7.2" - do: indices.create: index: tz_rollup diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_query.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_query.yml index ca07b888ab5c1..eaa5b8b42a840 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_query.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_query.yml @@ -51,8 +51,8 @@ setup: --- "Test pinned query with ID and index": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: "the 'docs' option was added in 7.15" - do: search: @@ -80,8 +80,8 @@ setup: --- "Test pinned query with docs": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "'_index' was made optional in 8.11" - do: search: @@ -108,7 +108,7 @@ setup: --- "Test pinned query with docs and no index fail in previous versions": - skip: - version: "8.10.99 - " + cluster_features: ["gte_v8.10.99"] reason: "'_index' was made optional in 8.11, this test is for explicit failure tests" - do: catch: bad_request diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/10_usage.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/10_usage.yml index 1f56a8c373968..ceaa767be3d3f 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/10_usage.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/10_usage.yml @@ -53,8 +53,8 @@ setup: --- "Tests searchable snapshots usage stats": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: storage flag introduced in 7.12.0 - do: @@ -86,8 +86,8 @@ setup: --- "Tests searchable snapshots usage stats with full_copy and shared_cache indices": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "extra full_copy and shared_cache fields introduced in 7.13.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/20_synthetic_source.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/20_synthetic_source.yml index 8d9c138b9c161..b1ab120fff441 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/20_synthetic_source.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/20_synthetic_source.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: added in 8.5 - do: @@ -56,8 +56,8 @@ setup: --- "Tests searchable snapshots usage stats": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: added in 8.5 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/14_cat_indices.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/14_cat_indices.yml index 978cf84983190..553201680f8c0 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/14_cat_indices.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/14_cat_indices.yml @@ -88,8 +88,8 @@ teardown: --- "Test empty request while single authorized index": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: cat indices was changed in 8.11.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/50_data_streams.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/50_data_streams.yml index 4757247a946d3..12aa9806301e6 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/50_data_streams.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/50_data_streams.yml @@ -1,8 +1,8 @@ --- setup: - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.8.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -105,10 +105,10 @@ teardown: --- "Test backing indices inherit parent data stream privileges": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: ["headers"] + test_runner_features: ["headers"] - do: # superuser indices.create_data_stream: @@ -173,10 +173,10 @@ teardown: --- "Test that requests not supporting data streams do not include data streams among authorized indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: ["headers"] + test_runner_features: ["headers"] - do: # superuser indices.create_data_stream: @@ -205,8 +205,8 @@ teardown: --- "Test auto mapping updates unauthorized for create_doc privilege": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "change to 7.8.99 after backport" - do: # superuser @@ -305,8 +305,8 @@ teardown: --- "Test that create data stream is limited to authorized namespace": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -328,8 +328,8 @@ teardown: --- "Test that get data stream is limited to authorized namespace": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: # superuser @@ -393,8 +393,8 @@ teardown: --- "Test that delete data stream is limited to authorized namespace": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: # superuser @@ -432,8 +432,8 @@ teardown: --- "Test that data streams stats is limited to authorized namespace": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "change to 7.8.99 after backport" - do: # superuser @@ -487,10 +487,10 @@ teardown: --- "auto_configure privilege permits auto-create of data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: ["headers", "allowed_warnings"] + test_runner_features: ["headers", "allowed_warnings"] - do: allowed_warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/51_data_stream_aliases.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/51_data_stream_aliases.yml index ac506b19ccddf..34aa4b5c64b14 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/51_data_stream_aliases.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/51_data_stream_aliases.yml @@ -1,8 +1,8 @@ --- setup: - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.99.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v8.0.0"] reason: "data stream aliases not yet backported to 7.x branch" - do: @@ -165,9 +165,9 @@ teardown: --- "Basic read authorization test": - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.99.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v8.0.0"] reason: "data stream aliases not yet backported to 7.x branch" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/55_auto_configure.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/55_auto_configure.yml index 85c455c41277e..83899ff9f5a33 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/55_auto_configure.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/55_auto_configure.yml @@ -1,8 +1,8 @@ --- setup: - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.8.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v7.9.0"] reason: "auto_configure available in 7.9+" - do: @@ -57,10 +57,10 @@ teardown: --- "auto_configure privilege permits auto-create of indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "auto_configure available in 7.9+" - features: ["headers", "allowed_warnings"] + test_runner_features: ["headers", "allowed_warnings"] # should succeed because test_user is authorized for auto_configure on index-auto-configure - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/60_resolve_index.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/60_resolve_index.yml index 50c04836bd183..6bca2c8b80a59 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/60_resolve_index.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/60_resolve_index.yml @@ -1,8 +1,8 @@ --- setup: - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.8.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -89,10 +89,10 @@ teardown: --- "resolve index respects view_index_metadata privilege": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: ["headers", "allowed_warnings"] + test_runner_features: ["headers", "allowed_warnings"] - do: # superuser indices.create_data_stream: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/70_tsdb.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/70_tsdb.yml index 66ce482f70603..a206ceddb4b9b 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/70_tsdb.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/70_tsdb.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - do: @@ -62,10 +62,10 @@ setup: --- document level security on tag: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -109,10 +109,10 @@ document level security on tag: --- document level security on dimension: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -156,10 +156,10 @@ document level security on dimension: --- document level security on tsid is not possible: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers # It'd be better if this failed immediately but security doesn't build the # query until you use it on an index. @@ -201,10 +201,10 @@ document level security on tsid is not possible: --- create_doc permission can create: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -267,10 +267,10 @@ create_doc permission can create: --- create_doc permission can't overwrite: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -334,10 +334,10 @@ create_doc permission can't overwrite: --- index permission can create: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -400,10 +400,10 @@ index permission can create: --- index permission can overwrite: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/80_downsample.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/80_downsample.yml index 9e59d6a065d3a..c2dea99cdc446 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/80_downsample.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/80_downsample.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: indices.create: @@ -77,10 +77,10 @@ setup: --- "Downsample user missing admin permissions to run the downsample operation": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: security.put_role: @@ -122,10 +122,10 @@ setup: --- "Downsample admin user with field level security settings defined on the source index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: security.put_role: @@ -166,10 +166,10 @@ setup: --- "Downsample admin user with document level security settings defined on the source index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: security.put_role: @@ -210,10 +210,10 @@ setup: --- "Downsample admin user without document level or field level security settings defined on the source index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: security.put_role: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/120_position_geo_line.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/120_position_geo_line.yml index 580505ba89bc8..0cd038436214d 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/120_position_geo_line.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/120_position_geo_line.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/70_script_doc_values.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/70_script_doc_values.yml index 05a072485fb31..b92fe608b8967 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/70_script_doc_values.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/70_script_doc_values.yml @@ -93,8 +93,8 @@ setup: --- "geoshape value": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: output changed in 8.9 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/sql/sql.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/sql/sql.yml index dc09cf91be72b..5320f3c163008 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/sql/sql.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/sql/sql.yml @@ -39,7 +39,7 @@ setup: --- "Paging through results": - skip: - version: "8.1.99 - " + cluster_features: ["gte_v8.1.99"] reason: PIT cursors introduced in 8.2 no longer return empty last page - do: sql.query: @@ -78,8 +78,8 @@ setup: --- "Paging through results with PIT cursor": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: PIT cursors introduced in 8.2 no longer return empty last page - do: sql.query: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/10_basic.yml index 7709df92ad958..d89b57129ff8c 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/10_basic.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.15.0" + - requires: + cluster_features: ["gte_v7.15.1"] reason: original indices are propagated correctly in 7.15.1 - features: headers + test_runner_features: headers - do: cluster.health: wait_for_status: yellow @@ -317,8 +317,8 @@ teardown: --- "Test basic term enumeration on doc value only field": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "terms enum support for doc value only keyword fields was added in 8.2.0" - do: @@ -329,8 +329,8 @@ teardown: --- "Test basic term enumeration on version field": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "terms enum support for version fields was added in 8.8.0" - do: @@ -393,8 +393,8 @@ teardown: --- "Test case insensitivity on doc value only field": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "terms enum support for doc value only keyword fields was added in 8.2.0" - do: @@ -411,8 +411,8 @@ teardown: --- "Test null search string allowed": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: TODO remove this skip after PR 73144 is backported to 7.x - do: @@ -449,8 +449,8 @@ teardown: --- "Test search after on doc value only keyword field": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "terms enum support for doc value only keyword fields was added in 8.2.0" - do: @@ -531,8 +531,8 @@ teardown: --- "Test search after on unconfigured constant keyword field": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: bug fixed in 8.3.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/20_fieldtypes.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/20_fieldtypes.yml index 751c9d3880d2d..875ba36099154 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/20_fieldtypes.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/20_fieldtypes.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.15.0" + - requires: + cluster_features: ["gte_v7.15.1"] reason: original indices are propagated correctly in 7.15.1 - features: headers + test_runner_features: headers - do: cluster.health: wait_for_status: yellow diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/10_basic.yml index 78f627b80128c..a49d825bcc086 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/10_basic.yml @@ -3,9 +3,9 @@ --- setup: - - skip: - features: headers - version: " - 7.10.0" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.10.1"] reason: "version field is added to 7.10" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/20_scripts.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/20_scripts.yml index 0bfde800d8bd1..61b7b6972287b 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/20_scripts.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/20_scripts.yml @@ -3,9 +3,9 @@ --- setup: - - skip: - features: headers - version: " - 7.10.0" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.10.1"] reason: "version field is added to 7.10" - do: @@ -58,8 +58,8 @@ setup: --- "Sort script returning version value": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "order by script returning version supported in v 8.3" - do: search: @@ -74,8 +74,8 @@ setup: --- "Sort script with field() returning version value": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "order by script returning version supported in v 8.3" - do: search: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/voting_only_node/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/voting_only_node/10_basic.yml index f7c4e97c03653..efd6c11ac546c 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/voting_only_node/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/voting_only_node/10_basic.yml @@ -1,8 +1,8 @@ --- "cluster stats with voting only node stats": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "voting only nodes are added in v7.3" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/wildcard/10_wildcard_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/wildcard/10_wildcard_basic.yml index 05b6847dc84e0..321e3b703b377 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/wildcard/10_wildcard_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/wildcard/10_wildcard_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - features: headers - version: " - 7.8.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.9.0"] reason: "wildcard fields were added from 7.9" - do: @@ -106,9 +106,9 @@ setup: --- "Case insensitive query": - - skip: - features: headers - version: " - 7.9.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.10.0"] reason: "Case insensitive flag added in 7.10" - do: search: diff --git a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml index de954080253b2..2cf26f336ba47 100644 --- a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml +++ b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings" - "allowed_warnings_regex" diff --git a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml index 26cf471ea9db7..a2d05446bbe1a 100644 --- a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml +++ b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings_regex" - do: diff --git a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/10_synonyms_with_privileges.yml b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/10_synonyms_with_privileges.yml index c2c5065ed485f..55392de5defa4 100644 --- a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/10_synonyms_with_privileges.yml +++ b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/10_synonyms_with_privileges.yml @@ -1,7 +1,7 @@ setup: - - skip: - features: headers - version: " - 8.9.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: diff --git a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/20_synonyms_no_privileges.yml b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/20_synonyms_no_privileges.yml index b1976bc6229eb..e9188e90dd44e 100644 --- a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/20_synonyms_no_privileges.yml +++ b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/20_synonyms_no_privileges.yml @@ -1,7 +1,7 @@ setup: - - skip: - features: headers - version: " - 8.9.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/100_resolve_index.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/100_resolve_index.yml index 883244624881d..30cad5ce68c6a 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/100_resolve_index.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/100_resolve_index.yml @@ -1,7 +1,7 @@ --- "Resolve index with indices, aliases, and data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/110_resolve_cluster.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/110_resolve_cluster.yml index 58658114e6f93..6b1576f0bd6d7 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/110_resolve_cluster.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/110_resolve_cluster.yml @@ -1,7 +1,7 @@ --- "Resolve cluster with indices, aliases, and data streams": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster added in 8.13" - do: diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml index aef1375be01d5..4c0bbfd7ec139 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml @@ -150,8 +150,8 @@ teardown: --- "Enrich across clusters": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Enrich across clusters available in 8.13 or later" - do: indices.create: diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-full-license/src/test/resources/rest-api-spec/test/querying_cluster/10_dls_fls.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-full-license/src/test/resources/rest-api-spec/test/querying_cluster/10_dls_fls.yml index ffdce6e336464..338d0d925da56 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-full-license/src/test/resources/rest-api-spec/test/querying_cluster/10_dls_fls.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-full-license/src/test/resources/rest-api-spec/test/querying_cluster/10_dls_fls.yml @@ -50,8 +50,8 @@ teardown: --- "Async search with document and field level security": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "async search available since 7.7" - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/100_analytics_usage.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/100_analytics_usage.yml index f0aafeccf5ca4..c8418197d044a 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/100_analytics_usage.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/100_analytics_usage.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.4.99" + - requires: + cluster_features: ["gte_v7.5.0"] reason: "analytics wasn't available before 7.5" - features: allowed_warnings + test_runner_features: allowed_warnings - do: bulk: index: analytics_usage @@ -18,8 +18,8 @@ setup: --- "Basic test for usage stats on analytics indices": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "stats are not working in earlier versions" - do: xpack.info: {} diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/110_enrich.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/110_enrich.yml index 2bafa1142683a..3b2648fe31773 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/110_enrich.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/110_enrich.yml @@ -1,7 +1,7 @@ --- "Enrich stats query smoke test for mixed cluster": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "Privilege change of enrich stats is backported to 7.9.0" - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/120_api_key.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/120_api_key.yml index 8cb9b33a1d0fe..8b14a4e1b668b 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/120_api_key.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/120_api_key.yml @@ -25,9 +25,10 @@ --- "Create API key with metadata in a mixed cluster (pre 7.13.0)": + - requires: + test_runner_features: [headers, node_selector] - skip: - features: [headers, node_selector] - version: "7.13.0 - " + cluster_features: ["gte_v7.13.0"] reason: "Support metadata on API keys introduced in 7.13.0" - do: @@ -46,9 +47,9 @@ --- "Create API key with metadata in a mixed cluster": - - skip: - features: [headers] - version: " - 7.12.99" + - requires: + test_runner_features: [headers] + cluster_features: ["gte_v7.13.0"] reason: "Support metadata on API keys introduced in 7.13.0" - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/130_operator_privileges.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/130_operator_privileges.yml index eafaecaa67eeb..2b5c3b418eb84 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/130_operator_privileges.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/130_operator_privileges.yml @@ -1,9 +1,9 @@ --- "Test operator privileges will work in the mixed cluster": - - skip: - features: headers - version: " - 7.10.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.11.0"] reason: "operator privileges are available since 7.11" # The default user ("test_user") is an operator, so this works diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/140_user_profile.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/140_user_profile.yml index 486f067310511..d84653003be36 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/140_user_profile.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/140_user_profile.yml @@ -2,8 +2,11 @@ "Test User Profile feature will work in a mixed cluster (pre 8.5.0)": - skip: - features: node_selector - version: " - 7.99.99, 8.5.0 - " + cluster_features: ["gte_v8.5.0"] + reason: "Does not work pre 8.0 (#86373) and response format changed after 8.5 (#89023)" + - requires: + test_runner_features: node_selector + cluster_features: ["gte_v8.0.0"] reason: "Does not work pre 8.0 (#86373) and response format changed after 8.5 (#89023)" - do: @@ -34,8 +37,8 @@ --- "Test User Profile feature will work in a mixed cluster": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "response format is changed to support multiple UIDs #89023" - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/150_profiling.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/150_profiling.yml index aae8eb2367f76..924b4b17f1e7a 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/150_profiling.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/150_profiling.yml @@ -1,7 +1,7 @@ --- "Test Profiling Index Management creates indices": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: status check API has been introduced with 8.11.0 - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml index 3dcc97edd6203..3030529024f3c 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml @@ -48,7 +48,7 @@ --- "Put job and datafeed with aggs in old cluster - pre-deprecated interval": - skip: - version: "7.1.99 - " + cluster_features: ["gte_v7.1.99"] reason: "calendar_interval introduced in 7.2.0" - do: @@ -118,9 +118,10 @@ --- "Put job and datafeed with aggs in old cluster - deprecated interval with warning before 8.0.0": - skip: - version: "8.0.0 - " + cluster_features: ["gte_v8.0.0"] reason: at version 8.0.0, deprecation warnings don't occur on get_stats - features: warnings + - requires: + test_runner_features: warnings - do: ml.put_job: @@ -192,8 +193,8 @@ --- "Put job and datafeed with aggs in old cluster - deprecated interval with warning after 8.0.0": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: at version 8.0.0, deprecation warnings don't occur on get_stats - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/150_profiling.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/150_profiling.yml index 0439ac4b0206c..2bb3c78feb84f 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/150_profiling.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/150_profiling.yml @@ -1,7 +1,7 @@ --- "Test Profiling Index Management updates indices": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: status check API has been introduced with 8.11.0 - do: diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml index acb52ad1a327e..a88f67b394783 100644 --- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml +++ b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings_regex"