Skip to content

Commit 5523fde

Browse files
author
Quentin Perez
committed
fix bootscript structure
1 parent 1b33cbe commit 5523fde

File tree

1 file changed

+11
-50
lines changed

1 file changed

+11
-50
lines changed

pkg/api/api.go

Lines changed: 11 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -301,67 +301,28 @@ type ScalewaySnapshots struct {
301301
Snapshots []ScalewaySnapshot `json:"snapshots,omitempty"`
302302
}
303303

304-
// ScalewayBootCmdArgs represents the boot arguments of a bootscript
305-
type ScalewayBootCmdArgs struct {
306-
// Identifier is the unique identifier of boot args
307-
Identifier string `json:"id,omitempty"`
308-
309-
// Value is the content of the cmd args
310-
Value string `json:"value,omitempty"`
311-
}
312-
313-
// ScalewayInitrd represents the initrd used by a bootscript
314-
type ScalewayInitrd struct {
315-
// Identifier is the unique identifier of the initrd
316-
Identifier string `json:"id,omitempty"`
317-
318-
// Path is the path to the initrd used
319-
Path string `json:"path,omitempty"`
320-
321-
// Title is the title of the initrd used
322-
Title string `json:"title,omitempty"`
323-
}
324-
325-
// ScalewayKernel represents a kernel used on servers
326-
type ScalewayKernel struct {
327-
// Identifier is the unique identifier of the kernel
328-
Identifier string `json:"id,omitempty"`
329-
330-
// DTB is the kernel DTB used by this kernel
331-
DTB string `json:"dtb"`
332-
333-
// Path is the path to the kernel image
334-
Path string `json:"path,omitempty"`
335-
336-
// Title is the title of the kernel
337-
Title string `json:"title,omitempty"`
338-
}
339-
340304
// ScalewayBootscript represents a Scaleway Bootscript
341305
type ScalewayBootscript struct {
306+
Bootcmdargs string `json:"bootcmdargs,omitempty"`
307+
Default bool `json:"default,omitempty"`
308+
Dtb string `json:"dtb,omitempty"`
309+
Initrd string `json:"initrd,omitempty"`
310+
Kernel string `json:"kernel,omitempty"`
311+
342312
// Arch is the architecture target of the bootscript
343313
Arch string `json:"architecture,omitempty"`
344314

345-
// Organization is the owner of the bootscript
346-
Organization string `json:"organization,omitempty"`
347-
348315
// Identifier is a unique identifier for the bootscript
349316
Identifier string `json:"id,omitempty"`
350317

351-
// Name is a user-defined name for the bootscript
352-
Title string `json:"title,omitempty"`
353-
354-
// BootCmdArgs represents the arguments used to boot
355-
BootCmdArgs ScalewayBootCmdArgs `json:"bootcmdargs,omitempty"`
356-
357-
// Initrd is the initrd used by this bootscript
358-
Initrd ScalewayInitrd `json:"initrd,omitempty"`
359-
360-
// Kernel is the kernel associated to this server
361-
Kernel ScalewayKernel `json:"kernel,omitempty"`
318+
// Organization is the owner of the bootscript
319+
Organization string `json:"organization,omitempty"`
362320

363321
// Public is true for public bootscripts and false for user bootscripts
364322
Public bool `json:"public,omitempty"`
323+
324+
// Name is a user-defined name for the bootscript
325+
Title string `json:"title,omitempty"`
365326
}
366327

367328
// ScalewayOneBootscript represents the response of a GET /bootscripts/UUID API call

0 commit comments

Comments
 (0)