diff --git a/scaleway-async/scaleway_async/function/v1beta1/__init__.py b/scaleway-async/scaleway_async/function/v1beta1/__init__.py index c9d29ee67..40a4c610c 100644 --- a/scaleway-async/scaleway_async/function/v1beta1/__init__.py +++ b/scaleway-async/scaleway_async/function/v1beta1/__init__.py @@ -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 @@ -103,8 +101,6 @@ "TriggerMnqNatsClientConfig", "TriggerMnqSqsClientConfig", "TriggerSqsClientConfig", - "UpdateTriggerRequestMnqNatsClientConfig", - "UpdateTriggerRequestMnqSqsClientConfig", "UpdateTriggerRequestSqsClientConfig", "UploadURL", "CRON_TRANSIENT_STATUSES", diff --git a/scaleway-async/scaleway_async/function/v1beta1/api.py b/scaleway-async/scaleway_async/function/v1beta1/api.py index cec8e320c..c44493d7f 100644 --- a/scaleway-async/scaleway_async/function/v1beta1/api.py +++ b/scaleway-async/scaleway_async/function/v1beta1/api.py @@ -48,8 +48,6 @@ Secret, Token, Trigger, - UpdateTriggerRequestMnqNatsClientConfig, - UpdateTriggerRequestMnqSqsClientConfig, UpdateTriggerRequestSqsClientConfig, UploadURL, CreateNamespaceRequest, @@ -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: """ @@ -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, ), diff --git a/scaleway-async/scaleway_async/function/v1beta1/marshalling.py b/scaleway-async/scaleway_async/function/v1beta1/marshalling.py index 5e2bc81a1..de34332e2 100644 --- a/scaleway-async/scaleway_async/function/v1beta1/marshalling.py +++ b/scaleway-async/scaleway_async/function/v1beta1/marshalling.py @@ -38,8 +38,6 @@ TriggerMnqNatsClientConfig, TriggerMnqSqsClientConfig, TriggerSqsClientConfig, - UpdateTriggerRequestMnqNatsClientConfig, - UpdateTriggerRequestMnqSqsClientConfig, UpdateTriggerRequestSqsClientConfig, UploadURL, CreateNamespaceRequest, @@ -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, } @@ -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( @@ -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, diff --git a/scaleway-async/scaleway_async/function/v1beta1/types.py b/scaleway-async/scaleway_async/function/v1beta1/types.py index 936692703..e02ca2c3d 100644 --- a/scaleway-async/scaleway_async/function/v1beta1/types.py +++ b/scaleway-async/scaleway_async/function/v1beta1/types.py @@ -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 @@ -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. """ diff --git a/scaleway/scaleway/function/v1beta1/__init__.py b/scaleway/scaleway/function/v1beta1/__init__.py index c9d29ee67..40a4c610c 100644 --- a/scaleway/scaleway/function/v1beta1/__init__.py +++ b/scaleway/scaleway/function/v1beta1/__init__.py @@ -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 @@ -103,8 +101,6 @@ "TriggerMnqNatsClientConfig", "TriggerMnqSqsClientConfig", "TriggerSqsClientConfig", - "UpdateTriggerRequestMnqNatsClientConfig", - "UpdateTriggerRequestMnqSqsClientConfig", "UpdateTriggerRequestSqsClientConfig", "UploadURL", "CRON_TRANSIENT_STATUSES", diff --git a/scaleway/scaleway/function/v1beta1/api.py b/scaleway/scaleway/function/v1beta1/api.py index 551a4b382..32ca073fe 100644 --- a/scaleway/scaleway/function/v1beta1/api.py +++ b/scaleway/scaleway/function/v1beta1/api.py @@ -48,8 +48,6 @@ Secret, Token, Trigger, - UpdateTriggerRequestMnqNatsClientConfig, - UpdateTriggerRequestMnqSqsClientConfig, UpdateTriggerRequestSqsClientConfig, UploadURL, CreateNamespaceRequest, @@ -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: """ @@ -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, ), diff --git a/scaleway/scaleway/function/v1beta1/marshalling.py b/scaleway/scaleway/function/v1beta1/marshalling.py index 5e2bc81a1..de34332e2 100644 --- a/scaleway/scaleway/function/v1beta1/marshalling.py +++ b/scaleway/scaleway/function/v1beta1/marshalling.py @@ -38,8 +38,6 @@ TriggerMnqNatsClientConfig, TriggerMnqSqsClientConfig, TriggerSqsClientConfig, - UpdateTriggerRequestMnqNatsClientConfig, - UpdateTriggerRequestMnqSqsClientConfig, UpdateTriggerRequestSqsClientConfig, UploadURL, CreateNamespaceRequest, @@ -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, } @@ -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( @@ -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, diff --git a/scaleway/scaleway/function/v1beta1/types.py b/scaleway/scaleway/function/v1beta1/types.py index 936692703..e02ca2c3d 100644 --- a/scaleway/scaleway/function/v1beta1/types.py +++ b/scaleway/scaleway/function/v1beta1/types.py @@ -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 @@ -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. """