From 23b74b0e59fe9ab2273d55a0e21f9112e820bd91 Mon Sep 17 00:00:00 2001 From: Nikola Grcevski <6207777+grcevski@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:59:58 -0400 Subject: [PATCH] [TEST] Use persistent settings in YML tests (#78480) Use persistent instead of transient settings for various REST YML tests, because we are deprecating the transient cluster settings. --- .../rest-api-spec/test/11_parent_child.yml | 6 +-- .../rest-api-spec/test/20_parent_join.yml | 6 +-- .../rest-api-spec/test/30_inner_hits.yml | 6 +-- .../test/reindex/25_no_auto_create.yml | 8 ++-- .../test/customsettings/10_settings.yml | 10 ++-- .../test/multi_cluster/10_basic.yml | 10 ++-- .../15_connection_mode_configuration.yml | 46 +++++++++---------- .../test/multi_cluster/20_info.yml | 38 +++++++-------- .../20_destructive_wildcard.yml | 4 +- .../test/scroll/20_keep_alive.yml | 4 +- .../search.aggregation/240_max_buckets.yml | 6 +-- .../test/search/320_disallow_queries.yml | 6 +-- .../rest-api-spec/test/ccr/auto_follow.yml | 16 +++---- .../test/ccr/follow_and_unfollow.yml | 4 +- .../rest-api-spec/test/ccr/follow_info.yml | 4 +- .../rest-api-spec/test/ccr/follow_stats.yml | 4 +- .../test/ccr/forget_follower.yml | 4 +- .../index_directly_into_follower_index.yml | 4 +- .../test/ml/data_frame_analytics_crud.yml | 8 ++-- .../rest-api-spec/test/ml/jobs_crud.yml | 16 +++---- .../test/ml/set_upgrade_mode.yml | 2 +- .../test/ml/start_stop_datafeed.yml | 8 ++-- .../put_watch/90_auto_create_index.yml | 4 +- .../rest-api-spec/test/stack/10_stack.yml | 2 +- .../build.gradle | 4 +- .../test/multi_cluster/10_basic.yml | 6 +-- .../test/multi_cluster/20_info.yml | 6 +-- .../70_connection_mode_configuration.yml | 46 +++++++++---------- 28 files changed, 144 insertions(+), 144 deletions(-) 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 3fa7c1f0e22b..a6a85fca47fd 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 @@ -35,7 +35,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: search.allow_expensive_queries: null --- @@ -76,11 +76,11 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: search.allow_expensive_queries: "false" flat_settings: true - - match: {transient: {search.allow_expensive_queries: "false"}} + - match: {persistent: {search.allow_expensive_queries: "false"}} - do: catch: /\[joining\] queries cannot be executed when \'search.allow_expensive_queries\' is set 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 22ded8254a4e..d92bea5a3c9a 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 @@ -37,7 +37,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: search.allow_expensive_queries: null --- @@ -129,11 +129,11 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: search.allow_expensive_queries: "false" flat_settings: true - - match: {transient: {search.allow_expensive_queries: "false"}} + - match: {persistent: {search.allow_expensive_queries: "false"}} - do: catch: /\[joining\] queries cannot be executed when \'search.allow_expensive_queries\' is set to false./ 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 e112a14ea3f5..21033baee328 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 @@ -53,7 +53,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: search.allow_expensive_queries: null --- @@ -95,11 +95,11 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: search.allow_expensive_queries: "false" flat_settings: true - - match: {transient: {search.allow_expensive_queries: "false"}} + - match: {persistent: {search.allow_expensive_queries: "false"}} - do: catch: /\[joining\] queries cannot be executed when \'search.allow_expensive_queries\' is set to false./ diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/25_no_auto_create.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/25_no_auto_create.yml index d7fb98549f88..b64da0831621 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/25_no_auto_create.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/25_no_auto_create.yml @@ -2,7 +2,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: action.auto_create_index: null --- @@ -15,7 +15,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: action.auto_create_index: false - do: catch: /no such index \[dest\] and \[action.auto_create_index\] is \[false\]/ @@ -31,7 +31,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: action.auto_create_index: test - do: index: @@ -52,7 +52,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: action.auto_create_index: test,-dest - do: index: diff --git a/plugins/examples/custom-settings/src/yamlRestTest/resources/rest-api-spec/test/customsettings/10_settings.yml b/plugins/examples/custom-settings/src/yamlRestTest/resources/rest-api-spec/test/customsettings/10_settings.yml index bf170f23b274..60c7e01061ec 100644 --- a/plugins/examples/custom-settings/src/yamlRestTest/resources/rest-api-spec/test/customsettings/10_settings.yml +++ b/plugins/examples/custom-settings/src/yamlRestTest/resources/rest-api-spec/test/customsettings/10_settings.yml @@ -23,7 +23,7 @@ - do: cluster.put_settings: body: - transient: + persistent: custom: bool: true validated: "updated" @@ -32,15 +32,15 @@ - do: cluster.get_settings: {} - - is_true: transient.custom.bool - - match: { transient.custom.validated: "updated" } + - is_true: persistent.custom.bool + - match: { persistent.custom.validated: "updated" } # Try to update the "validated" setting with a forbidden value - do: catch: bad_request cluster.put_settings: body: - transient: + persistent: custom: validated: "forbidden" @@ -48,7 +48,7 @@ - do: cluster.put_settings: body: - transient: + persistent: custom: bool: null validated: null diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml index c9b8ab3397c6..8bbbc7435ff5 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml @@ -235,7 +235,7 @@ - match: { aggregations.cluster.buckets.1.animal_length.value: 15 } --- -"Add transient remote cluster based on the preset cluster": +"Add persistent remote cluster based on the preset cluster": - do: cluster.get_settings: include_defaults: true @@ -246,10 +246,10 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.seeds: $remote_ip - - match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}} + - match: {persistent: {cluster.remote.test_remote_cluster.seeds: $remote_ip}} - do: search: @@ -276,10 +276,10 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.seeds: $remote_ip - - match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}} + - match: {persistent: {cluster.remote.test_remote_cluster.seeds: $remote_ip}} - do: search: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/15_connection_mode_configuration.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/15_connection_mode_configuration.yml index 05185cb3e332..41531e46b6c6 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/15_connection_mode_configuration.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/15_connection_mode_configuration.yml @@ -1,5 +1,5 @@ --- -"Add transient remote cluster in proxy mode with invalid sniff settings": +"Add persistent remote cluster in proxy mode with invalid sniff settings": - do: cluster.get_settings: include_defaults: true @@ -11,7 +11,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.node_connections: "5" cluster.remote.test_remote_cluster.proxy_address: $remote_ip @@ -26,7 +26,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.seeds: $remote_ip cluster.remote.test_remote_cluster.proxy_address: $remote_ip @@ -37,7 +37,7 @@ used with the configured \"cluster.remote.test_remote_cluster.mode\" [required=SNIFF, configured=PROXY]" } --- -"Add transient remote cluster in sniff mode with invalid proxy settings": +"Add persistent remote cluster in sniff mode with invalid proxy settings": - do: cluster.get_settings: include_defaults: true @@ -49,7 +49,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.proxy_socket_connections: "20" cluster.remote.test_remote_cluster.seeds: $remote_ip @@ -63,7 +63,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.proxy_address: $remote_ip cluster.remote.test_remote_cluster.seeds: $remote_ip @@ -73,7 +73,7 @@ used with the configured \"cluster.remote.test_remote_cluster.mode\" [required=PROXY, configured=SNIFF]" } --- -"Add transient remote cluster using proxy connection mode using valid settings": +"Add persistent remote cluster using proxy connection mode using valid settings": - do: cluster.get_settings: include_defaults: true @@ -84,14 +84,14 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.proxy_socket_connections: "3" cluster.remote.test_remote_cluster.proxy_address: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "proxy"} - - match: {transient.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "3"} - - match: {transient.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "proxy"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "3"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} - do: search: @@ -107,7 +107,7 @@ - match: { hits.hits.0._index: "test_remote_cluster:test_index" } --- -"Add transient remote cluster using sniff connection mode using valid settings": +"Add persistent remote cluster using sniff connection mode using valid settings": - do: cluster.get_settings: include_defaults: true @@ -118,14 +118,14 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "sniff" cluster.remote.test_remote_cluster.node_connections: "3" cluster.remote.test_remote_cluster.seeds: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "sniff"} - - match: {transient.cluster\.remote\.test_remote_cluster\.node_connections: "3"} - - match: {transient.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "sniff"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.node_connections: "3"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} - do: search: @@ -152,12 +152,12 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "sniff" cluster.remote.test_remote_cluster.seeds: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "sniff"} - - match: {transient.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "sniff"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} - do: search: @@ -177,7 +177,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.proxy_address: $remote_ip @@ -190,13 +190,13 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.seeds: null cluster.remote.test_remote_cluster.proxy_address: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "proxy"} - - match: {transient.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "proxy"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} - do: search: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml index f8a31c5ec921..144990163583 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml @@ -10,7 +10,7 @@ - match: { my_remote_cluster.mode: "sniff" } --- -"Add transient remote cluster based on the preset cluster and check remote info": +"Add persistent remote cluster based on the preset cluster and check remote info": - do: cluster.get_settings: include_defaults: true @@ -21,14 +21,14 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "sniff" cluster.remote.test_remote_cluster.node_connections: "2" cluster.remote.test_remote_cluster.seeds: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "sniff"} - - match: {transient.cluster\.remote\.test_remote_cluster\.node_connections: "2"} - - match: {transient.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "sniff"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.node_connections: "2"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} # we do another search here since this will enforce the connection to be established # otherwise the cluster might not have been connected yet. @@ -65,16 +65,16 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.seeds: null cluster.remote.test_remote_cluster.node_connections: null cluster.remote.test_remote_cluster.proxy_socket_connections: "10" cluster.remote.test_remote_cluster.proxy_address: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "proxy"} - - match: {transient.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "10"} - - match: {transient.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "proxy"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "10"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} - do: cluster.remote_info: {} @@ -89,7 +89,7 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: null cluster.remote.test_remote_cluster.proxy_socket_connections: null cluster.remote.test_remote_cluster.proxy_address: null @@ -106,10 +106,10 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.remote1.seeds: $remote_ip - - match: {transient: {cluster.remote.remote1.seeds: $remote_ip}} + - match: {persistent: {cluster.remote.remote1.seeds: $remote_ip}} - do: cluster.remote_info: {} @@ -118,10 +118,10 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.remote1.skip_unavailable: true - - is_true: transient.cluster.remote.remote1.skip_unavailable + - is_true: persistent.cluster.remote.remote1.skip_unavailable - do: cluster.remote_info: {} @@ -131,10 +131,10 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.remote1.skip_unavailable: false - - is_false: transient.cluster.remote.remote1.skip_unavailable + - is_false: persistent.cluster.remote.remote1.skip_unavailable - do: cluster.remote_info: {} @@ -144,10 +144,10 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.remote1.skip_unavailable: null - - match: {transient: {}} + - match: {persistent: {}} - do: cluster.remote_info: {} @@ -157,6 +157,6 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.remote1.seeds: null cluster.remote.remote1.skip_unavailable: null diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.delete/20_destructive_wildcard.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.delete/20_destructive_wildcard.yml index b1fb9b3b333b..f9f268a400d3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.delete/20_destructive_wildcard.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.delete/20_destructive_wildcard.yml @@ -3,7 +3,7 @@ setup: - do: cluster.put_settings: body: - transient: + persistent: action.destructive_requires_name: "true" flat_settings: true --- @@ -11,7 +11,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: action.destructive_requires_name: "false" flat_settings: true --- diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scroll/20_keep_alive.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scroll/20_keep_alive.yml index ab117eebbf60..40c91128d1c7 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scroll/20_keep_alive.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scroll/20_keep_alive.yml @@ -4,7 +4,7 @@ - do: cluster.put_settings: body: - transient: + persistent: search.max_keep_alive: null search.default_keep_alive: null @@ -29,7 +29,7 @@ - do: cluster.put_settings: body: - transient: + persistent: search.default_keep_alive: "1m" search.max_keep_alive: "1m" diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/240_max_buckets.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/240_max_buckets.yml index 9adf6343fbf9..7f94aeac64de 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/240_max_buckets.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.aggregation/240_max_buckets.yml @@ -70,7 +70,7 @@ setup: - do: cluster.put_settings: body: - transient: + persistent: search.max_buckets: null --- @@ -79,7 +79,7 @@ setup: - do: cluster.put_settings: body: - transient: + persistent: search.max_buckets: 3 - do: @@ -97,7 +97,7 @@ setup: - do: cluster.put_settings: body: - transient: + persistent: search.max_buckets: 6 - 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 7135c8642736..b301d64eb834 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 @@ -41,7 +41,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: search.allow_expensive_queries: null --- @@ -61,11 +61,11 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: search.allow_expensive_queries: "false" flat_settings: true - - match: {transient: {search.allow_expensive_queries: "false"}} + - match: {persistent: {search.allow_expensive_queries: "false"}} ### Prefix - do: 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 fb094f1b9974..5003ebfdc4d7 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 @@ -13,11 +13,11 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.local.seeds: $local_ip flat_settings: true - - match: {transient: {cluster.remote.local.seeds: $local_ip}} + - match: {persistent: {cluster.remote.local.seeds: $local_ip}} - do: ccr.put_auto_follow_pattern: @@ -71,11 +71,11 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.local.seeds: $local_ip flat_settings: true - - match: {transient: {cluster.remote.local.seeds: $local_ip}} + - match: {persistent: {cluster.remote.local.seeds: $local_ip}} - do: ccr.put_auto_follow_pattern: @@ -131,11 +131,11 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.local.seeds: $local_ip flat_settings: true - - match: {transient: {cluster.remote.local.seeds: $local_ip}} + - match: {persistent: {cluster.remote.local.seeds: $local_ip}} - do: ccr.put_auto_follow_pattern: @@ -192,11 +192,11 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.local.seeds: $local_ip flat_settings: true - - match: {transient: {cluster.remote.local.seeds: $local_ip}} + - match: {persistent: {cluster.remote.local.seeds: $local_ip}} - do: ccr.put_auto_follow_pattern: diff --git a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml index bfd00e7b1f87..78a0e67f1341 100644 --- a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml +++ b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml @@ -16,11 +16,11 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.local.seeds: $local_ip flat_settings: true - - match: {transient: {cluster.remote.local.seeds: $local_ip}} + - match: {persistent: {cluster.remote.local.seeds: $local_ip}} - do: indices.create: diff --git a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_info.yml b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_info.yml index 8383ecd4e685..f3224482c274 100644 --- a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_info.yml +++ b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_info.yml @@ -13,11 +13,11 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.local.seeds: $local_ip flat_settings: true - - match: {transient: {cluster.remote.local.seeds: $local_ip}} + - match: {persistent: {cluster.remote.local.seeds: $local_ip}} - do: indices.create: diff --git a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_stats.yml b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_stats.yml index 8be035961e97..df74a608dbe8 100644 --- a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_stats.yml +++ b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/follow_stats.yml @@ -13,11 +13,11 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.local.seeds: $local_ip flat_settings: true - - match: {transient: {cluster.remote.local.seeds: $local_ip}} + - match: {persistent: {cluster.remote.local.seeds: $local_ip}} - do: indices.create: diff --git a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/forget_follower.yml b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/forget_follower.yml index 91ff7cf6aed9..b4ed59a355ed 100644 --- a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/forget_follower.yml +++ b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/forget_follower.yml @@ -16,11 +16,11 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.remote_cluster.seeds: $local_ip flat_settings: true - - match: {transient: {cluster.remote.remote_cluster.seeds: $local_ip}} + - match: {persistent: {cluster.remote.remote_cluster.seeds: $local_ip}} - do: indices.create: diff --git a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/index_directly_into_follower_index.yml b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/index_directly_into_follower_index.yml index 406ffe092ac1..7beca43f02f8 100644 --- a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/index_directly_into_follower_index.yml +++ b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/index_directly_into_follower_index.yml @@ -16,11 +16,11 @@ - do: cluster.put_settings: body: - transient: + persistent: cluster.remote.local.seeds: $local_ip flat_settings: true - - match: {transient: {cluster.remote.local.seeds: $local_ip}} + - match: {persistent: {cluster.remote.local.seeds: $local_ip}} - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/data_frame_analytics_crud.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/data_frame_analytics_crud.yml index da0df533886f..0cfe76094682 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/data_frame_analytics_crud.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/data_frame_analytics_crud.yml @@ -991,9 +991,9 @@ setup: Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser cluster.put_settings: body: - transient: + persistent: xpack.ml.max_model_memory_limit: "20mb" - - match: {transient.xpack.ml.max_model_memory_limit: "20mb"} + - match: {persistent.xpack.ml.max_model_memory_limit: "20mb"} # Explicit request higher than limit is an error - do: @@ -1050,9 +1050,9 @@ setup: Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser cluster.put_settings: body: - transient: + persistent: xpack.ml.max_model_memory_limit: null - - match: {transient: {}} + - match: {persistent: {}} --- "Test put outlier_detection given n_neighbors is negative": diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/jobs_crud.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/jobs_crud.yml index 34850f8b22c6..d08b3f26060c 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/jobs_crud.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/jobs_crud.yml @@ -1206,9 +1206,9 @@ Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser cluster.put_settings: body: - transient: + persistent: xpack.ml.max_model_memory_limit: "9g" - - match: {transient.xpack.ml.max_model_memory_limit: "9g"} + - match: {persistent.xpack.ml.max_model_memory_limit: "9g"} - do: ml.put_job: @@ -1248,9 +1248,9 @@ Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser cluster.put_settings: body: - transient: + persistent: xpack.ml.max_model_memory_limit: null - - match: {transient: {}} + - match: {persistent: {}} - do: ml.put_job: @@ -1426,9 +1426,9 @@ Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser cluster.put_settings: body: - transient: + persistent: cluster.persistent_tasks.allocation.enable: "none" - - match: {transient.cluster.persistent_tasks.allocation.enable: "none"} + - match: {persistent.cluster.persistent_tasks.allocation.enable: "none"} - do: ml.put_job: @@ -1456,9 +1456,9 @@ Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser cluster.put_settings: body: - transient: + persistent: cluster.persistent_tasks.allocation.enable: "all" - - match: {transient.cluster.persistent_tasks.allocation.enable: "all"} + - match: {persistent.cluster.persistent_tasks.allocation.enable: "all"} - do: ml.open_job: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/set_upgrade_mode.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/set_upgrade_mode.yml index 7a463549e17e..4be85911e55f 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/set_upgrade_mode.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/set_upgrade_mode.yml @@ -64,7 +64,7 @@ setup: cluster.put_settings: body: > { - "transient": { + "persistent": { "logger.org.elasticsearch.xpack.ml.action.TransportSetUpgradeModeAction": "TRACE", "logger.org.elasticsearch.xpack.ml.action.TransportCloseJobAction": "TRACE", "logger.org.elasticsearch.xpack.ml.job.process.autodetect.AutodetectProcessManager": "TRACE" diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/start_stop_datafeed.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/start_stop_datafeed.yml index 996111bce527..25d268098c82 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/start_stop_datafeed.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/start_stop_datafeed.yml @@ -472,9 +472,9 @@ setup: Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser cluster.put_settings: body: - transient: + persistent: cluster.persistent_tasks.allocation.enable: "none" - - match: {transient.cluster.persistent_tasks.allocation.enable: "none"} + - match: {persistent.cluster.persistent_tasks.allocation.enable: "none"} - do: catch: /no persistent task assignments are allowed due to cluster settings/ @@ -492,9 +492,9 @@ setup: Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser cluster.put_settings: body: - transient: + persistent: cluster.persistent_tasks.allocation.enable: "all" - - match: {transient.cluster.persistent_tasks.allocation.enable: "all"} + - match: {persistent.cluster.persistent_tasks.allocation.enable: "all"} - do: ml.start_datafeed: diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/watcher/put_watch/90_auto_create_index.yml b/x-pack/plugin/watcher/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/watcher/put_watch/90_auto_create_index.yml index b9b9a39dab77..c247cf2dac1e 100644 --- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/watcher/put_watch/90_auto_create_index.yml +++ b/x-pack/plugin/watcher/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/watcher/put_watch/90_auto_create_index.yml @@ -6,7 +6,7 @@ setup: - do: cluster.put_settings: body: - transient: + persistent: action.auto_create_index: false --- @@ -18,7 +18,7 @@ teardown: - do: cluster.put_settings: body: - transient: + persistent: action.auto_create_index: null --- diff --git a/x-pack/qa/core-rest-tests-with-security/src/test/resources/rest-api-spec/test/stack/10_stack.yml b/x-pack/qa/core-rest-tests-with-security/src/test/resources/rest-api-spec/test/stack/10_stack.yml index 31f8cecdb1ce..47913dd98edd 100644 --- a/x-pack/qa/core-rest-tests-with-security/src/test/resources/rest-api-spec/test/stack/10_stack.yml +++ b/x-pack/qa/core-rest-tests-with-security/src/test/resources/rest-api-spec/test/stack/10_stack.yml @@ -2,7 +2,7 @@ - do: cluster.put_settings: body: - transient: + persistent: stack.templates.enabled: false - do: diff --git a/x-pack/qa/multi-cluster-search-security/build.gradle b/x-pack/qa/multi-cluster-search-security/build.gradle index 48da226f8efe..569a0d5dbd0e 100644 --- a/x-pack/qa/multi-cluster-search-security/build.gradle +++ b/x-pack/qa/multi-cluster-search-security/build.gradle @@ -63,8 +63,8 @@ tasks.register('mixed-cluster', RestIntegTestTask) { systemProperty 'tests.rest.suite', 'multi_cluster' if (proxyMode) { systemProperty 'tests.rest.blacklist', [ - 'multi_cluster/10_basic/Add transient remote cluster based on the preset cluster', - 'multi_cluster/20_info/Add transient remote cluster based on the preset cluster and check remote info', + 'multi_cluster/10_basic/Add persistent remote cluster based on the preset cluster', + 'multi_cluster/20_info/Add persistent remote cluster based on the preset cluster and check remote info', 'multi_cluster/20_info/Fetch remote cluster info for existing cluster', 'multi_cluster/70_connection_mode_configuration/*', ].join(",") diff --git a/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml b/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml index a90ed83c0242..c4bf53b0fa93 100644 --- a/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml +++ b/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml @@ -237,7 +237,7 @@ teardown: - match: { aggregations.cluster.buckets.0.doc_count: 5 } --- -"Add transient remote cluster based on the preset cluster": +"Add persistent remote cluster based on the preset cluster": - do: cluster.get_settings: include_defaults: true @@ -248,10 +248,10 @@ teardown: cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.seeds: $remote_ip - - match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}} + - match: {persistent: {cluster.remote.test_remote_cluster.seeds: $remote_ip}} - do: headers: { Authorization: "Basic am9lOnMza3JpdC1wYXNzd29yZA==" } diff --git a/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml b/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml index 7ee92405b5ff..790eb95da23d 100644 --- a/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml +++ b/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml @@ -43,7 +43,7 @@ teardown: - match: { my_remote_cluster.initial_connect_timeout: "30s" } --- -"Add transient remote cluster based on the preset cluster and check remote info": +"Add persistent remote cluster based on the preset cluster and check remote info": - do: cluster.get_settings: include_defaults: true @@ -54,10 +54,10 @@ teardown: cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.seeds: $remote_ip - - match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}} + - match: {persistent: {cluster.remote.test_remote_cluster.seeds: $remote_ip}} # we do another search here since this will enforce the connection to be established # otherwise the cluster might not have been connected yet. diff --git a/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/70_connection_mode_configuration.yml b/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/70_connection_mode_configuration.yml index 05185cb3e332..41531e46b6c6 100644 --- a/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/70_connection_mode_configuration.yml +++ b/x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/70_connection_mode_configuration.yml @@ -1,5 +1,5 @@ --- -"Add transient remote cluster in proxy mode with invalid sniff settings": +"Add persistent remote cluster in proxy mode with invalid sniff settings": - do: cluster.get_settings: include_defaults: true @@ -11,7 +11,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.node_connections: "5" cluster.remote.test_remote_cluster.proxy_address: $remote_ip @@ -26,7 +26,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.seeds: $remote_ip cluster.remote.test_remote_cluster.proxy_address: $remote_ip @@ -37,7 +37,7 @@ used with the configured \"cluster.remote.test_remote_cluster.mode\" [required=SNIFF, configured=PROXY]" } --- -"Add transient remote cluster in sniff mode with invalid proxy settings": +"Add persistent remote cluster in sniff mode with invalid proxy settings": - do: cluster.get_settings: include_defaults: true @@ -49,7 +49,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.proxy_socket_connections: "20" cluster.remote.test_remote_cluster.seeds: $remote_ip @@ -63,7 +63,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.proxy_address: $remote_ip cluster.remote.test_remote_cluster.seeds: $remote_ip @@ -73,7 +73,7 @@ used with the configured \"cluster.remote.test_remote_cluster.mode\" [required=PROXY, configured=SNIFF]" } --- -"Add transient remote cluster using proxy connection mode using valid settings": +"Add persistent remote cluster using proxy connection mode using valid settings": - do: cluster.get_settings: include_defaults: true @@ -84,14 +84,14 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.proxy_socket_connections: "3" cluster.remote.test_remote_cluster.proxy_address: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "proxy"} - - match: {transient.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "3"} - - match: {transient.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "proxy"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_socket_connections: "3"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} - do: search: @@ -107,7 +107,7 @@ - match: { hits.hits.0._index: "test_remote_cluster:test_index" } --- -"Add transient remote cluster using sniff connection mode using valid settings": +"Add persistent remote cluster using sniff connection mode using valid settings": - do: cluster.get_settings: include_defaults: true @@ -118,14 +118,14 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "sniff" cluster.remote.test_remote_cluster.node_connections: "3" cluster.remote.test_remote_cluster.seeds: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "sniff"} - - match: {transient.cluster\.remote\.test_remote_cluster\.node_connections: "3"} - - match: {transient.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "sniff"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.node_connections: "3"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} - do: search: @@ -152,12 +152,12 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "sniff" cluster.remote.test_remote_cluster.seeds: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "sniff"} - - match: {transient.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "sniff"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.seeds: $remote_ip} - do: search: @@ -177,7 +177,7 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.proxy_address: $remote_ip @@ -190,13 +190,13 @@ cluster.put_settings: flat_settings: true body: - transient: + persistent: cluster.remote.test_remote_cluster.mode: "proxy" cluster.remote.test_remote_cluster.seeds: null cluster.remote.test_remote_cluster.proxy_address: $remote_ip - - match: {transient.cluster\.remote\.test_remote_cluster\.mode: "proxy"} - - match: {transient.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} + - match: {persistent.cluster\.remote\.test_remote_cluster\.mode: "proxy"} + - match: {persistent.cluster\.remote\.test_remote_cluster\.proxy_address: $remote_ip} - do: search: