refactor(kernel): simplify _port folding to the bare-host case

server_hostname reaches the backend as a bare host on this path, so drop
the defensive scheme peel/re-add: just append the port when the host has
none, and let the kernel's normalise_host add the scheme. Removes the
now-moot scheme-preservation test.

Co-authored-by: Isaac
Signed-off-by: eric-wang-1990 <e.wang@databricks.com>

Author: eric-wang-1990

src/databricks/sql/session.py

@@ -56,17 +56,13 @@ def _kernel_host_and_path(
 
     port = kwargs.get("_port")
     if port is not None:
-        # Split off any scheme so we can inspect the authority; the kernel
-        # re-adds https:// when it is absent. Only append the port when the
-        # authority does not already carry one.
-        scheme_match = re.match(r"^(https?://)(.*)$", server_hostname)
-        scheme = scheme_match.group(1) if scheme_match else ""
-        authority = (scheme_match.group(2) if scheme_match else server_hostname).rstrip(
-            "/"
-        )
-        if ":" not in authority:
-            authority = "{}:{}".format(authority, port)
-        return "{}{}".format(scheme, authority), http_path
+        # server_hostname is a bare host on this path (e.g.
+        # ``dbc-123.cloud.databricks.com``); the kernel adds the scheme.
+        # Append the port unless the host already carries one.
+        host = server_hostname.rstrip("/")
+        if ":" not in host:
+            host = "{}:{}".format(host, port)
+        return host, http_path
 
     return server_hostname, http_path
 

tests/unit/test_session.py

@@ -643,13 +643,6 @@ def test_port_folded_into_bare_host(self):
         assert host == "{}:8443".format(self.HOST)
         assert path == self.PATH
 
-    def test_port_preserves_existing_scheme(self):
-        host, path = _kernel_host_and_path(
-            "https://" + self.HOST, self.PATH, {"_port": 8443}
-        )
-        assert host == "https://{}:8443".format(self.HOST)
-        assert path == self.PATH
-
     def test_port_not_double_appended_when_host_has_port(self):
         host, _ = _kernel_host_and_path(self.HOST + ":7000", self.PATH, {"_port": 8443})
         assert host == self.HOST + ":7000"