Skip to content

Commit ee786f1

Browse files
Laure-diLaure-di
authored
Merge branch 'main' into v1.6868.0
2 parents 0468061 + 22dab87 commit ee786f1

File tree

61 files changed

+2857
-667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2857
-667
lines changed

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

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,16 @@ def marshal_Metric(
610610
output.update(
611611
resolve_one_of(
612612
[
613-
OneOfPossibility("managed_metric", request.managed_metric),
614-
OneOfPossibility("cockpit_metric_name", request.cockpit_metric_name),
613+
OneOfPossibility(
614+
param="managed_metric",
615+
value=request.managed_metric,
616+
marshal_func=None,
617+
),
618+
OneOfPossibility(
619+
param="cockpit_metric_name",
620+
value=request.cockpit_metric_name,
621+
marshal_func=None,
622+
),
615623
]
616624
),
617625
)
@@ -642,7 +650,9 @@ def marshal_CreateInstancePolicyRequest(
642650
output.update(
643651
resolve_one_of(
644652
[
645-
OneOfPossibility("metric", request.metric),
653+
OneOfPossibility(
654+
param="metric", value=request.metric, marshal_func=marshal_Metric
655+
),
646656
]
647657
),
648658
)
@@ -703,15 +713,25 @@ def marshal_VolumeInstanceTemplate(
703713
output.update(
704714
resolve_one_of(
705715
[
706-
OneOfPossibility("from_empty", request.from_empty),
707-
OneOfPossibility("from_snapshot", request.from_snapshot),
716+
OneOfPossibility(
717+
param="from_empty",
718+
value=request.from_empty,
719+
marshal_func=marshal_VolumeInstanceTemplateFromEmpty,
720+
),
721+
OneOfPossibility(
722+
param="from_snapshot",
723+
value=request.from_snapshot,
724+
marshal_func=marshal_VolumeInstanceTemplateFromSnapshot,
725+
),
708726
]
709727
),
710728
)
711729
output.update(
712730
resolve_one_of(
713731
[
714-
OneOfPossibility("perf_iops", request.perf_iops),
732+
OneOfPossibility(
733+
param="perf_iops", value=request.perf_iops, marshal_func=None
734+
),
715735
]
716736
),
717737
)
@@ -842,8 +862,16 @@ def marshal_UpdateInstancePolicyRequestMetric(
842862
output.update(
843863
resolve_one_of(
844864
[
845-
OneOfPossibility("managed_metric", request.managed_metric),
846-
OneOfPossibility("cockpit_metric_name", request.cockpit_metric_name),
865+
OneOfPossibility(
866+
param="managed_metric",
867+
value=request.managed_metric,
868+
marshal_func=None,
869+
),
870+
OneOfPossibility(
871+
param="cockpit_metric_name",
872+
value=request.cockpit_metric_name,
873+
marshal_func=None,
874+
),
847875
]
848876
),
849877
)
@@ -874,7 +902,11 @@ def marshal_UpdateInstancePolicyRequest(
874902
output.update(
875903
resolve_one_of(
876904
[
877-
OneOfPossibility("metric", request.metric),
905+
OneOfPossibility(
906+
param="metric",
907+
value=request.metric,
908+
marshal_func=marshal_UpdateInstancePolicyRequestMetric,
909+
),
878910
]
879911
),
880912
)

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,12 +1575,16 @@ def marshal_CreateServerRequest(
15751575
resolve_one_of(
15761576
[
15771577
OneOfPossibility(
1578-
"project_id", request.project_id, defaults.default_project_id
1578+
param="project_id",
1579+
value=request.project_id,
1580+
default=defaults.default_project_id,
1581+
marshal_func=None,
15791582
),
15801583
OneOfPossibility(
1581-
"organization_id",
1582-
request.organization_id,
1583-
defaults.default_organization_id,
1584+
param="organization_id",
1585+
value=request.organization_id,
1586+
default=defaults.default_organization_id,
1587+
marshal_func=None,
15841588
),
15851589
]
15861590
),

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,15 +418,25 @@ def marshal_CreateVolumeRequest(
418418
output.update(
419419
resolve_one_of(
420420
[
421-
OneOfPossibility("from_empty", request.from_empty),
422-
OneOfPossibility("from_snapshot", request.from_snapshot),
421+
OneOfPossibility(
422+
param="from_empty",
423+
value=request.from_empty,
424+
marshal_func=marshal_CreateVolumeRequestFromEmpty,
425+
),
426+
OneOfPossibility(
427+
param="from_snapshot",
428+
value=request.from_snapshot,
429+
marshal_func=marshal_CreateVolumeRequestFromSnapshot,
430+
),
423431
]
424432
),
425433
)
426434
output.update(
427435
resolve_one_of(
428436
[
429-
OneOfPossibility("perf_iops", request.perf_iops),
437+
OneOfPossibility(
438+
param="perf_iops", value=request.perf_iops, marshal_func=None
439+
),
430440
]
431441
),
432442
)

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,15 +419,25 @@ def marshal_CreateVolumeRequest(
419419
output.update(
420420
resolve_one_of(
421421
[
422-
OneOfPossibility("from_empty", request.from_empty),
423-
OneOfPossibility("from_snapshot", request.from_snapshot),
422+
OneOfPossibility(
423+
param="from_empty",
424+
value=request.from_empty,
425+
marshal_func=marshal_CreateVolumeRequestFromEmpty,
426+
),
427+
OneOfPossibility(
428+
param="from_snapshot",
429+
value=request.from_snapshot,
430+
marshal_func=marshal_CreateVolumeRequestFromSnapshot,
431+
),
424432
]
425433
),
426434
)
427435
output.update(
428436
resolve_one_of(
429437
[
430-
OneOfPossibility("perf_iops", request.perf_iops),
438+
OneOfPossibility(
439+
param="perf_iops", value=request.perf_iops, marshal_func=None
440+
),
431441
]
432442
),
433443
)

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,11 @@ def marshal_RegionalApiCreateContactPointRequest(
910910
output.update(
911911
resolve_one_of(
912912
[
913-
OneOfPossibility("email", request.email),
913+
OneOfPossibility(
914+
param="email",
915+
value=request.email,
916+
marshal_func=marshal_ContactPointEmail,
917+
),
914918
]
915919
),
916920
)
@@ -971,7 +975,11 @@ def marshal_RegionalApiDeleteContactPointRequest(
971975
output.update(
972976
resolve_one_of(
973977
[
974-
OneOfPossibility("email", request.email),
978+
OneOfPossibility(
979+
param="email",
980+
value=request.email,
981+
marshal_func=marshal_ContactPointEmail,
982+
),
975983
]
976984
),
977985
)
@@ -1080,7 +1088,11 @@ def marshal_RegionalApiUpdateContactPointRequest(
10801088
output.update(
10811089
resolve_one_of(
10821090
[
1083-
OneOfPossibility("email", request.email),
1091+
OneOfPossibility(
1092+
param="email",
1093+
value=request.email,
1094+
marshal_func=marshal_ContactPointEmail,
1095+
),
10841096
]
10851097
),
10861098
)

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

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -839,8 +839,16 @@ def marshal_ContainerHealthCheckSpec(
839839
output.update(
840840
resolve_one_of(
841841
[
842-
OneOfPossibility("http", request.http),
843-
OneOfPossibility("tcp", request.tcp),
842+
OneOfPossibility(
843+
param="http",
844+
value=request.http,
845+
marshal_func=marshal_ContainerHealthCheckSpecHTTPProbe,
846+
),
847+
OneOfPossibility(
848+
param="tcp",
849+
value=request.tcp,
850+
marshal_func=marshal_ContainerHealthCheckSpecTCPProbe,
851+
),
844852
]
845853
),
846854
)
@@ -863,12 +871,19 @@ def marshal_ContainerScalingOption(
863871
resolve_one_of(
864872
[
865873
OneOfPossibility(
866-
"concurrent_requests_threshold",
867-
request.concurrent_requests_threshold,
874+
param="concurrent_requests_threshold",
875+
value=request.concurrent_requests_threshold,
876+
marshal_func=None,
868877
),
869-
OneOfPossibility("cpu_usage_threshold", request.cpu_usage_threshold),
870878
OneOfPossibility(
871-
"memory_usage_threshold", request.memory_usage_threshold
879+
param="cpu_usage_threshold",
880+
value=request.cpu_usage_threshold,
881+
marshal_func=None,
882+
),
883+
OneOfPossibility(
884+
param="memory_usage_threshold",
885+
value=request.memory_usage_threshold,
886+
marshal_func=None,
872887
),
873888
]
874889
),
@@ -1057,8 +1072,12 @@ def marshal_CreateTokenRequest(
10571072
output.update(
10581073
resolve_one_of(
10591074
[
1060-
OneOfPossibility("container_id", request.container_id),
1061-
OneOfPossibility("namespace_id", request.namespace_id),
1075+
OneOfPossibility(
1076+
param="container_id", value=request.container_id, marshal_func=None
1077+
),
1078+
OneOfPossibility(
1079+
param="namespace_id", value=request.namespace_id, marshal_func=None
1080+
),
10621081
]
10631082
),
10641083
)
@@ -1140,9 +1159,21 @@ def marshal_CreateTriggerRequest(
11401159
output.update(
11411160
resolve_one_of(
11421161
[
1143-
OneOfPossibility("scw_sqs_config", request.scw_sqs_config),
1144-
OneOfPossibility("scw_nats_config", request.scw_nats_config),
1145-
OneOfPossibility("sqs_config", request.sqs_config),
1162+
OneOfPossibility(
1163+
param="scw_sqs_config",
1164+
value=request.scw_sqs_config,
1165+
marshal_func=marshal_CreateTriggerRequestMnqSqsClientConfig,
1166+
),
1167+
OneOfPossibility(
1168+
param="scw_nats_config",
1169+
value=request.scw_nats_config,
1170+
marshal_func=marshal_CreateTriggerRequestMnqNatsClientConfig,
1171+
),
1172+
OneOfPossibility(
1173+
param="sqs_config",
1174+
value=request.sqs_config,
1175+
marshal_func=marshal_CreateTriggerRequestSqsClientConfig,
1176+
),
11461177
]
11471178
),
11481179
)
@@ -1312,7 +1343,11 @@ def marshal_UpdateTriggerRequest(
13121343
output.update(
13131344
resolve_one_of(
13141345
[
1315-
OneOfPossibility("sqs_config", request.sqs_config),
1346+
OneOfPossibility(
1347+
param="sqs_config",
1348+
value=request.sqs_config,
1349+
marshal_func=marshal_UpdateTriggerRequestSqsClientConfig,
1350+
),
13161351
]
13171352
),
13181353
)

0 commit comments

Comments
 (0)