Skip to content

Commit 31e32aa

Browse files
authored
[TEST] Allow more warnings about multiple template matches (#56085)
Adds some extra allowed warnings about multiple index templates matching on index creation of the same type that were added in #56038.
1 parent 3a64ecb commit 31e32aa

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- skip:
55
version: " - 6.6.99"
66
reason: Merging typeless/typed mappings/templates was added in 6.7
7+
features: allowed_warnings
78

89
- do:
910
indices.put_template:
@@ -18,6 +19,8 @@
1819
type: keyword
1920

2021
- do:
22+
allowed_warnings:
23+
- "index [test-1] matches multiple v1 templates [global, test_template], v2 index templates will only match a single index template"
2124
indices.create:
2225
index: test-1
2326
body:
@@ -42,6 +45,7 @@
4245
- skip:
4346
version: " - 6.6.99"
4447
reason: Merging typeless/typed mappings/templates was added in 6.7
48+
features: allowed_warnings
4549

4650
- do:
4751
indices.put_template:
@@ -55,6 +59,8 @@
5559
type: keyword
5660

5761
- do:
62+
allowed_warnings:
63+
- "index [test-1] matches multiple v1 templates [global, test_template], v2 index templates will only match a single index template"
5864
indices.create:
5965
include_type_name: true
6066
index: test-1
@@ -106,6 +112,7 @@
106112
- skip:
107113
version: " - 6.99.99"
108114
reason: needs typeless index operations to work on typed indices
115+
features: allowed_warnings
109116

110117
- do:
111118
indices.put_template:
@@ -120,6 +127,8 @@
120127
type: keyword
121128

122129
- do:
130+
allowed_warnings:
131+
- "index [test-1] matches multiple v1 templates [global, test_template], v2 index templates will only match a single index template"
123132
index:
124133
index: test-1
125134
body: { bar: 42 }

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/110_geo_shape.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
---
22
"Test upgraded > 7.7 cluster with pre-7.8 and 7.8+ geo_shape fields":
3+
- skip:
4+
features: allowed_warnings
35
- do:
6+
allowed_warnings:
7+
- "index [new_locations] matches multiple v1 templates [global, template], v2 index templates will only match a single index template"
48
indices.create:
59
index: new_locations
610
body:

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ setup:
88

99
---
1010
"Test old and mixed cluster datafeeds without aggs":
11+
- skip:
12+
features: allowed_warnings
1113
- do:
14+
allowed_warnings:
15+
- "index [airline-data] matches multiple v1 templates [global, template], v2 index templates will only match a single index template"
1216
indices.create:
1317
index: airline-data
1418
body:
@@ -108,6 +112,8 @@ setup:
108112
- skip:
109113
features: allowed_warnings
110114
- do:
115+
allowed_warnings:
116+
- "index [airline-data] matches multiple v1 templates [global, template], v2 index templates will only match a single index template"
111117
indices.create:
112118
index: airline-data
113119
body:

0 commit comments

Comments
 (0)