Allow access to xpack methods without .xpack

Author: honzakral

elasticsearch/client/__init__.py

@@ -12,7 +12,7 @@
 from .remote import RemoteClient
 from .snapshot import SnapshotClient
 from .tasks import TasksClient
-from .xpack import XPackClient
+from .xpack import XPackClient, XPACK_NAMESPACES
 from .utils import query_params, _make_path, SKIP_IN_PATH
 
 logger = logging.getLogger("elasticsearch")
@@ -214,6 +214,12 @@ def __init__(self, hosts=None, transport_class=Transport, **kwargs):
         self.remote = RemoteClient(self)
         self.snapshot = SnapshotClient(self)
         self.tasks = TasksClient(self)
+
+        # new style access to x-pack features without .xpack step
+        for namespace, NamespacedClient in XPACK_NAMESPACES.items():
+            setattr(self, namespace, NamespacedClient(self))
+
+        # old style xpack access
         self.xpack = XPackClient(self)
 
     def __repr__(self):

elasticsearch/client/xpack/__init__.py

@@ -16,27 +16,30 @@
 from .ssl import SslClient
 from .watcher import WatcherClient
 
+XPACK_NAMESPACES = {
+    "ccr": CcrClient,
+    "data_frame": Data_FrameClient,
+    "deprecation": DeprecationClient,
+    "graph": GraphClient,
+    "ilm": IlmClient,
+    "indices": IndicesClient,
+    "license": LicenseClient,
+    "migration": MigrationClient,
+    "ml": MlClient,
+    "monitoring": MonitoringClient,
+    "rollup": RollupClient,
+    "security": SecurityClient,
+    "sql": SqlClient,
+    "ssl": SslClient,
+    "watcher": WatcherClient,
+}
 
 class XPackClient(NamespacedClient):
-    namespace = "xpack"
-
     def __init__(self, *args, **kwargs):
         super(XPackClient, self).__init__(*args, **kwargs)
-        self.ccr = CcrClient(self.client)
-        self.data_frame = Data_FrameClient(self.client)
-        self.deprecation = DeprecationClient(self.client)
-        self.graph = GraphClient(self.client)
-        self.ilm = IlmClient(self.client)
-        self.indices = IndicesClient(self.client)
-        self.license = LicenseClient(self.client)
-        self.migration = MigrationClient(self.client)
-        self.ml = MlClient(self.client)
-        self.monitoring = MonitoringClient(self.client)
-        self.rollup = RollupClient(self.client)
-        self.security = SecurityClient(self.client)
-        self.sql = SqlClient(self.client)
-        self.ssl = SslClient(self.client)
-        self.watcher = WatcherClient(self.client)
+
+        for namespace in XPACK_NAMESPACES:
+            setattr(self, namespace, getattr(self.client, namespace))
 
     @query_params("categories", "human")
     def info(self, params=None):