diff --git a/src/deadline/job_attachments/models.py b/src/deadline/job_attachments/models.py index ab11cae87..153488df7 100644 --- a/src/deadline/job_attachments/models.py +++ b/src/deadline/job_attachments/models.py @@ -317,24 +317,3 @@ class FileConflictResolution(Enum): SKIP = 1 OVERWRITE = 2 CREATE_COPY = 3 - - -# TODO: remove once we fixed worker agent to import PosixFileSystemPermissionSettings from os_file_permission -@dataclass -class PosixFileSystemPermissionSettings: - """ - A dataclass representing file system permission-related information - for Posix. The specified permission modes will be bitwise-OR'ed with - the directory or file's existing permissions. - - Attributes: - os_user (str): The target operating system user for ownership. - os_group (str): The target operating system group for ownership. - dir_mode (int): The permission mode to be added to directories. - file_mode (int): The permission mode to be added to files. - """ - - os_user: str - os_group: str - dir_mode: int - file_mode: int diff --git a/src/deadline/job_attachments/os_file_permission.py b/src/deadline/job_attachments/os_file_permission.py index 464933bd2..94e25ca8c 100644 --- a/src/deadline/job_attachments/os_file_permission.py +++ b/src/deadline/job_attachments/os_file_permission.py @@ -4,9 +4,9 @@ from pathlib import Path import shutil import sys -from dataclasses import dataclass, field +from dataclasses import dataclass from enum import Enum -from typing import List, Optional, Set, Union +from typing import List, Set, Union from .exceptions import AssetSyncError, PathOutsideDirectoryError from ._utils import _is_relative_to @@ -58,12 +58,9 @@ class WindowsFileSystemPermissionSettings: file_mode (WindowsPermissionEnum): The permission mode to be added to files. """ - # TODO: Remove the optional `os_group` once the jobRunAsUser - windows - group field - # is removed from our APIs os_user: str dir_mode: WindowsPermissionEnum file_mode: WindowsPermissionEnum - os_group: Optional[str] = field(default=None) # A union of different file system permission settings that are based on the underlying OS.