particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild2: make QEMUFormatOptions validation an interface method

Browse source 
Move the validation of each structure implementing the
`QEMUFormatOptions` interface to the interface itself and to
the structures implementing it.
This commit is contained in:
Tomas Hozza 2022-04-06 09:49:53 +02:00 • committed by Tomáš Hozza
parent 0e512e97d2
commit 2521c18cf4
1 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

39
internal/osbuild2/qemu_stage.go
View file

@ -32,6 +32,7 @@ const (
type QEMUFormatOptions interface {
isQEMUFormatOptions()
validate() error
}
type Qcow2Options struct {
@ -44,6 +45,13 @@ type Qcow2Options struct {
func (Qcow2Options) isQEMUFormatOptions() {}
func (o Qcow2Options) validate() error {
if o.Type != QEMUFormatQCOW2 {
return fmt.Errorf("invalid format type %q for %q options", o.Type, QEMUFormatQCOW2)
}
return nil
}
type VPCOptions struct {
// The type of the format must be 'vpc'
Type QEMUFormat `json:"type"`
@ -51,6 +59,13 @@ type VPCOptions struct {
func (VPCOptions) isQEMUFormatOptions() {}
func (o VPCOptions) validate() error {
if o.Type != QEMUFormatVPC {
return fmt.Errorf("invalid format type %q for %q options", o.Type, QEMUFormatVPC)
}
return nil
}
type VMDKOptions struct {
// The type of the format must be 'vpc'
Type QEMUFormat `json:"type"`
@ -58,6 +73,13 @@ type VMDKOptions struct {
func (VMDKOptions) isQEMUFormatOptions() {}
func (o VMDKOptions) validate() error {
if o.Type != QEMUFormatVMDK {
return fmt.Errorf("invalid format type %q for %q options", o.Type, QEMUFormatVMDK)
}
return nil
}
type QEMUStageInputs struct {
Image *QEMUStageInput `json:"image"`
}
@ -96,21 +118,8 @@ type qemuStageOptions QEMUStageOptions
// Custom marshaller for validating
func (options QEMUStageOptions) MarshalJSON() ([]byte, error) {
switch o := options.Format.(type) {
case Qcow2Options:
if o.Type != QEMUFormatQCOW2 {
return nil, fmt.Errorf("invalid format type %q for qcow2 options", o.Type)
}
case VPCOptions:
if o.Type != QEMUFormatVPC {
return nil, fmt.Errorf("invalid format type %q for vpc options", o.Type)
}
case VMDKOptions:
if o.Type != QEMUFormatVMDK {
return nil, fmt.Errorf("invalid format type %q for vmdk options", o.Type)
}
default:
return nil, fmt.Errorf("unknown format options in QEMU stage: %#v", options.Format)
if err := options.Format.validate(); err != nil {
return nil, err
}
return json.Marshal(qemuStageOptions(options))