Skip to content

Commit b579449

Browse files
Laure-diLaure-di
authored
Merge branch 'main' into v1.6838.0
2 parents 4f442fd + feb712a commit b579449

File tree

71 files changed

+3053
-721
lines changed

Some content is hidden

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

71 files changed

+3053
-721
lines changed

‎scaleway-async/poetry.lock‎

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scaleway-async/pyproject.toml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,35 @@ build-backend = "poetry.core.masonry.api"
3939

4040
[tool.ruff.lint]
4141
ignore = ["E501"]
42+
select = [
43+
"ASYNC", # https://docs.astral.sh/ruff/rules/#flake8-async-async
44+
"B", # https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
45+
"ERA", # https://docs.astral.sh/ruff/rules/#eradicate-era
46+
"EXE",# https://docs.astral.sh/ruff/rules/#flake8-executable-exe
47+
"F",# https://docs.astral.sh/ruff/rules/#pyflakes-f
48+
"FBT", # https://docs.astral.sh/ruff/rules/#flake8-boolean-trap-fbt
49+
"FIX", # https://docs.astral.sh/ruff/rules/#flake8-fixme-fix
50+
"FLY",# https://docs.astral.sh/ruff/rules/#flynt-fly
51+
"FURB", # https://docs.astral.sh/ruff/rules/#refurb-furb
52+
"G",# https://docs.astral.sh/ruff/rules/#flake8-logging-format-g
53+
"ICN",# https://docs.astral.sh/ruff/rules/#flake8-import-conventions-icn
54+
"INT",# https://docs.astral.sh/ruff/rules/#flake8-gettext-int
55+
"ISC",# https://docs.astral.sh/ruff/rules/#flake8-implicit-str-concat-isc
56+
"LOG",# https://docs.astral.sh/ruff/rules/#flake8-logging-log
57+
"PERF",# https://docs.astral.sh/ruff/rules/#perflint-perf
58+
"PGH",# https://docs.astral.sh/ruff/rules/#pygrep-hooks-pgh
59+
"PYI",# https://docs.astral.sh/ruff/rules/#flake8-pyi-pyi
60+
"Q",# https://docs.astral.sh/ruff/rules/#flake8-quotes-q
61+
"RET", # https://docs.astral.sh/ruff/rules/#flake8-return-ret
62+
"RSE",# https://docs.astral.sh/ruff/rules/#flake8-raise-rse
63+
"SIM",# https://docs.astral.sh/ruff/rules/#flake8-simplify-sim
64+
"SLF",# https://docs.astral.sh/ruff/rules/#flake8-self-slf
65+
"SLOT",# https://docs.astral.sh/ruff/rules/#flake8-slots-slot
66+
"T10", # https://docs.astral.sh/ruff/rules/#flake8-debugger-t10
67+
"T20",# https://docs.astral.sh/ruff/rules/#flake8-print-t20
68+
"TD",# https://docs.astral.sh/ruff/rules/#flake8-todos-td
69+
"YTT", # https://docs.astral.sh/ruff/rules/#flake8-2020-ytt
70+
]
4271

4372
[tool.ty.rules]
4473
missing-argument = "ignore"

‎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
)

0 commit comments

Comments
 (0)