Skip to content

Commit cf904b0

Browse files
chore(baremetal): remove exclude on partitioning schema type (#1458)
Co-authored-by: Jonathan R. <[email protected]>
1 parent 6829c46 commit cf904b0

File tree

2 files changed

+87
-70
lines changed

2 files changed

+87
-70
lines changed

packages/clients/src/api/baremetal/v1/marshalling.gen.ts

Lines changed: 81 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,9 @@ const unmarshalServerInstall = (data: unknown): ServerInstall => {
488488
return {
489489
hostname: data.hostname,
490490
osId: data.os_id,
491+
partitioningSchema: data.partitioning_schema
492+
? unmarshalSchema(data.partitioning_schema)
493+
: undefined,
491494
serviceUrl: data.service_url,
492495
serviceUser: data.service_user,
493496
sshKeyIds: data.ssh_key_ids,
@@ -759,12 +762,86 @@ export const marshalAddOptionServerRequest = (
759762
expires_at: request.expiresAt,
760763
})
761764

765+
const marshalSchemaPartition = (
766+
request: SchemaPartition,
767+
defaults: DefaultValues,
768+
): Record<string, unknown> => ({
769+
label: request.label,
770+
number: request.number,
771+
size: request.size,
772+
})
773+
774+
const marshalSchemaPool = (
775+
request: SchemaPool,
776+
defaults: DefaultValues,
777+
): Record<string, unknown> => ({
778+
devices: request.devices,
779+
filesystem_options: request.filesystemOptions,
780+
name: request.name,
781+
options: request.options,
782+
type: request.type,
783+
})
784+
785+
const marshalSchemaDisk = (
786+
request: SchemaDisk,
787+
defaults: DefaultValues,
788+
): Record<string, unknown> => ({
789+
device: request.device,
790+
partitions: request.partitions.map(elt =>
791+
marshalSchemaPartition(elt, defaults),
792+
),
793+
})
794+
795+
const marshalSchemaFilesystem = (
796+
request: SchemaFilesystem,
797+
defaults: DefaultValues,
798+
): Record<string, unknown> => ({
799+
device: request.device,
800+
format: request.format,
801+
mountpoint: request.mountpoint,
802+
})
803+
804+
const marshalSchemaRAID = (
805+
request: SchemaRAID,
806+
defaults: DefaultValues,
807+
): Record<string, unknown> => ({
808+
devices: request.devices,
809+
level: request.level,
810+
name: request.name,
811+
})
812+
813+
const marshalSchemaZFS = (
814+
request: SchemaZFS,
815+
defaults: DefaultValues,
816+
): Record<string, unknown> => ({
817+
pools: request.pools.map(elt => marshalSchemaPool(elt, defaults)),
818+
})
819+
820+
export const marshalSchema = (
821+
request: Schema,
822+
defaults: DefaultValues,
823+
): Record<string, unknown> => ({
824+
disks: request.disks.map(elt => marshalSchemaDisk(elt, defaults)),
825+
filesystems: request.filesystems.map(elt =>
826+
marshalSchemaFilesystem(elt, defaults),
827+
),
828+
raids: request.raids.map(elt => marshalSchemaRAID(elt, defaults)),
829+
zfs:
830+
request.zfs !== undefined
831+
? marshalSchemaZFS(request.zfs, defaults)
832+
: undefined,
833+
})
834+
762835
const marshalCreateServerRequestInstall = (
763836
request: CreateServerRequestInstall,
764837
defaults: DefaultValues,
765838
): Record<string, unknown> => ({
766839
hostname: request.hostname,
767840
os_id: request.osId,
841+
partitioning_schema:
842+
request.partitioningSchema !== undefined
843+
? marshalSchema(request.partitioningSchema, defaults)
844+
: undefined,
768845
password: request.password,
769846
service_password: request.servicePassword,
770847
service_user: request.serviceUser,
@@ -805,6 +882,10 @@ export const marshalInstallServerRequest = (
805882
): Record<string, unknown> => ({
806883
hostname: request.hostname,
807884
os_id: request.osId,
885+
partitioning_schema:
886+
request.partitioningSchema !== undefined
887+
? marshalSchema(request.partitioningSchema, defaults)
888+
: undefined,
808889
password: request.password,
809890
service_password: request.servicePassword,
810891
service_user: request.serviceUser,
@@ -870,76 +951,6 @@ export const marshalUpdateSettingRequest = (
870951
enabled: request.enabled,
871952
})
872953

873-
const marshalSchemaPartition = (
874-
request: SchemaPartition,
875-
defaults: DefaultValues,
876-
): Record<string, unknown> => ({
877-
label: request.label,
878-
number: request.number,
879-
size: request.size,
880-
})
881-
882-
const marshalSchemaPool = (
883-
request: SchemaPool,
884-
defaults: DefaultValues,
885-
): Record<string, unknown> => ({
886-
devices: request.devices,
887-
filesystem_options: request.filesystemOptions,
888-
name: request.name,
889-
options: request.options,
890-
type: request.type,
891-
})
892-
893-
const marshalSchemaDisk = (
894-
request: SchemaDisk,
895-
defaults: DefaultValues,
896-
): Record<string, unknown> => ({
897-
device: request.device,
898-
partitions: request.partitions.map(elt =>
899-
marshalSchemaPartition(elt, defaults),
900-
),
901-
})
902-
903-
const marshalSchemaFilesystem = (
904-
request: SchemaFilesystem,
905-
defaults: DefaultValues,
906-
): Record<string, unknown> => ({
907-
device: request.device,
908-
format: request.format,
909-
mountpoint: request.mountpoint,
910-
})
911-
912-
const marshalSchemaRAID = (
913-
request: SchemaRAID,
914-
defaults: DefaultValues,
915-
): Record<string, unknown> => ({
916-
devices: request.devices,
917-
level: request.level,
918-
name: request.name,
919-
})
920-
921-
const marshalSchemaZFS = (
922-
request: SchemaZFS,
923-
defaults: DefaultValues,
924-
): Record<string, unknown> => ({
925-
pools: request.pools.map(elt => marshalSchemaPool(elt, defaults)),
926-
})
927-
928-
export const marshalSchema = (
929-
request: Schema,
930-
defaults: DefaultValues,
931-
): Record<string, unknown> => ({
932-
disks: request.disks.map(elt => marshalSchemaDisk(elt, defaults)),
933-
filesystems: request.filesystems.map(elt =>
934-
marshalSchemaFilesystem(elt, defaults),
935-
),
936-
raids: request.raids.map(elt => marshalSchemaRAID(elt, defaults)),
937-
zfs:
938-
request.zfs !== undefined
939-
? marshalSchemaZFS(request.zfs, defaults)
940-
: undefined,
941-
})
942-
943954
export const marshalValidatePartitioningSchemaRequest = (
944955
request: ValidatePartitioningSchemaRequest,
945956
defaults: DefaultValues,

packages/clients/src/api/baremetal/v1/types.gen.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ export interface ServerInstall {
305305
serviceUser: string
306306
/** Address of the installed service. */
307307
serviceUrl: string
308+
/** Partitioning schema. */
309+
partitioningSchema?: Schema
308310
}
309311

310312
export interface ServerOption {
@@ -377,6 +379,8 @@ export interface CreateServerRequestInstall {
377379
serviceUser?: string
378380
/** Password used for the service to install. */
379381
servicePassword?: string
382+
/** Partitioning schema. */
383+
partitioningSchema?: Schema
380384
}
381385

382386
export interface OS {
@@ -748,6 +752,8 @@ export type InstallServerRequest = {
748752
serviceUser?: string
749753
/** Password used for the service to install. */
750754
servicePassword?: string
755+
/** Partitioning schema. */
756+
partitioningSchema?: Schema
751757
}
752758

753759
export type ListOSRequest = {

0 commit comments

Comments
 (0)