From cf22b0b60c57d72e2cd76b4b9d23dd630c4acbe5 Mon Sep 17 00:00:00 2001 From: Nathan Matthews Date: Fri, 10 Nov 2023 23:45:09 +0000 Subject: [PATCH 1/2] fix: Adding os_user to FileSystemPermissionSettings for use in the deadline VFS Signed-off-by: Nathan Matthews --- src/deadline_worker_agent/sessions/session.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deadline_worker_agent/sessions/session.py b/src/deadline_worker_agent/sessions/session.py index 1f818b8d..7c02eb1e 100644 --- a/src/deadline_worker_agent/sessions/session.py +++ b/src/deadline_worker_agent/sessions/session.py @@ -847,7 +847,7 @@ def progress_handler(job_upload_status: ProgressReportMetadata) -> bool: queue_id=self._queue_id, # only used for error message job_id=self._queue._job_id, # only used for error message session_dir=self._session.working_directory, - fs_permission_settings=fs_permission_settings, + fs_permission_settings=fs_permission_settings, # type: ignore[arg-type] storage_profiles_path_mapping_rules=storage_profiles_path_mapping_rules_dict, step_dependencies=step_dependencies, on_downloading_files=progress_handler, From c9993e31af06ca94412186723548c655b7612a50 Mon Sep 17 00:00:00 2001 From: amzn-mike <80125227+amzn-mike@users.noreply.github.com> Date: Fri, 17 Nov 2023 17:42:01 +0000 Subject: [PATCH 2/2] fix: pass in missing os_env_vars variable Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> --- src/deadline_worker_agent/sessions/session.py | 1 + test/unit/sessions/test_session.py | 1 + 2 files changed, 2 insertions(+) diff --git a/src/deadline_worker_agent/sessions/session.py b/src/deadline_worker_agent/sessions/session.py index 7c02eb1e..63a1941e 100644 --- a/src/deadline_worker_agent/sessions/session.py +++ b/src/deadline_worker_agent/sessions/session.py @@ -851,6 +851,7 @@ def progress_handler(job_upload_status: ProgressReportMetadata) -> bool: storage_profiles_path_mapping_rules=storage_profiles_path_mapping_rules_dict, step_dependencies=step_dependencies, on_downloading_files=progress_handler, + os_env_vars=self._env, ) ASSET_SYNC_LOGGER.info( diff --git a/test/unit/sessions/test_session.py b/test/unit/sessions/test_session.py index 5e62836f..f5092450 100644 --- a/test/unit/sessions/test_session.py +++ b/test/unit/sessions/test_session.py @@ -554,6 +554,7 @@ def test_asset_loading_method( storage_profiles_path_mapping_rules={}, step_dependencies=None, on_downloading_files=ANY, + os_env_vars=ANY, ) @pytest.mark.parametrize(