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

osbuild2: rename Qcow2Options -> QCOW2Options

Browse source 
Make the format type options structure naming consistent.
This commit is contained in:
Tomas Hozza 2022-04-06 10:15:31 +02:00 • committed by Tomáš Hozza
parent 2521c18cf4
commit 8697713ce8
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel85/stage_options.go
View file

@ -233,7 +233,7 @@ func qemuStageOptions(filename string, format osbuild.QEMUFormat, compat string)
var options osbuild.QEMUFormatOptions
switch format {
case osbuild.QEMUFormatQCOW2:
options = osbuild.Qcow2Options{
options = osbuild.QCOW2Options{
Type: format,
Compat: compat,
}

2
internal/distro/rhel86/stage_options.go
View file

@ -282,7 +282,7 @@ func qemuStageOptions(filename string, format osbuild.QEMUFormat, compat string)
var options osbuild.QEMUFormatOptions
switch format {
case osbuild.QEMUFormatQCOW2:
options = osbuild.Qcow2Options{
options = osbuild.QCOW2Options{
Type: format,
Compat: compat,
}

2
internal/distro/rhel90/stage_options.go
View file

@ -282,7 +282,7 @@ func qemuStageOptions(filename string, format osbuild.QEMUFormat, compat string)
var options osbuild.QEMUFormatOptions
switch format {
case osbuild.QEMUFormatQCOW2:
options = osbuild.Qcow2Options{
options = osbuild.QCOW2Options{
Type: format,
Compat: compat,
}

2
internal/distro/rhel90beta/stage_options.go
View file

@ -212,7 +212,7 @@ func qemuStageOptions(filename string, format osbuild.QEMUFormat, compat string)
var options osbuild.QEMUFormatOptions
switch format {
case osbuild.QEMUFormatQCOW2:
options = osbuild.Qcow2Options{
options = osbuild.QCOW2Options{
Type: format,
Compat: compat,
}

6
internal/osbuild2/qemu_stage.go
View file

@ -35,7 +35,7 @@ type QEMUFormatOptions interface {
validate() error
}
type Qcow2Options struct {
type QCOW2Options struct {
// The type of the format must be 'qcow2'
Type QEMUFormat `json:"type"`
@ -43,9 +43,9 @@ type Qcow2Options struct {
Compat string `json:"compat"`
}
func (Qcow2Options) isQEMUFormatOptions() {}
func (QCOW2Options) isQEMUFormatOptions() {}
func (o Qcow2Options) validate() error {
func (o QCOW2Options) validate() error {
if o.Type != QEMUFormatQCOW2 {
return fmt.Errorf("invalid format type %q for %q options", o.Type, QEMUFormatQCOW2)
}

2
internal/osbuild2/qemu_stage_test.go
View file

@ -9,7 +9,7 @@ import (
func TestNewQemuStage(t *testing.T) {
formatOptionsList := []QEMUFormatOptions{
Qcow2Options{
QCOW2Options{
Type: QEMUFormatQCOW2,
Compat: "0.10",
},