Skip to content

feat(file): add attachments zone #957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 16, 2025
Merged

feat(file): add attachments zone #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6361856
feat: update generated APIs
scaleway-bot Apr 14, 2025
51e0f0d
Merge branch 'main' into v1.6410.0
jremy42 Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions scaleway-async/scaleway_async/file/v1alpha1/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from scaleway_core.api import API
from scaleway_core.bridge import (
Region as ScwRegion,
Zone as ScwZone,
)
from scaleway_core.utils import (
WaitForOptions,
Expand Down Expand Up @@ -215,6 +216,7 @@ async def list_attachments(
filesystem_id: Optional[str] = None,
resource_id: Optional[str] = None,
resource_type: Optional[AttachmentResourceType] = None,
zone: Optional[ScwZone] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
) -> ListAttachmentsResponse:
Expand All @@ -227,6 +229,7 @@ async def list_attachments(
:param filesystem_id: UUID of the File Storage volume.
:param resource_id: Filter by resource ID.
:param resource_type: Filter by resource type.
:param zone: Filter by resource zone.
:param page: Page number (starting at 1).
:param page_size: Number of entries per page (default: 20, max: 100).
:return: :class:`ListAttachmentsResponse <ListAttachmentsResponse>`
Expand All @@ -250,6 +253,7 @@ async def list_attachments(
"page_size": page_size or self.client.default_page_size,
"resource_id": resource_id,
"resource_type": resource_type,
"zone": zone or self.client.default_zone,
},
)

Expand All @@ -263,6 +267,7 @@ async def list_attachments_all(
filesystem_id: Optional[str] = None,
resource_id: Optional[str] = None,
resource_type: Optional[AttachmentResourceType] = None,
zone: Optional[ScwZone] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
) -> List[Attachment]:
Expand All @@ -275,6 +280,7 @@ async def list_attachments_all(
:param filesystem_id: UUID of the File Storage volume.
:param resource_id: Filter by resource ID.
:param resource_type: Filter by resource type.
:param zone: Filter by resource zone.
:param page: Page number (starting at 1).
:param page_size: Number of entries per page (default: 20, max: 100).
:return: :class:`List[Attachment] <List[Attachment]>`
Expand All @@ -294,6 +300,7 @@ async def list_attachments_all(
"filesystem_id": filesystem_id,
"resource_id": resource_id,
"resource_type": resource_type,
"zone": zone,
"page": page,
"page_size": page_size,
},
Expand Down
6 changes: 6 additions & 0 deletions scaleway-async/scaleway_async/file/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ def unmarshal_Attachment(data: Any) -> Attachment:
if field is not None:
args["resource_type"] = field

field = data.get("zone", None)
if field is not None:
args["zone"] = field
else:
args["zone"] = None

return Attachment(**args)


Expand Down
11 changes: 11 additions & 0 deletions scaleway-async/scaleway_async/file/v1alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

from scaleway_core.bridge import (
Region as ScwRegion,
Zone as ScwZone,
)
from scaleway_core.utils import (
StrEnumMeta,
Expand Down Expand Up @@ -70,6 +71,11 @@ class Attachment:
The type of the attached resource.
"""

zone: Optional[ScwZone]
"""
The zone where the resource is located.
"""


@dataclass
class FileSystem:
Expand Down Expand Up @@ -225,6 +231,11 @@ class ListAttachmentsRequest:
Filter by resource type.
"""

zone: Optional[ScwZone]
"""
Filter by resource zone.
"""

page: Optional[int]
"""
Page number (starting at 1).
Expand Down
7 changes: 7 additions & 0 deletions scaleway/scaleway/file/v1alpha1/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from scaleway_core.api import API
from scaleway_core.bridge import (
Region as ScwRegion,
Zone as ScwZone,
)
from scaleway_core.utils import (
WaitForOptions,
Expand Down Expand Up @@ -213,6 +214,7 @@ def list_attachments(
filesystem_id: Optional[str] = None,
resource_id: Optional[str] = None,
resource_type: Optional[AttachmentResourceType] = None,
zone: Optional[ScwZone] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
) -> ListAttachmentsResponse:
Expand All @@ -225,6 +227,7 @@ def list_attachments(
:param filesystem_id: UUID of the File Storage volume.
:param resource_id: Filter by resource ID.
:param resource_type: Filter by resource type.
:param zone: Filter by resource zone.
:param page: Page number (starting at 1).
:param page_size: Number of entries per page (default: 20, max: 100).
:return: :class:`ListAttachmentsResponse <ListAttachmentsResponse>`
Expand All @@ -248,6 +251,7 @@ def list_attachments(
"page_size": page_size or self.client.default_page_size,
"resource_id": resource_id,
"resource_type": resource_type,
"zone": zone or self.client.default_zone,
},
)

Expand All @@ -261,6 +265,7 @@ def list_attachments_all(
filesystem_id: Optional[str] = None,
resource_id: Optional[str] = None,
resource_type: Optional[AttachmentResourceType] = None,
zone: Optional[ScwZone] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
) -> List[Attachment]:
Expand All @@ -273,6 +278,7 @@ def list_attachments_all(
:param filesystem_id: UUID of the File Storage volume.
:param resource_id: Filter by resource ID.
:param resource_type: Filter by resource type.
:param zone: Filter by resource zone.
:param page: Page number (starting at 1).
:param page_size: Number of entries per page (default: 20, max: 100).
:return: :class:`List[Attachment] <List[Attachment]>`
Expand All @@ -292,6 +298,7 @@ def list_attachments_all(
"filesystem_id": filesystem_id,
"resource_id": resource_id,
"resource_type": resource_type,
"zone": zone,
"page": page,
"page_size": page_size,
},
Expand Down
6 changes: 6 additions & 0 deletions scaleway/scaleway/file/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ def unmarshal_Attachment(data: Any) -> Attachment:
if field is not None:
args["resource_type"] = field

field = data.get("zone", None)
if field is not None:
args["zone"] = field
else:
args["zone"] = None

return Attachment(**args)


Expand Down
11 changes: 11 additions & 0 deletions scaleway/scaleway/file/v1alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

from scaleway_core.bridge import (
Region as ScwRegion,
Zone as ScwZone,
)
from scaleway_core.utils import (
StrEnumMeta,
Expand Down Expand Up @@ -70,6 +71,11 @@ class Attachment:
The type of the attached resource.
"""

zone: Optional[ScwZone]
"""
The zone where the resource is located.
"""


@dataclass
class FileSystem:
Expand Down Expand Up @@ -225,6 +231,11 @@ class ListAttachmentsRequest:
Filter by resource type.
"""

zone: Optional[ScwZone]
"""
Filter by resource zone.
"""

page: Optional[int]
"""
Page number (starting at 1).
Expand Down