Skip to content

Commit ddfd7ac

Browse files
scaleway-botscaleway-bot
authored
feat: remove duplicated one of (#29)
1 parent cbaea91 commit ddfd7ac

File tree

16 files changed

+90
-530
lines changed

16 files changed

+90
-530
lines changed

‎scaleway-async/scaleway_async/baremetal/v1/marshalling.py

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -811,25 +811,6 @@ def marshal_CreateServerRequest(
811811
defaults: ProfileDefaults,
812812
) -> Dict[str, Any]:
813813
return {
814-
"description": request.description,
815-
"install": marshal_CreateServerRequestInstall(request.install, defaults)
816-
if request.install is not None
817-
else None,
818-
"name": request.name,
819-
"offer_id": request.offer_id,
820-
"option_ids": request.option_ids,
821-
**resolve_one_of(
822-
[
823-
OneOfPossibility(
824-
"project_id", request.project_id, defaults.default_project_id
825-
),
826-
OneOfPossibility(
827-
"organization_id",
828-
request.organization_id,
829-
defaults.default_organization_id,
830-
),
831-
]
832-
),
833814
**resolve_one_of(
834815
[
835816
OneOfPossibility(
@@ -842,6 +823,13 @@ def marshal_CreateServerRequest(
842823
),
843824
]
844825
),
826+
"description": request.description,
827+
"install": marshal_CreateServerRequestInstall(request.install, defaults)
828+
if request.install is not None
829+
else None,
830+
"name": request.name,
831+
"offer_id": request.offer_id,
832+
"option_ids": request.option_ids,
845833
"tags": request.tags,
846834
}
847835

‎scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -514,16 +514,6 @@ def marshal_RuleSpecs(
514514
]
515515
),
516516
"permission_set_names": request.permission_set_names,
517-
**resolve_one_of(
518-
[
519-
OneOfPossibility("project_ids", request.project_ids),
520-
OneOfPossibility(
521-
"organization_id",
522-
request.organization_id,
523-
defaults.default_organization_id,
524-
),
525-
]
526-
),
527517
}
528518

529519

@@ -538,12 +528,6 @@ def marshal_AddGroupMemberRequest(
538528
OneOfPossibility("application_id", request.application_id),
539529
]
540530
),
541-
**resolve_one_of(
542-
[
543-
OneOfPossibility("user_id", request.user_id),
544-
OneOfPossibility("application_id", request.application_id),
545-
]
546-
),
547531
}
548532

549533

@@ -561,12 +545,6 @@ def marshal_CreateAPIKeyRequest(
561545
"default_project_id": request.default_project_id,
562546
"description": request.description,
563547
"expires_at": request.expires_at,
564-
**resolve_one_of(
565-
[
566-
OneOfPossibility("application_id", request.application_id),
567-
OneOfPossibility("user_id", request.user_id),
568-
]
569-
),
570548
}
571549

572550

@@ -606,35 +584,11 @@ def marshal_CreatePolicyRequest(
606584
]
607585
),
608586
"description": request.description,
609-
**resolve_one_of(
610-
[
611-
OneOfPossibility("user_id", request.user_id),
612-
OneOfPossibility("group_id", request.group_id),
613-
OneOfPossibility("application_id", request.application_id),
614-
OneOfPossibility("no_principal", request.no_principal),
615-
]
616-
),
617587
"name": request.name,
618-
**resolve_one_of(
619-
[
620-
OneOfPossibility("user_id", request.user_id),
621-
OneOfPossibility("group_id", request.group_id),
622-
OneOfPossibility("application_id", request.application_id),
623-
OneOfPossibility("no_principal", request.no_principal),
624-
]
625-
),
626588
"organization_id": request.organization_id or defaults.default_organization_id,
627589
"rules": [marshal_RuleSpecs(v, defaults) for v in request.rules]
628590
if request.rules is not None
629591
else None,
630-
**resolve_one_of(
631-
[
632-
OneOfPossibility("user_id", request.user_id),
633-
OneOfPossibility("group_id", request.group_id),
634-
OneOfPossibility("application_id", request.application_id),
635-
OneOfPossibility("no_principal", request.no_principal),
636-
]
637-
),
638592
}
639593

640594

@@ -660,12 +614,6 @@ def marshal_RemoveGroupMemberRequest(
660614
OneOfPossibility("application_id", request.application_id),
661615
]
662616
),
663-
**resolve_one_of(
664-
[
665-
OneOfPossibility("user_id", request.user_id),
666-
OneOfPossibility("application_id", request.application_id),
667-
]
668-
),
669617
}
670618

671619

@@ -733,31 +681,7 @@ def marshal_UpdatePolicyRequest(
733681
]
734682
),
735683
"description": request.description,
736-
**resolve_one_of(
737-
[
738-
OneOfPossibility("user_id", request.user_id),
739-
OneOfPossibility("group_id", request.group_id),
740-
OneOfPossibility("application_id", request.application_id),
741-
OneOfPossibility("no_principal", request.no_principal),
742-
]
743-
),
744684
"name": request.name,
745-
**resolve_one_of(
746-
[
747-
OneOfPossibility("user_id", request.user_id),
748-
OneOfPossibility("group_id", request.group_id),
749-
OneOfPossibility("application_id", request.application_id),
750-
OneOfPossibility("no_principal", request.no_principal),
751-
]
752-
),
753-
**resolve_one_of(
754-
[
755-
OneOfPossibility("user_id", request.user_id),
756-
OneOfPossibility("group_id", request.group_id),
757-
OneOfPossibility("application_id", request.application_id),
758-
OneOfPossibility("no_principal", request.no_principal),
759-
]
760-
),
761685
}
762686

763687

‎scaleway-async/scaleway_async/iot/v1/marshalling.py

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -822,20 +822,20 @@ def marshal_CreateHubRequest(
822822
defaults: ProfileDefaults,
823823
) -> Dict[str, Any]:
824824
return {
825-
"disable_events": request.disable_events,
826-
"events_topic_prefix": request.events_topic_prefix,
827-
"name": request.name,
828-
"product_plan": HubProductPlan(request.product_plan)
829-
if request.product_plan is not None
830-
else None,
831-
"project_id": request.project_id or defaults.default_project_id,
832825
**resolve_one_of(
833826
[
834827
OneOfPossibility(
835828
"twins_graphite_config", request.twins_graphite_config
836829
),
837830
]
838831
),
832+
"disable_events": request.disable_events,
833+
"events_topic_prefix": request.events_topic_prefix,
834+
"name": request.name,
835+
"product_plan": HubProductPlan(request.product_plan)
836+
if request.product_plan is not None
837+
else None,
838+
"project_id": request.project_id or defaults.default_project_id,
839839
}
840840

841841

@@ -867,20 +867,6 @@ def marshal_CreateRouteRequest(
867867
),
868868
"hub_id": request.hub_id,
869869
"name": request.name,
870-
**resolve_one_of(
871-
[
872-
OneOfPossibility("s3_config", request.s3_config),
873-
OneOfPossibility("db_config", request.db_config),
874-
OneOfPossibility("rest_config", request.rest_config),
875-
]
876-
),
877-
**resolve_one_of(
878-
[
879-
OneOfPossibility("s3_config", request.s3_config),
880-
OneOfPossibility("db_config", request.db_config),
881-
OneOfPossibility("rest_config", request.rest_config),
882-
]
883-
),
884870
"topic": request.topic,
885871
}
886872

@@ -946,18 +932,18 @@ def marshal_UpdateHubRequest(
946932
defaults: ProfileDefaults,
947933
) -> Dict[str, Any]:
948934
return {
949-
"disable_events": request.disable_events,
950-
"enable_device_auto_provisioning": request.enable_device_auto_provisioning,
951-
"events_topic_prefix": request.events_topic_prefix,
952-
"name": request.name,
953-
"product_plan": HubProductPlan(request.product_plan),
954935
**resolve_one_of(
955936
[
956937
OneOfPossibility(
957938
"twins_graphite_config", request.twins_graphite_config
958939
),
959940
]
960941
),
942+
"disable_events": request.disable_events,
943+
"enable_device_auto_provisioning": request.enable_device_auto_provisioning,
944+
"events_topic_prefix": request.events_topic_prefix,
945+
"name": request.name,
946+
"product_plan": HubProductPlan(request.product_plan),
961947
}
962948

963949

@@ -974,19 +960,5 @@ def marshal_UpdateRouteRequest(
974960
]
975961
),
976962
"name": request.name,
977-
**resolve_one_of(
978-
[
979-
OneOfPossibility("s3_config", request.s3_config),
980-
OneOfPossibility("db_config", request.db_config),
981-
OneOfPossibility("rest_config", request.rest_config),
982-
]
983-
),
984-
**resolve_one_of(
985-
[
986-
OneOfPossibility("s3_config", request.s3_config),
987-
OneOfPossibility("db_config", request.db_config),
988-
OneOfPossibility("rest_config", request.rest_config),
989-
]
990-
),
991963
"topic": request.topic,
992964
}

‎scaleway-async/scaleway_async/mnq/v1alpha1/marshalling.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,13 @@ def marshal_CreateCredentialRequest(
244244
defaults: ProfileDefaults,
245245
) -> Dict[str, Any]:
246246
return {
247-
"name": request.name,
248-
"namespace_id": request.namespace_id,
249247
**resolve_one_of(
250248
[
251249
OneOfPossibility("permissions", request.permissions),
252250
]
253251
),
252+
"name": request.name,
253+
"namespace_id": request.namespace_id,
254254
}
255255

256256

@@ -272,12 +272,12 @@ def marshal_UpdateCredentialRequest(
272272
defaults: ProfileDefaults,
273273
) -> Dict[str, Any]:
274274
return {
275-
"name": request.name,
276275
**resolve_one_of(
277276
[
278277
OneOfPossibility("permissions", request.permissions),
279278
]
280279
),
280+
"name": request.name,
281281
}
282282

283283

0 commit comments

Comments
 (0)