Skip to content

feat(serverless): change UpdateTriggerRequest to only be able to update a few fields #123

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 1 commit into from
Mar 29, 2023
Merged

feat(serverless): change UpdateTriggerRequest to only be able to update a few fields #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions scaleway-async/scaleway_async/function/v1beta1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
from .types import TriggerMnqNatsClientConfig
from .types import TriggerMnqSqsClientConfig
from .types import TriggerSqsClientConfig
from .types import UpdateTriggerRequestMnqNatsClientConfig
from .types import UpdateTriggerRequestMnqSqsClientConfig
from .types import UpdateTriggerRequestSqsClientConfig
from .types import UploadURL
from .content import CRON_TRANSIENT_STATUSES
Expand Down Expand Up @@ -103,8 +101,6 @@
"TriggerMnqNatsClientConfig",
"TriggerMnqSqsClientConfig",
"TriggerSqsClientConfig",
"UpdateTriggerRequestMnqNatsClientConfig",
"UpdateTriggerRequestMnqSqsClientConfig",
"UpdateTriggerRequestSqsClientConfig",
"UploadURL",
"CRON_TRANSIENT_STATUSES",
Expand Down
6 changes: 0 additions & 6 deletions scaleway-async/scaleway_async/function/v1beta1/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
Secret,
Token,
Trigger,
UpdateTriggerRequestMnqNatsClientConfig,
UpdateTriggerRequestMnqSqsClientConfig,
UpdateTriggerRequestSqsClientConfig,
UploadURL,
CreateNamespaceRequest,
Expand Down Expand Up @@ -1933,9 +1931,7 @@ async def update_trigger(
region: Optional[Region] = None,
name: Optional[str] = None,
description: Optional[str] = None,
scw_sqs_config: Optional[UpdateTriggerRequestMnqSqsClientConfig] = None,
sqs_config: Optional[UpdateTriggerRequestSqsClientConfig] = None,
scw_nats_config: Optional[UpdateTriggerRequestMnqNatsClientConfig] = None,
) -> Trigger:
"""

Expand All @@ -1959,9 +1955,7 @@ async def update_trigger(
region=region,
name=name,
description=description,
scw_sqs_config=scw_sqs_config,
sqs_config=sqs_config,
scw_nats_config=scw_nats_config,
),
self.client,
),
Expand Down
44 changes: 0 additions & 44 deletions scaleway-async/scaleway_async/function/v1beta1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
TriggerMnqNatsClientConfig,
TriggerMnqSqsClientConfig,
TriggerSqsClientConfig,
UpdateTriggerRequestMnqNatsClientConfig,
UpdateTriggerRequestMnqSqsClientConfig,
UpdateTriggerRequestSqsClientConfig,
UploadURL,
CreateNamespaceRequest,
Expand Down Expand Up @@ -695,38 +693,12 @@ def marshal_Secret(
}


def marshal_UpdateTriggerRequestMnqNatsClientConfig(
request: UpdateTriggerRequestMnqNatsClientConfig,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"mnq_namespace_id": request.mnq_namespace_id,
"mnq_project_id": request.mnq_project_id,
"mnq_region": request.mnq_region,
"subject": request.subject,
}


def marshal_UpdateTriggerRequestMnqSqsClientConfig(
request: UpdateTriggerRequestMnqSqsClientConfig,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"mnq_namespace_id": request.mnq_namespace_id,
"mnq_project_id": request.mnq_project_id,
"mnq_region": request.mnq_region,
"queue": request.queue,
}


def marshal_UpdateTriggerRequestSqsClientConfig(
request: UpdateTriggerRequestSqsClientConfig,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"access_key": request.access_key,
"endpoint": request.endpoint,
"queue_url": request.queue_url,
"secret_key": request.secret_key,
}

Expand Down Expand Up @@ -914,14 +886,6 @@ def marshal_UpdateTriggerRequest(
return {
**resolve_one_of(
[
OneOfPossibility(
"scw_sqs_config",
marshal_UpdateTriggerRequestMnqSqsClientConfig(
request.scw_sqs_config, defaults
)
if request.scw_sqs_config is not None
else None,
),
OneOfPossibility(
"sqs_config",
marshal_UpdateTriggerRequestSqsClientConfig(
Expand All @@ -930,14 +894,6 @@ def marshal_UpdateTriggerRequest(
if request.sqs_config is not None
else None,
),
OneOfPossibility(
"scw_nats_config",
marshal_UpdateTriggerRequestMnqNatsClientConfig(
request.scw_nats_config, defaults
)
if request.scw_nats_config is not None
else None,
),
]
),
"description": request.description,
Expand Down
38 changes: 1 addition & 37 deletions scaleway-async/scaleway_async/function/v1beta1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,34 +643,8 @@ class TriggerSqsClientConfig:
secret_key: str


@dataclass
class UpdateTriggerRequestMnqNatsClientConfig:
mnq_namespace_id: str

subject: str

mnq_project_id: str

mnq_region: str


@dataclass
class UpdateTriggerRequestMnqSqsClientConfig:
mnq_namespace_id: str

queue: str

mnq_project_id: str

mnq_region: str


@dataclass
class UpdateTriggerRequestSqsClientConfig:
endpoint: str

queue_url: str

access_key: str

secret_key: str
Expand Down Expand Up @@ -1218,19 +1192,9 @@ class UpdateTriggerRequest:

description: Optional[str]

scw_sqs_config: Optional[UpdateTriggerRequestMnqSqsClientConfig]
"""
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
"""

sqs_config: Optional[UpdateTriggerRequestSqsClientConfig]
"""
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
"""

scw_nats_config: Optional[UpdateTriggerRequestMnqNatsClientConfig]
"""
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
One-of ('config'): at most one of 'sqs_config' could be set.
"""


Expand Down
4 changes: 0 additions & 4 deletions scaleway/scaleway/function/v1beta1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
from .types import TriggerMnqNatsClientConfig
from .types import TriggerMnqSqsClientConfig
from .types import TriggerSqsClientConfig
from .types import UpdateTriggerRequestMnqNatsClientConfig
from .types import UpdateTriggerRequestMnqSqsClientConfig
from .types import UpdateTriggerRequestSqsClientConfig
from .types import UploadURL
from .content import CRON_TRANSIENT_STATUSES
Expand Down Expand Up @@ -103,8 +101,6 @@
"TriggerMnqNatsClientConfig",
"TriggerMnqSqsClientConfig",
"TriggerSqsClientConfig",
"UpdateTriggerRequestMnqNatsClientConfig",
"UpdateTriggerRequestMnqSqsClientConfig",
"UpdateTriggerRequestSqsClientConfig",
"UploadURL",
"CRON_TRANSIENT_STATUSES",
Expand Down
6 changes: 0 additions & 6 deletions scaleway/scaleway/function/v1beta1/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
Secret,
Token,
Trigger,
UpdateTriggerRequestMnqNatsClientConfig,
UpdateTriggerRequestMnqSqsClientConfig,
UpdateTriggerRequestSqsClientConfig,
UploadURL,
CreateNamespaceRequest,
Expand Down Expand Up @@ -1929,9 +1927,7 @@ def update_trigger(
region: Optional[Region] = None,
name: Optional[str] = None,
description: Optional[str] = None,
scw_sqs_config: Optional[UpdateTriggerRequestMnqSqsClientConfig] = None,
sqs_config: Optional[UpdateTriggerRequestSqsClientConfig] = None,
scw_nats_config: Optional[UpdateTriggerRequestMnqNatsClientConfig] = None,
) -> Trigger:
"""

Expand All @@ -1955,9 +1951,7 @@ def update_trigger(
region=region,
name=name,
description=description,
scw_sqs_config=scw_sqs_config,
sqs_config=sqs_config,
scw_nats_config=scw_nats_config,
),
self.client,
),
Expand Down
44 changes: 0 additions & 44 deletions scaleway/scaleway/function/v1beta1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
TriggerMnqNatsClientConfig,
TriggerMnqSqsClientConfig,
TriggerSqsClientConfig,
UpdateTriggerRequestMnqNatsClientConfig,
UpdateTriggerRequestMnqSqsClientConfig,
UpdateTriggerRequestSqsClientConfig,
UploadURL,
CreateNamespaceRequest,
Expand Down Expand Up @@ -695,38 +693,12 @@ def marshal_Secret(
}


def marshal_UpdateTriggerRequestMnqNatsClientConfig(
request: UpdateTriggerRequestMnqNatsClientConfig,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"mnq_namespace_id": request.mnq_namespace_id,
"mnq_project_id": request.mnq_project_id,
"mnq_region": request.mnq_region,
"subject": request.subject,
}


def marshal_UpdateTriggerRequestMnqSqsClientConfig(
request: UpdateTriggerRequestMnqSqsClientConfig,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"mnq_namespace_id": request.mnq_namespace_id,
"mnq_project_id": request.mnq_project_id,
"mnq_region": request.mnq_region,
"queue": request.queue,
}


def marshal_UpdateTriggerRequestSqsClientConfig(
request: UpdateTriggerRequestSqsClientConfig,
defaults: ProfileDefaults,
) -> Dict[str, Any]:
return {
"access_key": request.access_key,
"endpoint": request.endpoint,
"queue_url": request.queue_url,
"secret_key": request.secret_key,
}

Expand Down Expand Up @@ -914,14 +886,6 @@ def marshal_UpdateTriggerRequest(
return {
**resolve_one_of(
[
OneOfPossibility(
"scw_sqs_config",
marshal_UpdateTriggerRequestMnqSqsClientConfig(
request.scw_sqs_config, defaults
)
if request.scw_sqs_config is not None
else None,
),
OneOfPossibility(
"sqs_config",
marshal_UpdateTriggerRequestSqsClientConfig(
Expand All @@ -930,14 +894,6 @@ def marshal_UpdateTriggerRequest(
if request.sqs_config is not None
else None,
),
OneOfPossibility(
"scw_nats_config",
marshal_UpdateTriggerRequestMnqNatsClientConfig(
request.scw_nats_config, defaults
)
if request.scw_nats_config is not None
else None,
),
]
),
"description": request.description,
Expand Down
38 changes: 1 addition & 37 deletions scaleway/scaleway/function/v1beta1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,34 +643,8 @@ class TriggerSqsClientConfig:
secret_key: str


@dataclass
class UpdateTriggerRequestMnqNatsClientConfig:
mnq_namespace_id: str

subject: str

mnq_project_id: str

mnq_region: str


@dataclass
class UpdateTriggerRequestMnqSqsClientConfig:
mnq_namespace_id: str

queue: str

mnq_project_id: str

mnq_region: str


@dataclass
class UpdateTriggerRequestSqsClientConfig:
endpoint: str

queue_url: str

access_key: str

secret_key: str
Expand Down Expand Up @@ -1218,19 +1192,9 @@ class UpdateTriggerRequest:

description: Optional[str]

scw_sqs_config: Optional[UpdateTriggerRequestMnqSqsClientConfig]
"""
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
"""

sqs_config: Optional[UpdateTriggerRequestSqsClientConfig]
"""
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
"""

scw_nats_config: Optional[UpdateTriggerRequestMnqNatsClientConfig]
"""
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
One-of ('config'): at most one of 'sqs_config' could be set.
"""


Expand Down