Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

distro: run ValidateLayoutConstraints() when using PartitionCustomizations #1063

Merged
merged 1 commit into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions pkg/distro/fedora/distro_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1032,3 +1032,40 @@ func TestDistroFactory(t *testing.T) {
})
}
}

func TestDistro_DiskCustomizationRunsValidateLayoutConstraints(t *testing.T) {
bp := blueprint.Blueprint{
Customizations: &blueprint.Customizations{
Disk: &blueprint.DiskCustomization{
Partitions: []blueprint.PartitionCustomization{
{
Type: "lvm",
VGCustomization: blueprint.VGCustomization{},
},
{
Type: "lvm",
VGCustomization: blueprint.VGCustomization{},
},
},
},
},
}

for _, dist := range fedoraFamilyDistros {
fedoraDistro := dist.distro
for _, archName := range fedoraDistro.ListArches() {
arch, err := fedoraDistro.GetArch(archName)
assert.NoError(t, err)
imgType, err := arch.GetImageType("qcow2")
assert.NoError(t, err, archName)
t.Run(fmt.Sprintf("%s/%s", archName, imgType.Name()), func(t *testing.T) {
imgType, _ := arch.GetImageType(imgType.Name())
imgOpts := distro.ImageOptions{
Size: imgType.Size(0),
}
_, _, err := imgType.Manifest(&bp, imgOpts, nil, 0)
assert.EqualError(t, err, "cannot use disk customization: multiple LVM volume groups are not yet supported")
})
}
}
}
8 changes: 8 additions & 0 deletions pkg/distro/fedora/imagetype.go
Original file line number Diff line number Diff line change
Expand Up @@ -468,5 +468,13 @@ func (t *imageType) checkOptions(bp *blueprint.Blueprint, options distro.ImageOp
}
}

diskc, err := customizations.GetPartitioning()
if err != nil {
return nil, err
}
if err := diskc.ValidateLayoutConstraints(); err != nil {
return nil, fmt.Errorf("cannot use disk customization: %w", err)
}

return nil, nil
}
Loading