Skip to content

Commit 4532943

Browse files
authored
fix: marshal oneof fields (#99)
1 parent 397d16f commit 4532943

File tree

32 files changed

+2082
-388
lines changed

32 files changed

+2082
-388
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,11 +823,17 @@ def marshal_CreateServerRequest(
823823
**resolve_one_of(
824824
[
825825
OneOfPossibility(
826-
"project_id", request.project_id, defaults.default_project_id
826+
"project_id",
827+
request.project_id or defaults.default_project_id
828+
if request.project_id is not None
829+
else None,
830+
defaults.default_project_id,
827831
),
828832
OneOfPossibility(
829833
"organization_id",
830-
request.organization_id,
834+
request.organization_id or defaults.default_organization_id
835+
if request.organization_id is not None
836+
else None,
831837
defaults.default_organization_id,
832838
),
833839
]

scaleway-async/scaleway_async/cockpit/v1beta1/marshalling.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,12 @@ def marshal_ContactPoint(
276276
return {
277277
**resolve_one_of(
278278
[
279-
OneOfPossibility("email", request.email),
279+
OneOfPossibility(
280+
"email",
281+
marshal_ContactPointEmail(request.email, defaults)
282+
if request.email is not None
283+
else None,
284+
),
280285
]
281286
),
282287
}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,14 @@ def marshal_CreateTokenRequest(
487487
return {
488488
**resolve_one_of(
489489
[
490-
OneOfPossibility("container_id", request.container_id),
491-
OneOfPossibility("namespace_id", request.namespace_id),
490+
OneOfPossibility(
491+
"container_id",
492+
request.container_id if request.container_id is not None else None,
493+
),
494+
OneOfPossibility(
495+
"namespace_id",
496+
request.namespace_id if request.namespace_id is not None else None,
497+
),
492498
]
493499
),
494500
"description": request.description,

0 commit comments

Comments
 (0)