Skip to content

Commit 259ab4d

Browse files
scaleway-botscaleway-bot
authored
feat: remove duplicated one of (#22)
1 parent fd6c2b2 commit 259ab4d

File tree

4 files changed

+16
-120
lines changed

4 files changed

+16
-120
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -493,12 +493,6 @@ def marshal_CreateTokenRequest(
493493
),
494494
"description": request.description,
495495
"expires_at": request.expires_at,
496-
**resolve_one_of(
497-
[
498-
OneOfPossibility("container_id", request.container_id),
499-
OneOfPossibility("namespace_id", request.namespace_id),
500-
]
501-
),
502496
}
503497

504498

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

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -830,12 +830,6 @@ def marshal_CreateTriggerRequestNatsFailureHandlingPolicy(
830830
)
831831
if request.retry_policy is not None
832832
else None,
833-
**resolve_one_of(
834-
[
835-
OneOfPossibility("nats_dead_letter", request.nats_dead_letter),
836-
OneOfPossibility("sqs_dead_letter", request.sqs_dead_letter),
837-
]
838-
),
839833
}
840834

841835

@@ -967,20 +961,14 @@ def marshal_CreateTokenRequest(
967961
defaults: ProfileDefaults,
968962
) -> Dict[str, Any]:
969963
return {
970-
"description": request.description,
971-
"expires_at": request.expires_at,
972-
**resolve_one_of(
973-
[
974-
OneOfPossibility("function_id", request.function_id),
975-
OneOfPossibility("namespace_id", request.namespace_id),
976-
]
977-
),
978964
**resolve_one_of(
979965
[
980966
OneOfPossibility("function_id", request.function_id),
981967
OneOfPossibility("namespace_id", request.namespace_id),
982968
]
983969
),
970+
"description": request.description,
971+
"expires_at": request.expires_at,
984972
}
985973

986974

@@ -989,19 +977,13 @@ def marshal_CreateTriggerInputRequest(
989977
defaults: ProfileDefaults,
990978
) -> Dict[str, Any]:
991979
return {
992-
"mnq_namespace_id": request.mnq_namespace_id,
993-
**resolve_one_of(
994-
[
995-
OneOfPossibility("nats_config", request.nats_config),
996-
OneOfPossibility("sqs_config", request.sqs_config),
997-
]
998-
),
999980
**resolve_one_of(
1000981
[
1001982
OneOfPossibility("nats_config", request.nats_config),
1002983
OneOfPossibility("sqs_config", request.sqs_config),
1003984
]
1004985
),
986+
"mnq_namespace_id": request.mnq_namespace_id,
1005987
"trigger_id": request.trigger_id,
1006988
}
1007989

@@ -1011,19 +993,6 @@ def marshal_CreateTriggerRequest(
1011993
defaults: ProfileDefaults,
1012994
) -> Dict[str, Any]:
1013995
return {
1014-
"description": request.description,
1015-
"function_id": request.function_id,
1016-
"name": request.name,
1017-
**resolve_one_of(
1018-
[
1019-
OneOfPossibility(
1020-
"nats_failure_handling_policy", request.nats_failure_handling_policy
1021-
),
1022-
OneOfPossibility(
1023-
"sqs_failure_handling_policy", request.sqs_failure_handling_policy
1024-
),
1025-
]
1026-
),
1027996
**resolve_one_of(
1028997
[
1029998
OneOfPossibility(
@@ -1034,6 +1003,9 @@ def marshal_CreateTriggerRequest(
10341003
),
10351004
]
10361005
),
1006+
"description": request.description,
1007+
"function_id": request.function_id,
1008+
"name": request.name,
10371009
"type": TriggerType(request.type_),
10381010
}
10391011

@@ -1043,12 +1015,6 @@ def marshal_SetTriggerInputsRequest(
10431015
defaults: ProfileDefaults,
10441016
) -> Dict[str, Any]:
10451017
return {
1046-
**resolve_one_of(
1047-
[
1048-
OneOfPossibility("sqs", request.sqs),
1049-
OneOfPossibility("nats", request.nats),
1050-
]
1051-
),
10521018
**resolve_one_of(
10531019
[
10541020
OneOfPossibility("sqs", request.sqs),
@@ -1121,12 +1087,6 @@ def marshal_UpdateTriggerInputRequest(
11211087
OneOfPossibility("sqs_config", request.sqs_config),
11221088
]
11231089
),
1124-
**resolve_one_of(
1125-
[
1126-
OneOfPossibility("nats_config", request.nats_config),
1127-
OneOfPossibility("sqs_config", request.sqs_config),
1128-
]
1129-
),
11301090
}
11311091

11321092

@@ -1135,18 +1095,12 @@ def marshal_UpdateTriggerRequest(
11351095
defaults: ProfileDefaults,
11361096
) -> Dict[str, Any]:
11371097
return {
1138-
"description": request.description,
1139-
"name": request.name,
1140-
**resolve_one_of(
1141-
[
1142-
OneOfPossibility("nats_config", request.nats_config),
1143-
OneOfPossibility("sqs_config", request.sqs_config),
1144-
]
1145-
),
11461098
**resolve_one_of(
11471099
[
11481100
OneOfPossibility("nats_config", request.nats_config),
11491101
OneOfPossibility("sqs_config", request.sqs_config),
11501102
]
11511103
),
1104+
"description": request.description,
1105+
"name": request.name,
11521106
}

‎scaleway/scaleway/container/v1beta1/marshalling.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -493,12 +493,6 @@ def marshal_CreateTokenRequest(
493493
),
494494
"description": request.description,
495495
"expires_at": request.expires_at,
496-
**resolve_one_of(
497-
[
498-
OneOfPossibility("container_id", request.container_id),
499-
OneOfPossibility("namespace_id", request.namespace_id),
500-
]
501-
),
502496
}
503497

504498

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

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -830,12 +830,6 @@ def marshal_CreateTriggerRequestNatsFailureHandlingPolicy(
830830
)
831831
if request.retry_policy is not None
832832
else None,
833-
**resolve_one_of(
834-
[
835-
OneOfPossibility("nats_dead_letter", request.nats_dead_letter),
836-
OneOfPossibility("sqs_dead_letter", request.sqs_dead_letter),
837-
]
838-
),
839833
}
840834

841835

@@ -967,20 +961,14 @@ def marshal_CreateTokenRequest(
967961
defaults: ProfileDefaults,
968962
) -> Dict[str, Any]:
969963
return {
970-
"description": request.description,
971-
"expires_at": request.expires_at,
972-
**resolve_one_of(
973-
[
974-
OneOfPossibility("function_id", request.function_id),
975-
OneOfPossibility("namespace_id", request.namespace_id),
976-
]
977-
),
978964
**resolve_one_of(
979965
[
980966
OneOfPossibility("function_id", request.function_id),
981967
OneOfPossibility("namespace_id", request.namespace_id),
982968
]
983969
),
970+
"description": request.description,
971+
"expires_at": request.expires_at,
984972
}
985973

986974

@@ -989,19 +977,13 @@ def marshal_CreateTriggerInputRequest(
989977
defaults: ProfileDefaults,
990978
) -> Dict[str, Any]:
991979
return {
992-
"mnq_namespace_id": request.mnq_namespace_id,
993-
**resolve_one_of(
994-
[
995-
OneOfPossibility("nats_config", request.nats_config),
996-
OneOfPossibility("sqs_config", request.sqs_config),
997-
]
998-
),
999980
**resolve_one_of(
1000981
[
1001982
OneOfPossibility("nats_config", request.nats_config),
1002983
OneOfPossibility("sqs_config", request.sqs_config),
1003984
]
1004985
),
986+
"mnq_namespace_id": request.mnq_namespace_id,
1005987
"trigger_id": request.trigger_id,
1006988
}
1007989

@@ -1011,19 +993,6 @@ def marshal_CreateTriggerRequest(
1011993
defaults: ProfileDefaults,
1012994
) -> Dict[str, Any]:
1013995
return {
1014-
"description": request.description,
1015-
"function_id": request.function_id,
1016-
"name": request.name,
1017-
**resolve_one_of(
1018-
[
1019-
OneOfPossibility(
1020-
"nats_failure_handling_policy", request.nats_failure_handling_policy
1021-
),
1022-
OneOfPossibility(
1023-
"sqs_failure_handling_policy", request.sqs_failure_handling_policy
1024-
),
1025-
]
1026-
),
1027996
**resolve_one_of(
1028997
[
1029998
OneOfPossibility(
@@ -1034,6 +1003,9 @@ def marshal_CreateTriggerRequest(
10341003
),
10351004
]
10361005
),
1006+
"description": request.description,
1007+
"function_id": request.function_id,
1008+
"name": request.name,
10371009
"type": TriggerType(request.type_),
10381010
}
10391011

@@ -1043,12 +1015,6 @@ def marshal_SetTriggerInputsRequest(
10431015
defaults: ProfileDefaults,
10441016
) -> Dict[str, Any]:
10451017
return {
1046-
**resolve_one_of(
1047-
[
1048-
OneOfPossibility("sqs", request.sqs),
1049-
OneOfPossibility("nats", request.nats),
1050-
]
1051-
),
10521018
**resolve_one_of(
10531019
[
10541020
OneOfPossibility("sqs", request.sqs),
@@ -1121,12 +1087,6 @@ def marshal_UpdateTriggerInputRequest(
11211087
OneOfPossibility("sqs_config", request.sqs_config),
11221088
]
11231089
),
1124-
**resolve_one_of(
1125-
[
1126-
OneOfPossibility("nats_config", request.nats_config),
1127-
OneOfPossibility("sqs_config", request.sqs_config),
1128-
]
1129-
),
11301090
}
11311091

11321092

@@ -1135,18 +1095,12 @@ def marshal_UpdateTriggerRequest(
11351095
defaults: ProfileDefaults,
11361096
) -> Dict[str, Any]:
11371097
return {
1138-
"description": request.description,
1139-
"name": request.name,
1140-
**resolve_one_of(
1141-
[
1142-
OneOfPossibility("nats_config", request.nats_config),
1143-
OneOfPossibility("sqs_config", request.sqs_config),
1144-
]
1145-
),
11461098
**resolve_one_of(
11471099
[
11481100
OneOfPossibility("nats_config", request.nats_config),
11491101
OneOfPossibility("sqs_config", request.sqs_config),
11501102
]
11511103
),
1104+
"description": request.description,
1105+
"name": request.name,
11521106
}

0 commit comments

Comments
 (0)