Merge pull request #4730 from MetRonnie/user-bug

Allow `~user` in universal ID if it's the current user

cylc/flow/id_cli.py

@@ -26,6 +26,7 @@
     UserInputError,
     WorkflowFilesError,
 )
+from cylc.flow.hostuserutil import get_user
 from cylc.flow.id import (
     Tokens,
     contains_multiple_workflows,
@@ -47,6 +48,7 @@
     validate_workflow_name,
 )
 
+
 FN_CHARS = re.compile(r'[\*\?\[\]\!]')
 
 
@@ -380,9 +382,9 @@ def _validate_constraint(*tokens_list, constraint=None):
 
 def _validate_workflow_ids(*tokens_list, src_path):
     for ind, tokens in enumerate(tokens_list):
-        if tokens['user']:
+        if tokens['user'] and (tokens['user'] != get_user()):
             raise UserInputError(
-                "Operating on others users' workflows is not supported"
+                "Operating on other users' workflows is not supported"
             )
         if not src_path:
             validate_workflow_name(tokens['workflow'])

tests/unit/test_id_cli.py

@@ -370,12 +370,15 @@ async def test_parse_ids_src_path(src_dir):
         ),
         (
             ['~alice/foo'],
-            "Operating on others users' workflows is not supported",
+            "Operating on other users' workflows is not supported",
         ),
     ]
 )
-async def test_parse_ids_invalid_ids(ids_in, error_msg):
+async def test_parse_ids_invalid_ids(
+    ids_in, error_msg, monkeypatch: pytest.MonkeyPatch
+):
     """It should error for invalid IDs."""
+    monkeypatch.setattr('cylc.flow.id_cli.get_user', lambda: 'rincewind')
     with pytest.raises(Exception) as exc_ctx:
         await parse_ids_async(
             *ids_in,
@@ -384,6 +387,12 @@ async def test_parse_ids_invalid_ids(ids_in, error_msg):
     assert error_msg in str(exc_ctx.value)
 
 
+async def test_parse_ids_current_user(monkeypatch: pytest.MonkeyPatch):
+    """It should work if the user in the ID is the current user."""
+    monkeypatch.setattr('cylc.flow.id_cli.get_user', lambda: 'rincewind')
+    await parse_ids_async('~rincewind/luggage', constraint='workflows')
+
+
 async def test_parse_ids_file(tmp_run_dir):
     """It should reject IDs that are paths to files."""
     tmp_path = tmp_run_dir('x')