Simplify the URL parsing

viren-nadkarni · viren-nadkarni · commit 6eeb9532c654 · 2024-10-23T15:08:40.000+05:30
diff --git a/localstack-core/localstack/utils/java.py b/localstack-core/localstack/utils/java.py
@@ -26,20 +26,22 @@ def java_system_properties_proxy() -> dict[str, str]:
     """
     props = {}
 
-    for scheme, default_port, var in [
+    for scheme, default_port, proxy_url in [
         ("http", "80", config.OUTBOUND_HTTP_PROXY),
         ("https", "443", config.OUTBOUND_HTTPS_PROXY),
     ]:
-        if var:
-            netloc = urlparse(var).netloc
-            url = netloc.split(":")
-            if len(url) == 2:
-                hostname, port = url
-            else:
-                hostname, port = url[0], default_port
-
-            props[f"{scheme}.proxyHost"] = hostname
-            props[f"{scheme}.proxyPort"] = port
+        if proxy_url:
+            parsed_url = urlparse(proxy_url)
+
+            port: int | None = parsed_url.port
+            if port is None:
+                if scheme == "https":
+                    port = 443
+                else:
+                    port = 80
+
+            props[f"{scheme}.proxyHost"] = parsed_url.hostname
+            props[f"{scheme}.proxyPort"] = str(port)
 
     return props
 
