Add support for honoring the host and port arguments in consul.Consul()

consul/base.py

@@ -76,8 +76,8 @@ def close(self):
 class Consul:
     def __init__(
         self,
-        host: str = "127.0.0.1",
-        port: int = 8500,
+        host: str | None = None,
+        port: int | None = None,
         token: str | None = None,
         scheme: str = "http",
         consistency: str = "default",
@@ -106,13 +106,18 @@ def __init__(
 
         # TODO: Status
 
-        if os.getenv("CONSUL_HTTP_ADDR"):
+        if os.getenv("CONSUL_HTTP_ADDR") and not (host or port):
             try:
                 host, port = os.getenv("CONSUL_HTTP_ADDR").split(":")  # type: ignore
             except ValueError as err:
                 raise ConsulException(
                     f"CONSUL_HTTP_ADDR ({os.getenv('CONSUL_HTTP_ADDR')}) invalid, does not match <host>:<port>"
                 ) from err
+        if not host:
+            host = "127.0.0.1"
+        if not port:
+            port = 8500
+
         use_ssl = os.getenv("CONSUL_HTTP_SSL")
         if use_ssl is not None:
             scheme = "https" if use_ssl == "true" else "http"

tests/test_base.py

@@ -15,7 +15,8 @@ class HTTPClient:
     def __init__(
         self, host: Optional[str] = None, port: Optional[int] = None, scheme=None, verify: bool = True, cert=None
     ) -> None:
-        pass
+        self.host = host
+        self.port = int(port)
 
     def get(self, callback, path, params=None, headers=None):  # pylint: disable=unused-argument
         return Request("get", path, params, headers, None)
@@ -70,6 +71,84 @@ def _should_support_meta(c: Consul) -> tuple[Callable[..., Any], ...]:
     )
 
 
+class TestBaseInit:
+    """
+    Tests that connection arguments are handled
+    """
+
+    @pytest.mark.parametrize(
+        ("env", "host", "port", "want"),
+        [
+            (
+                None,
+                None,
+                None,
+                {
+                    "host": "127.0.0.1",
+                    "port": 8500,
+                },
+            ),
+            (
+                "127.0.0.1:443",
+                None,
+                None,
+                {
+                    "host": "127.0.0.1",
+                    "port": 443,
+                },
+            ),
+            (
+                None,
+                "consul.domain.tld",
+                None,
+                {
+                    "host": "consul.domain.tld",
+                    "port": 8500,
+                },
+            ),
+            (
+                "consul.domain.tld:443",
+                "127.0.0.1",
+                None,
+                {
+                    "host": "127.0.0.1",
+                    "port": 8500,
+                },
+            ),
+            (
+                "consul.domain.tld:443",
+                "127.0.0.1",
+                8080,
+                {
+                    "host": "127.0.0.1",
+                    "port": 8080,
+                },
+            ),
+            (
+                "bad",
+                "127.0.0.1",
+                8080,
+                {
+                    "host": "127.0.0.1",
+                    "port": 8080,
+                },
+            ),
+        ],
+    )
+    def test_base_init(self, monkeypatch, env, host, port, want) -> None:
+        if env:
+            monkeypatch.setenv("CONSUL_HTTP_ADDR", env)
+        else:
+            try:
+                monkeypatch.delenv("CONSUL_HTTP_ADDR")
+            except KeyError:
+                pass
+
+        c = Consul(host=host, port=port)
+        assert c.http.host == want["host"]
+        assert c.http.port == want["port"]
+
+
 class TestIndex:
     """
     Tests read requests that should support blocking on an index