VADC 904 (#137)

* add username logic for archived workflows

Author: tianj7

src/argowrapper/engine/argo_engine.py

@@ -281,7 +281,7 @@ def retry_workflow(self, workflow_name: str, uid: str) -> str:
 
     def _get_archived_workflow_wf_name_and_team_project(
         self, archived_workflow_uid
-    ) -> (str, str):
+    ) -> (str, str, str):
         """
         Gets the name and team project details for the given archived workflow
 
@@ -306,11 +306,13 @@ def _get_archived_workflow_wf_name_and_team_project(
         #  get the workflow given name from the parsed details:
         given_name = workflow_details["wf_name"]
         team_project = workflow_details[GEN3_TEAM_PROJECT_METADATA_LABEL]
+        gen3username = workflow_details[GEN3_USER_METADATA_LABEL]
         self.workflow_given_names_cache[archived_workflow_uid] = (
             given_name,
             team_project,
+            gen3username,
         )
-        return given_name, team_project
+        return given_name, team_project, gen3username
 
     def get_workflows_for_team_projects_and_user(
         self, team_projects: List[str], auth_header: str

src/argowrapper/engine/helpers/argo_engine_helper.py

@@ -115,11 +115,16 @@ def parse_list_item(
     else:
         # this is needed because archived list items do not have metadata.annotations or meta.labels
         # returned by the list service...so we need to call another service to get it:
-        wf_name, team_project = get_archived_workflow_wf_name_and_team_project(
+        (
+            wf_name,
+            team_project,
+            gen3username,
+        ) = get_archived_workflow_wf_name_and_team_project(
             workflow_details["metadata"].get("uid")
         )
         result["wf_name"] = wf_name
         result[GEN3_TEAM_PROJECT_METADATA_LABEL] = team_project
+        result[GEN3_USER_METADATA_LABEL] = gen3username
 
     result["uid"] = workflow_details["metadata"].get("uid")
     return result

test/test_argo_engine.py

@@ -452,7 +452,7 @@ def test_argo_engine_get_workflows_for_user_and_team_projects_suceeded():
         assert "custom_name_active2" == uniq_workflow_list[0]["wf_name"]
         assert "custom_name_archived" == uniq_workflow_list[1]["wf_name"]
         assert "2023-03-22T19:59:59Z" == uniq_workflow_list[1]["submittedAt"]
-        assert "" == uniq_workflow_list[1][GEN3_USER_METADATA_LABEL]
+        assert "dummyuser" == uniq_workflow_list[1][GEN3_USER_METADATA_LABEL]
 
 
 def test_argo_engine_get_workflows_for_user_failed():
@@ -760,15 +760,18 @@ def test_get_archived_workflow_wf_name_and_team_project():
     mock_return_wf = {
         "wf_name": "dummy_wf_name",
         GEN3_TEAM_PROJECT_METADATA_LABEL: "dummy_team_project_label",
+        GEN3_USER_METADATA_LABEL: "dummy_user",
     }
 
     engine.get_workflow_details = mock.MagicMock(return_value=mock_return_wf)
     (
         given_name,
         team_project,
+        gen3username,
     ) = engine._get_archived_workflow_wf_name_and_team_project("dummy_uid")
     assert given_name == "dummy_wf_name"
     assert team_project == "dummy_team_project_label"
+    assert gen3username == "dummy_user"
 
     # test the internal caching that happens at _get_archived_workflow_wf_name_and_team_project,
     # by setting the get_workflow_details to return None and show that it was not called,
@@ -777,9 +780,11 @@ def test_get_archived_workflow_wf_name_and_team_project():
     (
         given_name,
         team_project,
+        gen3username,
     ) = engine._get_archived_workflow_wf_name_and_team_project("dummy_uid")
     assert given_name == "dummy_wf_name"
     assert team_project == "dummy_team_project_label"
+    assert gen3username == "dummy_user"
 
 
 @freeze_time("Nov 16th, 2023")

test/test_argo_engine_helper.py

@@ -224,7 +224,7 @@ def test_parse_list_item():
     assert parsed_item.get("uid") == "test_uid"
 
     def dummy_get_archived_workflow_wf_name_and_team_project(workflow_uid):
-        return "dummy_wf_name", "dummy_team_project"
+        return "dummy_wf_name", "dummy_team_project", "dummy_user"
 
     parsed_item = argo_engine_helper.parse_list_item(
         workflow_item,
@@ -233,6 +233,7 @@ def dummy_get_archived_workflow_wf_name_and_team_project(workflow_uid):
     )
     assert parsed_item.get("wf_name") == "dummy_wf_name"
     assert parsed_item.get(GEN3_TEAM_PROJECT_METADATA_LABEL) == "dummy_team_project"
+    assert parsed_item.get(GEN3_USER_METADATA_LABEL) == "dummy_user"
 
 
 def test_remove_list_duplicates():