More yml massaging

costin · Feb 7, 2024 · b210e2b · b210e2b
1 parent 96a2fea
commit b210e2b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/id.csv-spec
@@ -4,6 +4,7 @@
 
 selectAll
 FROM apps [metadata _id];
+warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
 ignoreOrder:true
 
 id:integer |name:keyword   |version:version     | _id:keyword
@@ -25,20 +26,24 @@ id:integer |name:keyword   |version:version     | _id:keyword
 
 filterById
 FROM apps [metadata _id]| WHERE _id == "4";
+warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 id:i |name:k |version:v | _id:k
 4    |ddddd  |2.12.0    | 4
 ;
 
 keepId
 FROM apps [metadata _id] | WHERE id == 3 | KEEP _id;
+warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
+
 
 _id:k
 3
 ;
 
 idRangeAndSort
 FROM apps [metadata _id] | WHERE _id >= "2" AND _id <= "7" | SORT _id | keep id, name, _id;
+warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 id:i    |name:k       | _id:k
 2       |bbbbb        | 2
@@ -51,6 +56,7 @@ id:i    |name:k       | _id:k
 
 orderById
 FROM apps [metadata _id] | KEEP _id, name | SORT _id;
+warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 _id:k  | name:s
 1      | aaaaa
@@ -71,6 +77,7 @@ _id:k  | name:s
 
 orderByIdDesc
 FROM apps [metadata _id] | KEEP _id, name | SORT _id DESC;
+warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 _id:k  | name:s
 
@@ -92,6 +99,7 @@ _id:k  | name:s
 
 concatId
 FROM apps [metadata _id] | eval c = concat(_id, name) | SORT _id | KEEP c;
+warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 c:k
 1aaaaa
@@ -112,6 +120,7 @@ c:k
 
 statsOnId
 FROM apps [metadata _id] | stats c = count(_id), d = count_distinct(_id);
+warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 c:l | d:l
 14  | 14
@@ -120,6 +129,7 @@ c:l | d:l
 
 statsOnIdByGroup
 FROM apps [metadata _id] | stats c = count(_id) by name | sort c desc, name | limit 5;
+warning:Line 1:11: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 c:l | name:k
 2   | aaaaa

diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/metadata-IT_tests_only.csv-spec
@@ -1,7 +1,7 @@
 
 simpleKeep
 from employees [metadata _index, _version] | sort emp_no | limit 2 | keep emp_no, _index, _version;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 emp_no:integer |_index:keyword |_version:long
 10001          |employees      |1
@@ -10,7 +10,7 @@ emp_no:integer |_index:keyword |_version:long
 
 aliasWithSameName
 from employees [metadata _index, _version] | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 emp_no:integer |_index:keyword |_version:long
 10001          |employees      |1
@@ -19,7 +19,7 @@ emp_no:integer |_index:keyword |_version:long
 
 inComparison
 from employees [metadata _index, _version] | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 emp_no:integer
@@ -42,7 +42,7 @@ max:integer |_index:keyword
 
 metaIndexAliasedInAggs
 from employees [metadata _index] | eval _i = _index | stats max = max(emp_no) by _i;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 max:integer |_i:keyword
@@ -51,7 +51,7 @@ max:integer |_i:keyword
 
 metaVersionInAggs
 from employees [metadata _version] | stats min = min(emp_no) by _version;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 min:integer |_version:long
@@ -60,7 +60,7 @@ min:integer |_version:long
 
 metaVersionAliasedInAggs
 from employees [metadata _version] | eval _v = _version | stats min = min(emp_no) by _v;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 min:integer |_v:long
@@ -69,7 +69,7 @@ min:integer |_v:long
 
 inAggsAndAsGroups
 from employees [metadata _index, _version] | stats max = max(_version) by _index;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 max:long |_index:keyword
@@ -78,7 +78,7 @@ max:long |_index:keyword
 
 inAggsAndAsGroupsAliased
 from employees [metadata _index, _version] | eval _i = _index, _v = _version | stats max = max(_v) by _i;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 max:long |_i:keyword
@@ -87,7 +87,7 @@ max:long |_i:keyword
 
 inFunction
 from employees [metadata _index, _version] | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 emp_no:integer
@@ -97,7 +97,7 @@ emp_no:integer
 
 inArithmetics
 from employees [metadata _index, _version] | eval i = _version + 2 | stats min = min(emp_no) by i;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 min:integer |i:long
@@ -106,7 +106,7 @@ min:integer |i:long
 
 inSort
 from employees [metadata _index, _version] | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 emp_no:integer |_version:long |_index:keyword
@@ -116,7 +116,7 @@ emp_no:integer |_version:long |_index:keyword
 
 withMvFunction
 from employees [metadata _version] | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 min:integer |i:double
@@ -125,7 +125,7 @@ min:integer |i:double
 
 overwritten
 from employees [metadata _index, _version] | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3;
-warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration.
+warning:Line 1:16: Square brackets '[]' need to be removed in FROM METADATA declaration
 
 
 emp_no:integer |_index:integer |_version:keyword

diff --git a/...acy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml b/...acy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml
@@ -91,6 +91,8 @@ teardown:
       features: allowed_warnings
 
   - do:
+      allowed_warnings:
+        - "Line 1:21: Square brackets '[]' need to be removed in FROM METADATA declaration"
       headers: { Authorization: "Basic am9lOnMza3JpdC1wYXNzd29yZA==" }
       esql.query:
         body:
@@ -114,7 +116,7 @@ teardown:
 
   - do:
       allowed_warnings:
-        - "Line 1:19: Square brackets '[]' need to be removed in FROM METADATA declaration"
+        - "Line 1:21: Square brackets '[]' need to be removed in FROM METADATA declaration"
       headers: { Authorization: "Basic am9lOnMza3JpdC1wYXNzd29yZA==" }
       esql.query:
         body: