From 7b0f2628cbb9efccd8bb3dad03e56867cc11c53c Mon Sep 17 00:00:00 2001 From: jaymode Date: Thu, 8 Oct 2015 09:09:00 -0400 Subject: [PATCH] updates to handle renamed RenderSearchTemplateAction Original commit: elastic/x-pack-elasticsearch@03cb49ce5269006307dd13a40b68b8d070327517 --- qa/shield-core-rest-tests/pom.xml | 2 +- shield/docs/public/reference.asciidoc | 2 +- shield/src/test/resources/org/elasticsearch/transport/actions | 2 +- shield/src/test/resources/org/elasticsearch/transport/handlers | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/shield-core-rest-tests/pom.xml b/qa/shield-core-rest-tests/pom.xml index 0889f3e929c..62f358d7944 100644 --- a/qa/shield-core-rest-tests/pom.xml +++ b/qa/shield-core-rest-tests/pom.xml @@ -23,7 +23,7 @@ true ${project.basedir}/integration-tests.xml true - indices.get/10_basic/*allow_no_indices*,cat.count/10_basic/Test cat count output,cat.aliases/10_basic/Empty cluster,indices.segments/10_basic/no segments test,indices.clear_cache/10_basic/clear_cache test,indices.status/10_basic/Indices status test,cat.indices/10_basic/Test cat indices output,cat.recovery/10_basic/Test cat recovery output,cat.shards/10_basic/Test cat shards output,termvector/20_issue7121/*,index/10_with_id/Index with ID,indices.get_alias/20_emtpy/*,cat.segments/10_basic/Test cat segments output,indices.put_settings/10_basic/Test indices settings allow_no_indices,indices.put_settings/10_basic/Test indices settings ignore_unavailable,indices.refresh/10_basic/Indices refresh test no-match wildcard,indices.stats/10_index/Index - star*,indices.recovery/10_basic/Indices recovery test*,template/30_render_search_template/*,indices.shard_stores/10_basic/no indices test,cat.nodeattrs/10_basic/Test cat nodes attrs output + indices.get/10_basic/*allow_no_indices*,cat.count/10_basic/Test cat count output,cat.aliases/10_basic/Empty cluster,indices.segments/10_basic/no segments test,indices.clear_cache/10_basic/clear_cache test,indices.status/10_basic/Indices status test,cat.indices/10_basic/Test cat indices output,cat.recovery/10_basic/Test cat recovery output,cat.shards/10_basic/Test cat shards output,termvector/20_issue7121/*,index/10_with_id/Index with ID,indices.get_alias/20_emtpy/*,cat.segments/10_basic/Test cat segments output,indices.put_settings/10_basic/Test indices settings allow_no_indices,indices.put_settings/10_basic/Test indices settings ignore_unavailable,indices.refresh/10_basic/Indices refresh test no-match wildcard,indices.stats/10_index/Index - star*,indices.recovery/10_basic/Indices recovery test*,indices.shard_stores/10_basic/no indices test,cat.nodeattrs/10_basic/Test cat nodes attrs output license,shield diff --git a/shield/docs/public/reference.asciidoc b/shield/docs/public/reference.asciidoc index 22e3c849ec6..fda22e60356 100644 --- a/shield/docs/public/reference.asciidoc +++ b/shield/docs/public/reference.asciidoc @@ -67,6 +67,7 @@ Elasticsearch. This only applies to publicly available indices and cluster actio [float] ===== Cluster actions privileges +* `cluster:admin/render/template/search` * `cluster:admin/repository/delete` * `cluster:admin/repository/get` * `cluster:admin/repository/put` @@ -118,7 +119,6 @@ NOTE: While indices template actions typically relate to indices, they are categ * `indices:admin/open` * `indices:admin/optimize` * `indices:admin/refresh` -* `indices:admin/render/template/search` * `indices:admin/settings/update` * `indices:admin/shards/search_shards` * `indices:admin/template/delete` diff --git a/shield/src/test/resources/org/elasticsearch/transport/actions b/shield/src/test/resources/org/elasticsearch/transport/actions index 70f8218bdab..36e7cff6027 100644 --- a/shield/src/test/resources/org/elasticsearch/transport/actions +++ b/shield/src/test/resources/org/elasticsearch/transport/actions @@ -1,3 +1,4 @@ +cluster:admin/render/template/search cluster:admin/repository/delete cluster:admin/repository/get cluster:admin/repository/put @@ -33,7 +34,6 @@ indices:admin/mappings/get indices:admin/open indices:admin/optimize indices:admin/refresh -indices:admin/render/template/search indices:admin/settings/update indices:admin/shards/search_shards indices:admin/template/delete diff --git a/shield/src/test/resources/org/elasticsearch/transport/handlers b/shield/src/test/resources/org/elasticsearch/transport/handlers index 26eac0ea059..bf30466c5a4 100644 --- a/shield/src/test/resources/org/elasticsearch/transport/handlers +++ b/shield/src/test/resources/org/elasticsearch/transport/handlers @@ -1,3 +1,4 @@ +cluster:admin/render/template/search cluster:admin/snapshot/status[nodes] cluster:admin/snapshot/status[nodes][n] cluster:monitor/nodes/hot_threads[n] @@ -16,7 +17,6 @@ indices:admin/mappings/fields/get[index][s] indices:admin/optimize[n] indices:admin/refresh[s] indices:admin/refresh[s][r] -indices:admin/render/template/search indices:admin/upgrade indices:admin/upgrade[n] indices:admin/validate/query[s]