From b15488f2159662cdf1e3fbfa9e511ac9f006e604 Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Tue, 10 Mar 2020 10:25:57 -0500 Subject: [PATCH 1/3] Restore default metric='_all' to cluster.state() --- elasticsearch/client/cluster.py | 3 +++ utils/templates/overrides/cluster/state | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 utils/templates/overrides/cluster/state diff --git a/elasticsearch/client/cluster.py b/elasticsearch/client/cluster.py index 0b3dee937..7e23b2d7c 100644 --- a/elasticsearch/client/cluster.py +++ b/elasticsearch/client/cluster.py @@ -102,6 +102,9 @@ def state(self, metric=None, index=None, params=None): :arg wait_for_timeout: The maximum time to wait for wait_for_metadata_version before timing out """ + if index and not metric: + metric = "_all" + return self.transport.perform_request( "GET", _make_path("_cluster", "state", metric, index), params=params ) diff --git a/utils/templates/overrides/cluster/state b/utils/templates/overrides/cluster/state new file mode 100644 index 000000000..419ce2f68 --- /dev/null +++ b/utils/templates/overrides/cluster/state @@ -0,0 +1,8 @@ +{% extends "base" %} +{% block request %} + if index and not metric: + metric = "_all" + + {{ super()|trim }} +{% endblock %} + From 9cad21f3ff8eafe15e642e0d07fcd895e87a8521 Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Tue, 10 Mar 2020 10:56:09 -0500 Subject: [PATCH 2/3] Add test cases for template overrides --- .../test_client/test_cluster.py | 27 +++++++++++++++++++ .../test_client/test_indices.py | 4 +++ test_elasticsearch/test_server/__init__.py | 9 ++++++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 test_elasticsearch/test_client/test_cluster.py diff --git a/test_elasticsearch/test_client/test_cluster.py b/test_elasticsearch/test_client/test_cluster.py new file mode 100644 index 000000000..a0b9d7414 --- /dev/null +++ b/test_elasticsearch/test_client/test_cluster.py @@ -0,0 +1,27 @@ +from test_elasticsearch.test_cases import ElasticsearchTestCase + + +class TestCluster(ElasticsearchTestCase): + def test_stats_without_node_id(self): + self.client.cluster.stats() + self.assert_url_called("GET", "/_cluster/stats") + + def test_stats_with_node_id(self): + self.client.cluster.stats("node-1") + self.assert_url_called("GET", "/_cluster/stats/nodes/node-1") + + self.client.cluster.stats(node_id="node-2") + self.assert_url_called("GET", "/_cluster/stats/nodes/node-2") + + def test_state_with_index_without_metric_defaults_to_all(self): + self.client.cluster.state() + self.assert_url_called("GET", "/_cluster/state") + + self.client.cluster.state(metric="cluster_name") + self.assert_url_called("GET", "/_cluster/state/cluster_name") + + self.client.cluster.state(index="index-1") + self.assert_url_called("GET", "/_cluster/state/_all/index-1") + + self.client.cluster.state(index="index-1", metric="cluster_name") + self.assert_url_called("GET", "/_cluster/state/cluster_name/index-1") diff --git a/test_elasticsearch/test_client/test_indices.py b/test_elasticsearch/test_client/test_indices.py index 7d80562a7..7fdfc7349 100644 --- a/test_elasticsearch/test_client/test_indices.py +++ b/test_elasticsearch/test_client/test_indices.py @@ -18,3 +18,7 @@ def test_passing_empty_value_for_required_param_raises_exception(self): self.assertRaises(ValueError, self.client.indices.exists, index=None) self.assertRaises(ValueError, self.client.indices.exists, index=[]) self.assertRaises(ValueError, self.client.indices.exists, index="") + + def test_put_mapping_without_index(self): + self.client.indices.put_mapping(doc_type="doc-type", body={}) + self.assert_url_called("PUT", "/_all/doc-type/_mapping") diff --git a/test_elasticsearch/test_server/__init__.py b/test_elasticsearch/test_server/__init__.py index 9c1166755..159750a6b 100644 --- a/test_elasticsearch/test_server/__init__.py +++ b/test_elasticsearch/test_server/__init__.py @@ -1,3 +1,4 @@ +from unittest import SkipTest from elasticsearch.helpers import test from elasticsearch.helpers.test import ElasticsearchTestCase as BaseTestCase @@ -6,6 +7,8 @@ def get_client(**kwargs): global client + if client is False: + raise SkipTest("No client is available") if client is not None and not kwargs: return client @@ -16,7 +19,11 @@ def get_client(**kwargs): new_client = local_get_client(**kwargs) except ImportError: # fallback to using vanilla client - new_client = test.get_test_client(**kwargs) + try: + new_client = test.get_test_client(**kwargs) + except SkipTest: + client = False + raise if not kwargs: client = new_client From 7de998ba3a956b69f7c6a180f03599aebefdcc80 Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Tue, 10 Mar 2020 11:00:38 -0500 Subject: [PATCH 3/3] Check if metric is in SKIP_IN_PATH --- elasticsearch/client/cluster.py | 2 +- utils/templates/overrides/cluster/state | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/client/cluster.py b/elasticsearch/client/cluster.py index 7e23b2d7c..14fa7e943 100644 --- a/elasticsearch/client/cluster.py +++ b/elasticsearch/client/cluster.py @@ -102,7 +102,7 @@ def state(self, metric=None, index=None, params=None): :arg wait_for_timeout: The maximum time to wait for wait_for_metadata_version before timing out """ - if index and not metric: + if index and metric in SKIP_IN_PATH: metric = "_all" return self.transport.perform_request( diff --git a/utils/templates/overrides/cluster/state b/utils/templates/overrides/cluster/state index 419ce2f68..27d599cbf 100644 --- a/utils/templates/overrides/cluster/state +++ b/utils/templates/overrides/cluster/state @@ -1,6 +1,6 @@ {% extends "base" %} {% block request %} - if index and not metric: + if index and metric in SKIP_IN_PATH: metric = "_all" {{ super()|trim }}