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

distro: validate directory / file BP customizations

Browse source 
Validate the user-provided directory and file BP customizations in
`checkOptions()`.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2023-02-03 15:05:47 +01:00 • committed by Sanne Raymaekers
parent a6dd4943c5
commit 0e2f221514
4 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/distro/fedora/distro.go
View file

@ -800,6 +800,15 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
}
}
// Check Directory/File Customizations are valid
dc := customizations.GetDirectories()
fc := customizations.GetFiles()
err = blueprint.ValidateDirFileCustomizations(dc, fc)
if err != nil {
return err
}
return nil
}

9
internal/distro/rhel7/distro.go
View file

@ -502,6 +502,15 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
return fmt.Errorf(fmt.Sprintf("OpenSCAP unsupported os version: %s", t.arch.distro.osVersion))
}
// Check Directory/File Customizations are valid
dc := customizations.GetDirectories()
fc := customizations.GetFiles()
err = blueprint.ValidateDirFileCustomizations(dc, fc)
if err != nil {
return err
}
return nil
}

9
internal/distro/rhel8/imagetype.go
View file

@ -437,5 +437,14 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
}
}
// Check Directory/File Customizations are valid
dc := customizations.GetDirectories()
fc := customizations.GetFiles()
err = blueprint.ValidateDirFileCustomizations(dc, fc)
if err != nil {
return err
}
return nil
}

9
internal/distro/rhel9/imagetype.go
View file

@ -415,5 +415,14 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
}
}
// Check Directory/File Customizations are valid
dc := customizations.GetDirectories()
fc := customizations.GetFiles()
err = blueprint.ValidateDirFileCustomizations(dc, fc)
if err != nil {
return err
}
return nil
}