Update Cloud ID default port, parsing of Cloud ID

Author: sethmlarson

docs/index.rst

@@ -230,6 +230,27 @@ description of the options.
 
 .. _certifi: http://certifiio.readthedocs.io/en/latest/
 
+Connecting via Cloud ID
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Cloud ID is an easy way to configure your client to work
+with your Elastic Cloud deployment. Combine the ``cloud_id``
+with either ``http_auth`` or ``api_key`` to authenticate
+with your Elastic Cloud deployment.
+
+Using ``cloud_id`` enables TLS verification and HTTP compression by default
+and sets the port to ``443`` unless otherwise overwritten via the ``port`` parameter
+or the port value encoded within ``cloud_id``.  Using Cloud ID also disables sniffing.
+
+.. code-block:: python
+
+    from elasticsearch import Elasticsearch
+
+    es = Elasticsearch(
+        cloud_id="cluster-1:dXMa5Fx...",
+        http_auth=("elastic", "<password>"),
+    )
+
 APIKey Authentication
 ~~~~~~~~~~~~~~~~~~~~~~
 

elasticsearch/connection/base.py

@@ -44,7 +44,7 @@ class Connection(object):
     def __init__(
         self,
         host="localhost",
-        port=9200,
+        port=None,
         use_ssl=False,
         url_prefix="",
         timeout=10,
@@ -59,20 +59,28 @@ def __init__(
         if cloud_id:
             try:
                 _, cloud_id = cloud_id.split(":")
-                parent_dn, es_uuid, _ = (
+                parent_dn, es_uuid = (
                     binascii.a2b_base64(cloud_id.encode("utf-8"))
                     .decode("utf-8")
-                    .split("$")
+                    .split("$")[:2]
                 )
-            except ValueError:
+                if ":" in parent_dn:
+                    parent_dn, _, parent_port = parent_dn.rpartition(":")
+                    if port is None and parent_port != "443":
+                        port = int(parent_port)
+            except (ValueError, IndexError):
                 raise ImproperlyConfigured("'cloud_id' is not properly formatted")
 
             host = "%s.%s" % (es_uuid, parent_dn)
-            port = 9243
             use_ssl = True
             if http_compress is None:
                 http_compress = True
 
+        # If cloud_id isn't set and port is default then use 9200.
+        # Cloud should use '443' by default via the 'https' scheme.
+        elif port is None:
+            port = 9200
+
         # Work-around if the implementing class doesn't
         # define the headers property before calling super().__init__()
         if not hasattr(self, "headers"):
@@ -102,7 +110,9 @@ def __init__(
 
         self.hostname = host
         self.port = port
-        self.host = "%s://%s:%s" % (scheme, host, port)
+        self.host = "%s://%s" % (scheme, host)
+        if self.port is not None:
+            self.host += ":%s" % self.port
         if url_prefix:
             url_prefix = "/" + url_prefix.strip("/")
         self.url_prefix = url_prefix

elasticsearch/connection/http_requests.py

@@ -45,7 +45,7 @@ class RequestsHttpConnection(Connection):
     def __init__(
         self,
         host="localhost",
-        port=9200,
+        port=None,
         http_auth=None,
         use_ssl=False,
         verify_certs=True,
@@ -93,12 +93,7 @@ def __init__(
                 http_auth = tuple(http_auth.split(":", 1))
             self.session.auth = http_auth
 
-        self.base_url = "http%s://%s:%d%s" % (
-            "s" if self.use_ssl else "",
-            self.hostname,
-            self.port,
-            self.url_prefix,
-        )
+        self.base_url = "%s%s" % (self.host, self.url_prefix,)
         self.session.verify = verify_certs
         if not client_key:
             self.session.cert = client_cert
@@ -118,7 +113,7 @@ def __init__(
         if self.use_ssl and not verify_certs and ssl_show_warn:
             warnings.warn(
                 "Connecting to %s using SSL with verify_certs=False is insecure."
-                % self.base_url
+                % self.host
             )
 
     def perform_request(

elasticsearch/connection/http_urllib3.py

@@ -82,7 +82,7 @@ class Urllib3HttpConnection(Connection):
     def __init__(
         self,
         host="localhost",
-        port=9200,
+        port=None,
         http_auth=None,
         use_ssl=False,
         verify_certs=VERIFY_CERTS_DEFAULT,
@@ -186,7 +186,7 @@ def __init__(
                 if ssl_show_warn:
                     warnings.warn(
                         "Connecting to %s using SSL with verify_certs=False is insecure."
-                        % host
+                        % self.host
                     )
                 if not ssl_show_warn:
                     urllib3.disable_warnings()

elasticsearch/transport.py

@@ -128,6 +128,11 @@ def __init__(
         # retain the original connection instances for sniffing
         self.seed_connections = self.connection_pool.connections[:]
 
+        # Don't enable sniffing on Cloud instances.
+        if kwargs.get("cloud_id", False):
+            sniff_on_start = False
+            sniff_on_connection_fail = False
+
         # sniffing data
         self.sniffer_timeout = sniffer_timeout
         self.sniff_on_connection_fail = sniff_on_connection_fail