Removed cloud ID, App Search and ES3 client variants; updated version

Author: technige

README.md

@@ -1,7 +1,6 @@
 # Escli
 
 Escli is a tool for interacting with an Elasticsearch service via the command line.
-It can also be used with Serverless or Enterprise App Search backends.
 
 This project began as an experimental side project during November 2021, implementing a limited set of functionality.
 It is currently considered prototypical, and not suitable for production use.
@@ -30,8 +29,8 @@ The current installed version of `escli` can be shown using the `escli version`
 ## Quick Search Example
 
 ```bash
-$ export ESCLI_CLOUD_ID=xxxx:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-$ export ESCLI_PASSWORD=XXXXXXXXXXXXXXXXXXXX
+$ export ESCLI_ADDR=https://xxxxxxx.elastic.cloud:443
+$ export ESCLI_API_KEY=xxxxxxx
 $ escli search kibana_sample_data_flights -i "FlightNum,OriginAirportID,DestAirportID" -n 15
 FlightNum    DestAirportID    OriginAirportID
 -----------  ---------------  -----------------
@@ -53,36 +52,14 @@ DMYXR3E      NRT              UIO
 ```
 
 
-## Operating Modes
-
-By default, `escli` operates in Elasticsearch mode, which expects a regular Elasticsearch service to be available.
-
-To switch to App Search or Serverless mode, instead use the `escli.a` or `escli.s` commands respectively.
-
-```bash
-$ escli.s search books
-name                 author             release_date      page_count
--------------------  -----------------  --------------  ------------
-Snow Crash           Neal Stephenson    1992-06-01               470
-Revelation Space     Alastair Reynolds  2000-03-15               585
-1984                 George Orwell      1985-06-01               328
-Fahrenheit 451       Ray Bradbury       1953-10-15               227
-Brave New World      Aldous Huxley      1932-06-01               268
-The Handmaid's Tale  Margaret Atwood    1985-06-01               311
-```
-
 ## Connectivity & Authentication
 
 The `escli` tool relies on connection details and credentials supplied through environment variables.
-For a default [Elastic Cloud](https://www.elastic.co/cloud/) deployment, only the `ESCLI_CLOUD_ID` and `ESCLI_PASSWORD` variables will generally need to be set.
-Other variables are available for use with local, on-prem, and other customised deployments.
+Typically, only the `ESCLI_ADDR` and `ESCLI_API_KEY` variables will generally need to be set, although
+other variables are available.
 
 The following variables are accepted:
 
-### `ESCLI_CLOUD_ID`
-The [Cloud ID](https://www.elastic.co/guide/en/cloud/current/ec-cloud-id.html) of an Elastic Cloud deployment.
-If using a local or on-prem deployment, this can remain unset.
-
 ### `ESCLI_ADDR` 
 The host names or URLs to which to connect.
 This does not need to be set if `ESCLI_CLOUD_ID` is set.

escli/VERSION

@@ -1 +1 @@
-2023.9.dev13
+2024.9.dev14

escli/__main__.py

@@ -20,22 +20,14 @@
 from escli.services import SPI
 
 
-def main(mode=None):
+def main():
     spi = SPI()
     cli = CLI(spi)
     spi.init_logging(cli.args.verbose - cli.args.quiet)
-    spi.init_client(mode)
+    spi.init_client()
     status = cli.process()
     exit(status)
 
 
-def main_app_search():
-    main(mode="a")
-
-
-def main_serverless():
-    main(mode="s")
-
-
 if __name__ == '__main__':
     main()

escli/services/__init__.py

@@ -70,8 +70,8 @@ def init_logging(self, verbosity):
         else:
             basicConfig(format=self.log_format, level=CRITICAL)
 
-    def init_client(self, mode=None):
-        self.__client = Client.create(mode)
+    def init_client(self):
+        self.__client = Client.create()
 
 
 class Client(ABC):
@@ -83,14 +83,11 @@ def get_settings_from_env(cls, default_user="elastic"):
         """ Build and return a dictionary of client keyword settings
         based on available environment variables.
         """
-        cloud_id = getenv("ESCLI_CLOUD_ID")
         addr = getenv("ESCLI_ADDR")
         user = getenv("ESCLI_USER", default_user)
         password = getenv("ESCLI_PASSWORD")
         api_key = getenv("ESCLI_API_KEY")
         settings = {}
-        if cloud_id:
-            settings["cloud_id"] = cloud_id
         if addr:
             settings["hosts"] = addr.split(",")
         if password:
@@ -100,16 +97,9 @@ def get_settings_from_env(cls, default_user="elastic"):
         return settings
 
     @classmethod
-    def create(cls, mode=None):
-        if mode == "s":
-            from escli.services.serverless import ElasticsearchServerlessClient
-            return ElasticsearchServerlessClient()
-        elif mode == "a":
-            from escli.services.enterprisesearch import AppSearchClient
-            return AppSearchClient()
-        else:
-            from escli.services.elasticsearch import ElasticsearchClient
-            return ElasticsearchClient()
+    def create(cls):
+        from escli.services.elasticsearch import ElasticsearchClient
+        return ElasticsearchClient()
 
     def info(self):
         """ Return backend system information.

escli/services/enterprisesearch.py

@@ -1,4 +1,2 @@
 elasticsearch
-elasticsearch-serverless
-elastic_enterprise_search
 tabulate

escli/services/serverless.py

@@ -11,17 +11,13 @@ long_description_content_type = text/markdown
 include_package_data = True
 install_requires =
     elasticsearch
-    elasticsearch-serverless
-    elastic_enterprise_search
     tabulate
 packages = find:
 python_requires = >=3.6
 
 [options.entry_points]
 console_scripts =
     escli = escli.__main__:main
-    escli.a = escli.__main__:main_app_search
-    escli.s = escli.__main__:main_serverless
 
 [bdist_wheel]
 universal = 1