Fix ordering of entries in windows config from WSL

Signed-off-by: Fabrice Normandin <[email protected]>

milatools/cli/init_command.py

@@ -23,8 +23,6 @@
 logger = get_logger(__name__)
 
 WINDOWS_UNSUPPORTED_KEYS = ["ControlMaster", "ControlPath", "ControlPersist"]
-HOSTS = ["mila", "mila-cpu", "*.server.mila.quebec !*login.server.mila.quebec"]
-"""List of host entries that get added to the SSH configuration by `mila init`."""
 
 
 if sys.platform == "win32":
@@ -494,13 +492,15 @@ def _copy_valid_ssh_entries_to_windows_ssh_config_file(
     unsupported_keys_lowercase = set(k.lower() for k in WINDOWS_UNSUPPORTED_KEYS)
 
     # NOTE: need to preserve the ordering of entries:
-    for host in HOSTS + [
-        host for host in linux_ssh_config.hosts() if host not in HOSTS
+    entries_to_move = list(MILA_ENTRIES.keys()) + list(DRAC_ENTRIES.keys())
+    for host in entries_to_move + [
+        host for host in linux_ssh_config.hosts() if host not in entries_to_move
     ]:
         if host not in linux_ssh_config.hosts():
             warnings.warn(
                 RuntimeWarning(
-                    f"Weird, we expected to have a {host!r} entry in the SSH config..."
+                    f"We expected to have a {host!r} entry in the SSH config. "
+                    f"Did you run `mila init`?"
                 )
             )
             continue

tests/cli/test_init_command/test_setup_windows_ssh_config_from_wsl_accept_.md

@@ -108,27 +108,27 @@ Host *.server.mila.quebec !*login.server.mila.quebec
   ProxyJump mila
   User bob
 
-Host !graham  gra??? gra????
-  ProxyJump graham
-  User bob
-
-Host !beluga  bc????? bg????? bl?????
-  ProxyJump beluga
-  User bob
-
 Host beluga cedar graham narval niagara
   HostName %h.computecanada.ca
   User bob
 
-Host !niagara nia????
-  ProxyJump niagara
+Host !beluga  bc????? bg????? bl?????
+  ProxyJump beluga
   User bob
 
 Host !cedar   cdr? cdr?? cdr??? cdr????
   ProxyJump cedar
   User bob
 
+Host !graham  gra??? gra????
+  ProxyJump graham
+  User bob
+
 Host !narval  nc????? ng?????
   ProxyJump narval
   User bob
+
+Host !niagara nia????
+  ProxyJump niagara
+  User bob
 ```