Skip to content

Commit 99b75a9

Browse files
authored
deprecate types for watcher (#37594)
This commit adds deprecation warnings for index actions and search actions when executed via watcher. Unit and integration tests updated accordingly. relates #35190
1 parent 9ceb218 commit 99b75a9

File tree

33 files changed

+93
-83
lines changed

33 files changed

+93
-83
lines changed

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/10_basic.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"actions": {
2626
"test_index": {
2727
"index": {
28-
"index": "test",
29-
"doc_type": "test2"
28+
"index": "test"
3029
}
3130
}
3231
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/20_ack_individual_action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"actions": {
2626
"test_index": {
2727
"index": {
28-
"index": "test",
29-
"doc_type": "test2"
28+
"index": "test"
3029
}
3130
}
3231
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/30_reset_ack_after_unmet_condition.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ teardown:
3838
"indexme" : {
3939
"index" : {
4040
"index" : "my_test_index",
41-
"doc_type" : "my-type",
4241
"doc_id": "my-id"
4342
}
4443
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/40_reset_ack_after_unmet_action_condition.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ teardown:
3838
},
3939
"index" : {
4040
"index" : "my_test_index",
41-
"doc_type" : "my-type",
4241
"doc_id": "my-id"
4342
}
4443
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/activate_watch/10_basic.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"actions": {
2626
"test_index": {
2727
"index": {
28-
"index": "test",
29-
"doc_type": "test2"
28+
"index": "test"
3029
}
3130
}
3231
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/delete_watch/10_basic.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ teardown:
3838
"actions": {
3939
"test_index": {
4040
"index": {
41-
"index": "test",
42-
"doc_type": "test2"
41+
"index": "test"
4342
}
4443
}
4544
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/execute_watch/10_basic.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ teardown:
3333
"indexme" : {
3434
"index" : {
3535
"index" : "my_test_index",
36-
"doc_type" : "my-type",
3736
"doc_id": "my-id"
3837
}
3938
}
@@ -87,7 +86,6 @@ teardown:
8786
"indexme" : {
8887
"index" : {
8988
"index" : "my_test_index",
90-
"doc_type" : "my-type",
9189
"doc_id": "my-id"
9290
}
9391
}
@@ -130,7 +128,6 @@ teardown:
130128
"indexme" : {
131129
"index" : {
132130
"index" : "my_test_index",
133-
"doc_type" : "my-type",
134131
"refresh" : "wait_for",
135132
"doc_id": "my-id"
136133
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/execute_watch/20_transform.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ setup:
99
- do:
1010
index:
1111
index: my_test_index
12-
type: doc
1312
id: my_id
1413
refresh: true
1514
body: >
@@ -49,7 +48,6 @@ setup:
4948
"indexme" : {
5049
"index" : {
5150
"index" : "my_test_index",
52-
"doc_type" : "doc",
5351
"doc_id": "my-id"
5452
}
5553
}
@@ -64,7 +62,6 @@ setup:
6462
- do:
6563
get:
6664
index: my_test_index
67-
type: doc
6865
id: my_id
6966

7067
- match: { _source.key: "value" }
@@ -82,7 +79,6 @@ setup:
8279
- do:
8380
index:
8481
index: my_test_index
85-
type: doc
8682
id: my_id
8783
refresh: true
8884
body: >
@@ -123,7 +119,6 @@ setup:
123119
"indexme" : {
124120
"index" : {
125121
"index" : "my_test_index",
126-
"doc_type" : "doc",
127122
"doc_id": "my-id"
128123
}
129124
}
@@ -138,7 +133,6 @@ setup:
138133
- do:
139134
get:
140135
index: my_test_index
141-
type: doc
142136
id: my_id
143137

144138
- match: { _source.key: "value" }
@@ -183,7 +177,6 @@ setup:
183177
"indexme" : {
184178
"index" : {
185179
"index" : "my_test_index",
186-
"doc_type" : "doc",
187180
"doc_id": "my-id"
188181
}
189182
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/execute_watch/70_invalid.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"indexme" : {
3939
"index" : {
4040
"index" : "my_test_index",
41-
"doc_type" : "my-type",
4241
"doc_id": "my-id"
4342
}
4443
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/get_watch/10_basic.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ teardown:
3838
"actions": {
3939
"test_index": {
4040
"index": {
41-
"index": "test",
42-
"doc_type": "test2"
41+
"index": "test"
4342
}
4443
}
4544
}

0 commit comments

Comments
 (0)