Skip to content

Commit 62822b5

Browse files
kingsleyzissoucroissanne
authored andcommitted
internal/blueprint: add JSON tailoring to bp conversion
The blueprint convert function was missing the json tailoring case. This meant that if the json tailoring customization was provided in the blueprint, the customization would get ignored and the tailoring profile would not be applied to the image.
1 parent 73af685 commit 62822b5

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

internal/blueprint/blueprint.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ func Convert(bp Blueprint) iblueprint.Blueprint {
253253
itailoring := iblueprint.OpenSCAPTailoringCustomizations(*tailoring)
254254
ioscap.Tailoring = &itailoring
255255
}
256+
if jsonTailoring := oscap.JSONTailoring; jsonTailoring != nil {
257+
ijsonTailoring := iblueprint.OpenSCAPJSONTailoringCustomizations(*jsonTailoring)
258+
ioscap.JSONTailoring = &ijsonTailoring
259+
}
256260
customizations.OpenSCAP = &ioscap
257261
}
258262
if ign := c.Ignition; ign != nil {

internal/blueprint/blueprint_convert_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,10 @@ func TestConvert(t *testing.T) {
233233
Selected: []string{"cloth"},
234234
Unselected: []string{"leather"},
235235
},
236+
JSONTailoring: &OpenSCAPJSONTailoringCustomizations{
237+
ProfileID: "tailored_profile",
238+
Filepath: "path-to-json-file",
239+
},
236240
},
237241
Ignition: &IgnitionCustomization{
238242
Embedded: &EmbeddedIgnitionCustomization{
@@ -532,6 +536,10 @@ func TestConvert(t *testing.T) {
532536
Selected: []string{"cloth"},
533537
Unselected: []string{"leather"},
534538
},
539+
JSONTailoring: &iblueprint.OpenSCAPJSONTailoringCustomizations{
540+
ProfileID: "tailored_profile",
541+
Filepath: "path-to-json-file",
542+
},
535543
},
536544
Ignition: &iblueprint.IgnitionCustomization{
537545
Embedded: &iblueprint.EmbeddedIgnitionCustomization{

0 commit comments

Comments
 (0)