Skip to content

Commit b288390

Browse files
authored
fix: unmarshal fields using json names (#216)
1 parent 647e29f commit b288390

File tree

22 files changed

+54
-54
lines changed

22 files changed

+54
-54
lines changed

scaleway-async/scaleway_async/applesilicon/v1alpha1/marshalling.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def unmarshal_ServerTypeDisk(data: Any) -> ServerTypeDisk:
4848
field = data.get("capacity", None)
4949
args["capacity"] = field
5050

51-
field = data.get("type_", None)
51+
field = data.get("type", None)
5252
args["type_"] = field
5353

5454
return ServerTypeDisk(**args)
@@ -65,7 +65,7 @@ def unmarshal_ServerTypeMemory(data: Any) -> ServerTypeMemory:
6565
field = data.get("capacity", None)
6666
args["capacity"] = field
6767

68-
field = data.get("type_", None)
68+
field = data.get("type", None)
6969
args["type_"] = field
7070

7171
return ServerTypeMemory(**args)
@@ -129,7 +129,7 @@ def unmarshal_Server(data: Any) -> Server:
129129
field = data.get("status", None)
130130
args["status"] = field
131131

132-
field = data.get("type_", None)
132+
field = data.get("type", None)
133133
args["type_"] = field
134134

135135
field = data.get("updated_at", None)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def unmarshal_Disk(data: Any) -> Disk:
9595
field = data.get("capacity", None)
9696
args["capacity"] = field
9797

98-
field = data.get("type_", None)
98+
field = data.get("type", None)
9999
args["type_"] = field
100100

101101
return Disk(**args)
@@ -147,7 +147,7 @@ def unmarshal_Memory(data: Any) -> Memory:
147147
field = data.get("is_ecc", None)
148148
args["is_ecc"] = field
149149

150-
field = data.get("type_", None)
150+
field = data.get("type", None)
151151
args["type_"] = field
152152

153153
return Memory(**args)
@@ -219,7 +219,7 @@ def unmarshal_PersistentMemory(data: Any) -> PersistentMemory:
219219
field = data.get("frequency", None)
220220
args["frequency"] = field
221221

222-
field = data.get("type_", None)
222+
field = data.get("type", None)
223223
args["type_"] = field
224224

225225
return PersistentMemory(**args)
@@ -616,7 +616,7 @@ def unmarshal_Setting(data: Any) -> Setting:
616616
field = data.get("project_id", None)
617617
args["project_id"] = field
618618

619-
field = data.get("type_", None)
619+
field = data.get("type", None)
620620
args["type_"] = field
621621

622622
return Setting(**args)

scaleway-async/scaleway_async/domain/v2beta1/marshalling.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def unmarshal_DSRecordDigest(data: Any) -> DSRecordDigest:
469469
unmarshal_DSRecordPublicKey(field) if field is not None else None
470470
)
471471

472-
field = data.get("type_", None)
472+
field = data.get("type", None)
473473
args["type_"] = field
474474

475475
return DSRecordDigest(**args)
@@ -511,7 +511,7 @@ def unmarshal_DomainRecord(data: Any) -> DomainRecord:
511511
field = data.get("ttl", None)
512512
args["ttl"] = field
513513

514-
field = data.get("type_", None)
514+
field = data.get("type", None)
515515
args["type_"] = field
516516

517517
field = data.get("view_config", None)
@@ -544,7 +544,7 @@ def unmarshal_RecordIdentifier(data: Any) -> RecordIdentifier:
544544
field = data.get("ttl", None)
545545
args["ttl"] = field
546546

547-
field = data.get("type_", None)
547+
field = data.get("type", None)
548548
args["type_"] = field
549549

550550
return RecordIdentifier(**args)
@@ -1096,7 +1096,7 @@ def unmarshal_RecordChange(data: Any) -> RecordChange:
10961096
field = data.get("delete", None)
10971097
args["delete"] = unmarshal_RecordChangeDelete(field) if field is not None else None
10981098

1099-
field = data.get("set_", None)
1099+
field = data.get("set", None)
11001100
args["set_"] = unmarshal_RecordChangeSet(field) if field is not None else None
11011101

11021102
return RecordChange(**args)
@@ -1208,7 +1208,7 @@ def unmarshal_Task(data: Any) -> Task:
12081208
field = data.get("status", None)
12091209
args["status"] = field
12101210

1211-
field = data.get("type_", None)
1211+
field = data.get("type", None)
12121212
args["type_"] = field
12131213

12141214
field = data.get("updated_at", None)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ def unmarshal_User(data: Any) -> User:
403403
field = data.get("two_factor_enabled", None)
404404
args["two_factor_enabled"] = field
405405

406-
field = data.get("type_", None)
406+
field = data.get("type", None)
407407
args["type_"] = field
408408

409409
field = data.get("updated_at", None)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ def unmarshal_Network(data: Any) -> Network:
296296
field = data.get("topic_prefix", None)
297297
args["topic_prefix"] = field
298298

299-
field = data.get("type_", None)
299+
field = data.get("type", None)
300300
args["type_"] = field
301301

302302
return Network(**args)
@@ -400,7 +400,7 @@ def unmarshal_RouteSummary(data: Any) -> RouteSummary:
400400
field = data.get("topic", None)
401401
args["topic"] = field
402402

403-
field = data.get("type_", None)
403+
field = data.get("type", None)
404404
args["type_"] = field
405405

406406
field = data.get("updated_at", None)
@@ -653,7 +653,7 @@ def unmarshal_Route(data: Any) -> Route:
653653
field = data.get("topic", None)
654654
args["topic"] = field
655655

656-
field = data.get("type_", None)
656+
field = data.get("type", None)
657657
args["type_"] = field
658658

659659
field = data.get("updated_at", None)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def unmarshal_Cluster(data: Any) -> Cluster:
258258
field = data.get("tags", None)
259259
args["tags"] = field
260260

261-
field = data.get("type_", None)
261+
field = data.get("type", None)
262262
args["type_"] = field
263263

264264
field = data.get("updated_at", None)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ def unmarshal_Lb(data: Any) -> Lb:
471471
field = data.get("tags", None)
472472
args["tags"] = field
473473

474-
field = data.get("type_", None)
474+
field = data.get("type", None)
475475
args["type_"] = field
476476

477477
field = data.get("updated_at", None)
@@ -497,7 +497,7 @@ def unmarshal_AclActionRedirect(data: Any) -> AclActionRedirect:
497497
field = data.get("target", None)
498498
args["target"] = field
499499

500-
field = data.get("type_", None)
500+
field = data.get("type", None)
501501
args["type_"] = field
502502

503503
return AclActionRedirect(**args)
@@ -630,7 +630,7 @@ def unmarshal_Certificate(data: Any) -> Certificate:
630630
field = data.get("subject_alternative_name", None)
631631
args["subject_alternative_name"] = field
632632

633-
field = data.get("type_", None)
633+
field = data.get("type", None)
634634
args["type_"] = field
635635

636636
field = data.get("updated_at", None)
@@ -650,7 +650,7 @@ def unmarshal_AclAction(data: Any) -> AclAction:
650650
field = data.get("redirect", None)
651651
args["redirect"] = unmarshal_AclActionRedirect(field) if field is not None else None
652652

653-
field = data.get("type_", None)
653+
field = data.get("type", None)
654654
args["type_"] = field
655655

656656
return AclAction(**args)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ def unmarshal_NodeTypeVolumeType(data: Any) -> NodeTypeVolumeType:
378378
field = data.get("min_size", None)
379379
args["min_size"] = field
380380

381-
field = data.get("type_", None)
381+
field = data.get("type", None)
382382
args["type_"] = field
383383

384384
return NodeTypeVolumeType(**args)
@@ -446,7 +446,7 @@ def unmarshal_Volume(data: Any) -> Volume:
446446
field = data.get("size", None)
447447
args["size"] = field
448448

449-
field = data.get("type_", None)
449+
field = data.get("type", None)
450450
args["type_"] = field
451451

452452
return Volume(**args)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def unmarshal_AvailableClusterSetting(data: Any) -> AvailableClusterSetting:
129129
field = data.get("regex", None)
130130
args["regex"] = field
131131

132-
field = data.get("type_", None)
132+
field = data.get("type", None)
133133
args["type_"] = field
134134

135135
return AvailableClusterSetting(**args)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def unmarshal_DHCPEntry(data: Any) -> DHCPEntry:
248248
field = data.get("mac_address", None)
249249
args["mac_address"] = field
250250

251-
field = data.get("type_", None)
251+
field = data.get("type", None)
252252
args["type_"] = field
253253

254254
field = data.get("updated_at", None)
@@ -309,7 +309,7 @@ def unmarshal_Gateway(data: Any) -> Gateway:
309309
field = data.get("tags", None)
310310
args["tags"] = field
311311

312-
field = data.get("type_", None)
312+
field = data.get("type", None)
313313
args["type_"] = unmarshal_GatewayType(field) if field is not None else None
314314

315315
field = data.get("updated_at", None)

scaleway-async/scaleway_async/webhosting/v1alpha1/marshalling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def unmarshal_DnsRecord(data: Any) -> DnsRecord:
116116
field = data.get("ttl", None)
117117
args["ttl"] = field
118118

119-
field = data.get("type_", None)
119+
field = data.get("type", None)
120120
args["type_"] = field
121121

122122
field = data.get("value", None)

scaleway/scaleway/applesilicon/v1alpha1/marshalling.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def unmarshal_ServerTypeDisk(data: Any) -> ServerTypeDisk:
4848
field = data.get("capacity", None)
4949
args["capacity"] = field
5050

51-
field = data.get("type_", None)
51+
field = data.get("type", None)
5252
args["type_"] = field
5353

5454
return ServerTypeDisk(**args)
@@ -65,7 +65,7 @@ def unmarshal_ServerTypeMemory(data: Any) -> ServerTypeMemory:
6565
field = data.get("capacity", None)
6666
args["capacity"] = field
6767

68-
field = data.get("type_", None)
68+
field = data.get("type", None)
6969
args["type_"] = field
7070

7171
return ServerTypeMemory(**args)
@@ -129,7 +129,7 @@ def unmarshal_Server(data: Any) -> Server:
129129
field = data.get("status", None)
130130
args["status"] = field
131131

132-
field = data.get("type_", None)
132+
field = data.get("type", None)
133133
args["type_"] = field
134134

135135
field = data.get("updated_at", None)

scaleway/scaleway/baremetal/v1/marshalling.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def unmarshal_Disk(data: Any) -> Disk:
9595
field = data.get("capacity", None)
9696
args["capacity"] = field
9797

98-
field = data.get("type_", None)
98+
field = data.get("type", None)
9999
args["type_"] = field
100100

101101
return Disk(**args)
@@ -147,7 +147,7 @@ def unmarshal_Memory(data: Any) -> Memory:
147147
field = data.get("is_ecc", None)
148148
args["is_ecc"] = field
149149

150-
field = data.get("type_", None)
150+
field = data.get("type", None)
151151
args["type_"] = field
152152

153153
return Memory(**args)
@@ -219,7 +219,7 @@ def unmarshal_PersistentMemory(data: Any) -> PersistentMemory:
219219
field = data.get("frequency", None)
220220
args["frequency"] = field
221221

222-
field = data.get("type_", None)
222+
field = data.get("type", None)
223223
args["type_"] = field
224224

225225
return PersistentMemory(**args)
@@ -616,7 +616,7 @@ def unmarshal_Setting(data: Any) -> Setting:
616616
field = data.get("project_id", None)
617617
args["project_id"] = field
618618

619-
field = data.get("type_", None)
619+
field = data.get("type", None)
620620
args["type_"] = field
621621

622622
return Setting(**args)

scaleway/scaleway/domain/v2beta1/marshalling.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def unmarshal_DSRecordDigest(data: Any) -> DSRecordDigest:
469469
unmarshal_DSRecordPublicKey(field) if field is not None else None
470470
)
471471

472-
field = data.get("type_", None)
472+
field = data.get("type", None)
473473
args["type_"] = field
474474

475475
return DSRecordDigest(**args)
@@ -511,7 +511,7 @@ def unmarshal_DomainRecord(data: Any) -> DomainRecord:
511511
field = data.get("ttl", None)
512512
args["ttl"] = field
513513

514-
field = data.get("type_", None)
514+
field = data.get("type", None)
515515
args["type_"] = field
516516

517517
field = data.get("view_config", None)
@@ -544,7 +544,7 @@ def unmarshal_RecordIdentifier(data: Any) -> RecordIdentifier:
544544
field = data.get("ttl", None)
545545
args["ttl"] = field
546546

547-
field = data.get("type_", None)
547+
field = data.get("type", None)
548548
args["type_"] = field
549549

550550
return RecordIdentifier(**args)
@@ -1096,7 +1096,7 @@ def unmarshal_RecordChange(data: Any) -> RecordChange:
10961096
field = data.get("delete", None)
10971097
args["delete"] = unmarshal_RecordChangeDelete(field) if field is not None else None
10981098

1099-
field = data.get("set_", None)
1099+
field = data.get("set", None)
11001100
args["set_"] = unmarshal_RecordChangeSet(field) if field is not None else None
11011101

11021102
return RecordChange(**args)
@@ -1208,7 +1208,7 @@ def unmarshal_Task(data: Any) -> Task:
12081208
field = data.get("status", None)
12091209
args["status"] = field
12101210

1211-
field = data.get("type_", None)
1211+
field = data.get("type", None)
12121212
args["type_"] = field
12131213

12141214
field = data.get("updated_at", None)

scaleway/scaleway/iam/v1alpha1/marshalling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ def unmarshal_User(data: Any) -> User:
403403
field = data.get("two_factor_enabled", None)
404404
args["two_factor_enabled"] = field
405405

406-
field = data.get("type_", None)
406+
field = data.get("type", None)
407407
args["type_"] = field
408408

409409
field = data.get("updated_at", None)

scaleway/scaleway/iot/v1/marshalling.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ def unmarshal_Network(data: Any) -> Network:
296296
field = data.get("topic_prefix", None)
297297
args["topic_prefix"] = field
298298

299-
field = data.get("type_", None)
299+
field = data.get("type", None)
300300
args["type_"] = field
301301

302302
return Network(**args)
@@ -400,7 +400,7 @@ def unmarshal_RouteSummary(data: Any) -> RouteSummary:
400400
field = data.get("topic", None)
401401
args["topic"] = field
402402

403-
field = data.get("type_", None)
403+
field = data.get("type", None)
404404
args["type_"] = field
405405

406406
field = data.get("updated_at", None)
@@ -653,7 +653,7 @@ def unmarshal_Route(data: Any) -> Route:
653653
field = data.get("topic", None)
654654
args["topic"] = field
655655

656-
field = data.get("type_", None)
656+
field = data.get("type", None)
657657
args["type_"] = field
658658

659659
field = data.get("updated_at", None)

scaleway/scaleway/k8s/v1/marshalling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def unmarshal_Cluster(data: Any) -> Cluster:
258258
field = data.get("tags", None)
259259
args["tags"] = field
260260

261-
field = data.get("type_", None)
261+
field = data.get("type", None)
262262
args["type_"] = field
263263

264264
field = data.get("updated_at", None)

0 commit comments

Comments
 (0)