Skip to content

Commit 95c9e06

Browse files
author
Alan Christie
committed
feat: Add running user API token
1 parent e47b8a2 commit 95c9e06

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

tests/wapi_adapter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ def create_running_workflow(
241241
running_workflow_id: str = _RUNNING_WORKFLOW_ID_FORMAT.format(id=next_id)
242242
record = {
243243
"name": "test-running-workflow",
244-
"user_id": user_id,
245-
"user_api_token": "123456789",
244+
"running_user": user_id,
245+
"running_user_api_token": "123456789",
246246
"done": False,
247247
"success": False,
248248
"workflow": {"id": workflow_id},

workflow/workflow_abc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ def get_running_workflow(
105105
# Should return:
106106
# {
107107
# "name": "workflow-name",
108-
# "user_id": "alan",
109-
# "user_api_token": "123456789",
108+
# "running_user": "alan",
109+
# "running_user_api_token": "123456789",
110110
# "done": False,
111111
# "success": false,
112112
# "error": None,

workflow/workflow_engine.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ def _handle_workflow_start_message(self, r_wfid: str) -> None:
109109
_LOGGER.debug(
110110
"API.get_running_workflow(%s) returned: -\n%s", r_wfid, str(rwf_response)
111111
)
112-
assert "user_id" in rwf_response
113-
launching_user_name: str = rwf_response["user_id"]
112+
assert "running_user" in rwf_response
113+
launching_user_name: str = rwf_response["running_user"]
114114
# Now get the workflow definition (to get all the steps)
115115
wfid = rwf_response["workflow"]["id"]
116116
wf_response, _ = self._wapi_adapter.get_workflow(workflow_id=wfid)
@@ -155,7 +155,7 @@ def _handle_workflow_start_message(self, r_wfid: str) -> None:
155155
application_id=DM_JOB_APPLICATION_ID,
156156
name=first_step_name,
157157
launching_user_name=launching_user_name,
158-
launching_user_api_token=rwf_response["user_api_token"],
158+
launching_user_api_token=rwf_response["running_user_api_token"],
159159
specification=json.loads(first_step["specification"]),
160160
specification_variables=variables,
161161
running_workflow_id=r_wfid,
@@ -279,8 +279,8 @@ def _handle_pod_message(self, msg: PodMessage) -> None:
279279
project_id=project_id,
280280
application_id=DM_JOB_APPLICATION_ID,
281281
name=next_step_name,
282-
launching_user_name=rwf_response["user_id"],
283-
launching_user_api_token=rwf_response["user_api_token"],
282+
launching_user_name=rwf_response["running_user"],
283+
launching_user_api_token=rwf_response["running_user_api_token"],
284284
specification=json.loads(next_step["specification"]),
285285
specification_variables=variables,
286286
running_workflow_id=r_wfid,

0 commit comments

Comments
 (0)