Skip to content

Commit b321cb3

Browse files
scaleway-botscaleway-bot
authored
feat(serverless): change UpdateTriggerRequest to only be able to update a few fields (#123)
1 parent 29d120b commit b321cb3

File tree

8 files changed

+2
-182
lines changed

8 files changed

+2
-182
lines changed

‎scaleway-async/scaleway_async/function/v1beta1/__init__.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
from .types import TriggerMnqNatsClientConfig
4646
from .types import TriggerMnqSqsClientConfig
4747
from .types import TriggerSqsClientConfig
48-
from .types import UpdateTriggerRequestMnqNatsClientConfig
49-
from .types import UpdateTriggerRequestMnqSqsClientConfig
5048
from .types import UpdateTriggerRequestSqsClientConfig
5149
from .types import UploadURL
5250
from .content import CRON_TRANSIENT_STATUSES
@@ -103,8 +101,6 @@
103101
"TriggerMnqNatsClientConfig",
104102
"TriggerMnqSqsClientConfig",
105103
"TriggerSqsClientConfig",
106-
"UpdateTriggerRequestMnqNatsClientConfig",
107-
"UpdateTriggerRequestMnqSqsClientConfig",
108104
"UpdateTriggerRequestSqsClientConfig",
109105
"UploadURL",
110106
"CRON_TRANSIENT_STATUSES",

‎scaleway-async/scaleway_async/function/v1beta1/api.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
Secret,
4949
Token,
5050
Trigger,
51-
UpdateTriggerRequestMnqNatsClientConfig,
52-
UpdateTriggerRequestMnqSqsClientConfig,
5351
UpdateTriggerRequestSqsClientConfig,
5452
UploadURL,
5553
CreateNamespaceRequest,
@@ -1933,9 +1931,7 @@ async def update_trigger(
19331931
region: Optional[Region] = None,
19341932
name: Optional[str] = None,
19351933
description: Optional[str] = None,
1936-
scw_sqs_config: Optional[UpdateTriggerRequestMnqSqsClientConfig] = None,
19371934
sqs_config: Optional[UpdateTriggerRequestSqsClientConfig] = None,
1938-
scw_nats_config: Optional[UpdateTriggerRequestMnqNatsClientConfig] = None,
19391935
) -> Trigger:
19401936
"""
19411937
@@ -1959,9 +1955,7 @@ async def update_trigger(
19591955
region=region,
19601956
name=name,
19611957
description=description,
1962-
scw_sqs_config=scw_sqs_config,
19631958
sqs_config=sqs_config,
1964-
scw_nats_config=scw_nats_config,
19651959
),
19661960
self.client,
19671961
),

‎scaleway-async/scaleway_async/function/v1beta1/marshalling.py‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
TriggerMnqNatsClientConfig,
3939
TriggerMnqSqsClientConfig,
4040
TriggerSqsClientConfig,
41-
UpdateTriggerRequestMnqNatsClientConfig,
42-
UpdateTriggerRequestMnqSqsClientConfig,
4341
UpdateTriggerRequestSqsClientConfig,
4442
UploadURL,
4543
CreateNamespaceRequest,
@@ -695,38 +693,12 @@ def marshal_Secret(
695693
}
696694

697695

698-
def marshal_UpdateTriggerRequestMnqNatsClientConfig(
699-
request: UpdateTriggerRequestMnqNatsClientConfig,
700-
defaults: ProfileDefaults,
701-
) -> Dict[str, Any]:
702-
return {
703-
"mnq_namespace_id": request.mnq_namespace_id,
704-
"mnq_project_id": request.mnq_project_id,
705-
"mnq_region": request.mnq_region,
706-
"subject": request.subject,
707-
}
708-
709-
710-
def marshal_UpdateTriggerRequestMnqSqsClientConfig(
711-
request: UpdateTriggerRequestMnqSqsClientConfig,
712-
defaults: ProfileDefaults,
713-
) -> Dict[str, Any]:
714-
return {
715-
"mnq_namespace_id": request.mnq_namespace_id,
716-
"mnq_project_id": request.mnq_project_id,
717-
"mnq_region": request.mnq_region,
718-
"queue": request.queue,
719-
}
720-
721-
722696
def marshal_UpdateTriggerRequestSqsClientConfig(
723697
request: UpdateTriggerRequestSqsClientConfig,
724698
defaults: ProfileDefaults,
725699
) -> Dict[str, Any]:
726700
return {
727701
"access_key": request.access_key,
728-
"endpoint": request.endpoint,
729-
"queue_url": request.queue_url,
730702
"secret_key": request.secret_key,
731703
}
732704

@@ -914,14 +886,6 @@ def marshal_UpdateTriggerRequest(
914886
return {
915887
**resolve_one_of(
916888
[
917-
OneOfPossibility(
918-
"scw_sqs_config",
919-
marshal_UpdateTriggerRequestMnqSqsClientConfig(
920-
request.scw_sqs_config, defaults
921-
)
922-
if request.scw_sqs_config is not None
923-
else None,
924-
),
925889
OneOfPossibility(
926890
"sqs_config",
927891
marshal_UpdateTriggerRequestSqsClientConfig(
@@ -930,14 +894,6 @@ def marshal_UpdateTriggerRequest(
930894
if request.sqs_config is not None
931895
else None,
932896
),
933-
OneOfPossibility(
934-
"scw_nats_config",
935-
marshal_UpdateTriggerRequestMnqNatsClientConfig(
936-
request.scw_nats_config, defaults
937-
)
938-
if request.scw_nats_config is not None
939-
else None,
940-
),
941897
]
942898
),
943899
"description": request.description,

‎scaleway-async/scaleway_async/function/v1beta1/types.py‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -643,34 +643,8 @@ class TriggerSqsClientConfig:
643643
secret_key: str
644644

645645

646-
@dataclass
647-
class UpdateTriggerRequestMnqNatsClientConfig:
648-
mnq_namespace_id: str
649-
650-
subject: str
651-
652-
mnq_project_id: str
653-
654-
mnq_region: str
655-
656-
657-
@dataclass
658-
class UpdateTriggerRequestMnqSqsClientConfig:
659-
mnq_namespace_id: str
660-
661-
queue: str
662-
663-
mnq_project_id: str
664-
665-
mnq_region: str
666-
667-
668646
@dataclass
669647
class UpdateTriggerRequestSqsClientConfig:
670-
endpoint: str
671-
672-
queue_url: str
673-
674648
access_key: str
675649

676650
secret_key: str
@@ -1218,19 +1192,9 @@ class UpdateTriggerRequest:
12181192

12191193
description: Optional[str]
12201194

1221-
scw_sqs_config: Optional[UpdateTriggerRequestMnqSqsClientConfig]
1222-
"""
1223-
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
1224-
"""
1225-
12261195
sqs_config: Optional[UpdateTriggerRequestSqsClientConfig]
12271196
"""
1228-
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
1229-
"""
1230-
1231-
scw_nats_config: Optional[UpdateTriggerRequestMnqNatsClientConfig]
1232-
"""
1233-
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
1197+
One-of ('config'): at most one of 'sqs_config' could be set.
12341198
"""
12351199

12361200

‎scaleway/scaleway/function/v1beta1/__init__.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
from .types import TriggerMnqNatsClientConfig
4646
from .types import TriggerMnqSqsClientConfig
4747
from .types import TriggerSqsClientConfig
48-
from .types import UpdateTriggerRequestMnqNatsClientConfig
49-
from .types import UpdateTriggerRequestMnqSqsClientConfig
5048
from .types import UpdateTriggerRequestSqsClientConfig
5149
from .types import UploadURL
5250
from .content import CRON_TRANSIENT_STATUSES
@@ -103,8 +101,6 @@
103101
"TriggerMnqNatsClientConfig",
104102
"TriggerMnqSqsClientConfig",
105103
"TriggerSqsClientConfig",
106-
"UpdateTriggerRequestMnqNatsClientConfig",
107-
"UpdateTriggerRequestMnqSqsClientConfig",
108104
"UpdateTriggerRequestSqsClientConfig",
109105
"UploadURL",
110106
"CRON_TRANSIENT_STATUSES",

‎scaleway/scaleway/function/v1beta1/api.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
Secret,
4949
Token,
5050
Trigger,
51-
UpdateTriggerRequestMnqNatsClientConfig,
52-
UpdateTriggerRequestMnqSqsClientConfig,
5351
UpdateTriggerRequestSqsClientConfig,
5452
UploadURL,
5553
CreateNamespaceRequest,
@@ -1929,9 +1927,7 @@ def update_trigger(
19291927
region: Optional[Region] = None,
19301928
name: Optional[str] = None,
19311929
description: Optional[str] = None,
1932-
scw_sqs_config: Optional[UpdateTriggerRequestMnqSqsClientConfig] = None,
19331930
sqs_config: Optional[UpdateTriggerRequestSqsClientConfig] = None,
1934-
scw_nats_config: Optional[UpdateTriggerRequestMnqNatsClientConfig] = None,
19351931
) -> Trigger:
19361932
"""
19371933
@@ -1955,9 +1951,7 @@ def update_trigger(
19551951
region=region,
19561952
name=name,
19571953
description=description,
1958-
scw_sqs_config=scw_sqs_config,
19591954
sqs_config=sqs_config,
1960-
scw_nats_config=scw_nats_config,
19611955
),
19621956
self.client,
19631957
),

‎scaleway/scaleway/function/v1beta1/marshalling.py‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
TriggerMnqNatsClientConfig,
3939
TriggerMnqSqsClientConfig,
4040
TriggerSqsClientConfig,
41-
UpdateTriggerRequestMnqNatsClientConfig,
42-
UpdateTriggerRequestMnqSqsClientConfig,
4341
UpdateTriggerRequestSqsClientConfig,
4442
UploadURL,
4543
CreateNamespaceRequest,
@@ -695,38 +693,12 @@ def marshal_Secret(
695693
}
696694

697695

698-
def marshal_UpdateTriggerRequestMnqNatsClientConfig(
699-
request: UpdateTriggerRequestMnqNatsClientConfig,
700-
defaults: ProfileDefaults,
701-
) -> Dict[str, Any]:
702-
return {
703-
"mnq_namespace_id": request.mnq_namespace_id,
704-
"mnq_project_id": request.mnq_project_id,
705-
"mnq_region": request.mnq_region,
706-
"subject": request.subject,
707-
}
708-
709-
710-
def marshal_UpdateTriggerRequestMnqSqsClientConfig(
711-
request: UpdateTriggerRequestMnqSqsClientConfig,
712-
defaults: ProfileDefaults,
713-
) -> Dict[str, Any]:
714-
return {
715-
"mnq_namespace_id": request.mnq_namespace_id,
716-
"mnq_project_id": request.mnq_project_id,
717-
"mnq_region": request.mnq_region,
718-
"queue": request.queue,
719-
}
720-
721-
722696
def marshal_UpdateTriggerRequestSqsClientConfig(
723697
request: UpdateTriggerRequestSqsClientConfig,
724698
defaults: ProfileDefaults,
725699
) -> Dict[str, Any]:
726700
return {
727701
"access_key": request.access_key,
728-
"endpoint": request.endpoint,
729-
"queue_url": request.queue_url,
730702
"secret_key": request.secret_key,
731703
}
732704

@@ -914,14 +886,6 @@ def marshal_UpdateTriggerRequest(
914886
return {
915887
**resolve_one_of(
916888
[
917-
OneOfPossibility(
918-
"scw_sqs_config",
919-
marshal_UpdateTriggerRequestMnqSqsClientConfig(
920-
request.scw_sqs_config, defaults
921-
)
922-
if request.scw_sqs_config is not None
923-
else None,
924-
),
925889
OneOfPossibility(
926890
"sqs_config",
927891
marshal_UpdateTriggerRequestSqsClientConfig(
@@ -930,14 +894,6 @@ def marshal_UpdateTriggerRequest(
930894
if request.sqs_config is not None
931895
else None,
932896
),
933-
OneOfPossibility(
934-
"scw_nats_config",
935-
marshal_UpdateTriggerRequestMnqNatsClientConfig(
936-
request.scw_nats_config, defaults
937-
)
938-
if request.scw_nats_config is not None
939-
else None,
940-
),
941897
]
942898
),
943899
"description": request.description,

‎scaleway/scaleway/function/v1beta1/types.py‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -643,34 +643,8 @@ class TriggerSqsClientConfig:
643643
secret_key: str
644644

645645

646-
@dataclass
647-
class UpdateTriggerRequestMnqNatsClientConfig:
648-
mnq_namespace_id: str
649-
650-
subject: str
651-
652-
mnq_project_id: str
653-
654-
mnq_region: str
655-
656-
657-
@dataclass
658-
class UpdateTriggerRequestMnqSqsClientConfig:
659-
mnq_namespace_id: str
660-
661-
queue: str
662-
663-
mnq_project_id: str
664-
665-
mnq_region: str
666-
667-
668646
@dataclass
669647
class UpdateTriggerRequestSqsClientConfig:
670-
endpoint: str
671-
672-
queue_url: str
673-
674648
access_key: str
675649

676650
secret_key: str
@@ -1218,19 +1192,9 @@ class UpdateTriggerRequest:
12181192

12191193
description: Optional[str]
12201194

1221-
scw_sqs_config: Optional[UpdateTriggerRequestMnqSqsClientConfig]
1222-
"""
1223-
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
1224-
"""
1225-
12261195
sqs_config: Optional[UpdateTriggerRequestSqsClientConfig]
12271196
"""
1228-
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
1229-
"""
1230-
1231-
scw_nats_config: Optional[UpdateTriggerRequestMnqNatsClientConfig]
1232-
"""
1233-
One-of ('config'): at most one of 'scw_sqs_config', 'sqs_config', 'scw_nats_config' could be set.
1197+
One-of ('config'): at most one of 'sqs_config' could be set.
12341198
"""
12351199

12361200

0 commit comments

Comments
 (0)