ssh: automatically cast hub_url strings to yarl.URL objects

consideRatio · consideRatio · commit 05981deb35fd · 2021-07-25T04:24:18.000+02:00
diff --git a/jupyterhub_ssh/__init__.py b/jupyterhub_ssh/__init__.py
@@ -9,6 +9,7 @@
 from traitlets import Bool
 from traitlets import Integer
 from traitlets import Unicode
+from traitlets import validate
 from traitlets.config import Application
 from yarl import URL
 
@@ -221,7 +222,6 @@ class JupyterHubSSH(Application):
         config=True,
     )
 
-    # FIXME: Make this a yarl.URL object?
     hub_url = Any(
         "",
         help="""
@@ -232,6 +232,15 @@ class JupyterHubSSH(Application):
         config=True,
     )
 
+    @validate("hub_url")
+    def _hub_url_cast_string_to_yarl_url(self, proposal):
+        if isinstance(proposal.value, str):
+            return URL(proposal.value)
+        elif isinstance(proposal.value, URL):
+            return proposal.value
+        else:
+            raise ValueError("hub_url must either be a string or a yarl.URL")
+
     host_key_path = Unicode(
         "",
         help="""
@@ -266,10 +275,6 @@ def initialize(self, *args, **kwargs):
         self.load_config_file(self.config_file)
         self.init_logging()
 
-        # FIXME: Do this as a traitlet instead somehow?
-        # THIS IS DIRTY MAKES ME SAD
-        self.hub_url = URL(self.hub_url)
-
     async def start_server(self):
         await asyncssh.listen(
             host="",
