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

blueprint: add openscap Tailoring customizations

Browse source 
See https://github.com/osbuild/images/pull/43
This commit is contained in:
Achilleas Koutsou 2023-08-08 17:06:20 +02:00 • committed by Ondřej Budai
parent fb3761d602
commit f2deb3a083
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/blueprint/blueprint.go
View file

@ -217,7 +217,14 @@ func Convert(bp Blueprint) iblueprint.Blueprint {
customizations.FDO = &ifdo customizations.FDO = &ifdo
} }
if oscap := c.OpenSCAP; oscap != nil { if oscap := c.OpenSCAP; oscap != nil {
ioscap := iblueprint.OpenSCAPCustomization(*oscap) ioscap := iblueprint.OpenSCAPCustomization{
DataStream: oscap.DataStream,
ProfileID: oscap.ProfileID,
}
if tailoring := oscap.Tailoring; tailoring != nil {
itailoring := iblueprint.OpenSCAPTailoringCustomizations(*tailoring)
ioscap.Tailoring = &itailoring
}
customizations.OpenSCAP = &ioscap customizations.OpenSCAP = &ioscap
} }
if ign := c.Ignition; ign != nil { if ign := c.Ignition; ign != nil {

10
internal/blueprint/customizations.go
View file

@ -107,8 +107,14 @@ type ServicesCustomization struct {
} }
type OpenSCAPCustomization struct { type OpenSCAPCustomization struct {
DataStream string `json:"datastream,omitempty" toml:"datastream,omitempty"` DataStream string `json:"datastream,omitempty" toml:"datastream,omitempty"`
ProfileID string `json:"profile_id,omitempty" toml:"profile_id,omitempty"` ProfileID string `json:"profile_id,omitempty" toml:"profile_id,omitempty"`
Tailoring *OpenSCAPTailoringCustomizations `json:"tailoring,omitempty" toml:"tailoring,omitempty"`
}
type OpenSCAPTailoringCustomizations struct {
Selected []string `json:"selected,omitempty" toml:"selected,omitempty"`
Unselected []string `json:"unselected,omitempty" toml:"unselected,omitempty"`
} }
type CustomizationError struct { type CustomizationError struct {