Skip to content

Commit

Permalink
Address review
Browse files Browse the repository at this point in the history
  • Loading branch information
anodos325 committed Oct 28, 2024
1 parent 4d299d7 commit 7231ec6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions src/middlewared/middlewared/api/v25_04_0/acl.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
'AclTemplateUpdateArgs', 'AclTemplateUpdateResult',
'AclTemplateDeleteArgs', 'AclTemplateDeleteResult',
'FilesystemAddToAclArgs', 'FilesystemAddToAclResult',
'FilesystemGetaclArgs', 'FilesystemGetaclResult',
'FilesystemSetaclArgs', 'FilesystemSetaclResult',
'FilesystemGetAclArgs', 'FilesystemGetAclResult',
'FilesystemSetAclArgs', 'FilesystemSetAclResult',
'FilesystemGetInheritedAclArgs', 'FilesystemGetInheritedAclResult'
]

Expand Down Expand Up @@ -208,7 +208,7 @@ class DISABLED_ACL(AclBaseInfo):
trivial: Literal[True]


class FilesystemGetaclArgs(BaseModel):
class FilesystemGetAclArgs(BaseModel):
path: NonEmptyString
simplified: bool = True
resolve_ids: bool = False
Expand All @@ -232,11 +232,11 @@ class DISABLED_ACLResult(DISABLED_ACL, AclBaseResult):
pass


class FilesystemGetaclResult(BaseModel):
class FilesystemGetAclResult(BaseModel):
result: NFS4ACLResult | POSIXACLResult | DISABLED_ACLResult


class FilesystemSetaclOptions(BaseModel):
class FilesystemSetAclOptions(BaseModel):
stripacl: bool = False
recursive: bool = False
traverse: bool = False
Expand All @@ -245,10 +245,10 @@ class FilesystemSetaclOptions(BaseModel):


@single_argument_args('filesystem_acl')
class FilesystemSetaclArgs(BaseModel):
class FilesystemSetAclArgs(BaseModel):
path: NonEmptyString
dacl: list[NFS4ACE] | list[POSIXACE]
options: FilesystemSetaclOptions = Field(default=FilesystemSetaclOptions())
options: FilesystemSetAclOptions = Field(default=FilesystemSetAclOptions())
nfs41_flags: NFS4ACL_Flags = Field(default=NFS4ACL_Flags())
uid: AceWhoId | None = ACL_UNDEFINED_ID
user: str | None = None
Expand All @@ -268,7 +268,7 @@ def check_setacl_valid(self) -> Self:
return self


class FilesystemSetaclResult(FilesystemGetaclResult):
class FilesystemSetAclResult(FilesystemGetAclResult):
pass


Expand Down
4 changes: 2 additions & 2 deletions src/middlewared/middlewared/plugins/filesystem_/acl.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from middlewared.api import api_method
from middlewared.api.current import (
FilesystemAddToAclArgs, FilesystemAddToAclResult,
FilesystemGetaclArgs, FilesystemGetaclResult,
FilesystemSetaclArgs, FilesystemSetaclResult,
FilesystemGetAclArgs, FilesystemGetAclResult,
FilesystemSetAclArgs, FilesystemSetAclResult,
FilesystemGetInheritedAclArgs, FilesystemGetInheritedAclResult,
)
from middlewared.schema import Bool, Dict, Int, Str, UnixPerm
Expand Down

0 comments on commit 7231ec6

Please sign in to comment.