cloudapi: json tailoring options

Add support for json tailoring files in the cloudapi. Expand the tests
to check that the options returned are okay and that tailoring options
and json tailoring options can't be provided at the same time.

internal/cloudapi/v2/compose.go

@@ -233,6 +233,9 @@ func (request *ComposeRequest) GetCustomizationsFromBlueprintRequest() (*bluepri
 		if rbpc.Openscap.Datastream != nil {
 			oscap.DataStream = *rbpc.Openscap.Datastream
 		}
+		if rbpc.Openscap.Tailoring != nil && rbpc.Openscap.JsonTailoring != nil {
+			return nil, fmt.Errorf("OpenSCAP customization error: choose one option between OpenSCAP tailoring and OpenSCAP json tailoring")
+		}
 		if tailoring := rbpc.Openscap.Tailoring; tailoring != nil {
 			tc := blueprint.OpenSCAPTailoringCustomizations{}
 			if tailoring.Selected != nil && len(*tailoring.Selected) > 0 {
@@ -243,6 +246,12 @@ func (request *ComposeRequest) GetCustomizationsFromBlueprintRequest() (*bluepri
 			}
 			oscap.Tailoring = &tc
 		}
+		if jsonTailoring := rbpc.Openscap.JsonTailoring; jsonTailoring != nil {
+			oscap.JSONTailoring = &blueprint.OpenSCAPJSONTailoringCustomizations{
+				ProfileID: jsonTailoring.ProfileId,
+				Filepath:  jsonTailoring.Filepath,
+			}
+		}
 		c.OpenSCAP = oscap
 	}
 
@@ -684,6 +693,9 @@ func (request *ComposeRequest) GetBlueprintFromCustomizations() (blueprint.Bluep
 		openSCAPCustomization := &blueprint.OpenSCAPCustomization{
 			ProfileID: request.Customizations.Openscap.ProfileId,
 		}
+		if request.Customizations.Openscap.Tailoring != nil && request.Customizations.Openscap.JsonTailoring != nil {
+			return bp, fmt.Errorf("OpenSCAP customization error: choose one option between OpenSCAP tailoring and OpenSCAP json tailoring")
+		}
 		if tailoring := request.Customizations.Openscap.Tailoring; tailoring != nil {
 			tailoringCustomizations := blueprint.OpenSCAPTailoringCustomizations{}
 			if tailoring.Selected != nil && len(*tailoring.Selected) > 0 {
@@ -694,6 +706,12 @@ func (request *ComposeRequest) GetBlueprintFromCustomizations() (blueprint.Bluep
 			}
 			openSCAPCustomization.Tailoring = &tailoringCustomizations
 		}
+		if jsonTailoring := request.Customizations.Openscap.JsonTailoring; jsonTailoring != nil {
+			openSCAPCustomization.JSONTailoring = &blueprint.OpenSCAPJSONTailoringCustomizations{
+				ProfileID: jsonTailoring.ProfileId,
+				Filepath:  jsonTailoring.Filepath,
+			}
+		}
 		bp.Customizations.OpenSCAP = openSCAPCustomization
 	}
 

internal/cloudapi/v2/compose_test.go

@@ -785,4 +785,47 @@ func TestOpenSCAPTailoringOptions(t *testing.T) {
 	bp, err := cr.GetBlueprintFromCustomizations()
 	assert.NoError(t, err)
 	assert.Equal(t, expectedOscap, bp.Customizations.OpenSCAP)
+
+	cr = ComposeRequest{
+		Customizations: &Customizations{
+			Openscap: &OpenSCAP{
+				ProfileId: "test-123",
+				JsonTailoring: &OpenSCAPJSONTailoring{
+					ProfileId: "test-123-tailoring",
+					Filepath:  "/some/filepath",
+				},
+			},
+		},
+	}
+
+	expectedOscap = &blueprint.OpenSCAPCustomization{
+		ProfileID: "test-123",
+		JSONTailoring: &blueprint.OpenSCAPJSONTailoringCustomizations{
+			ProfileID: "test-123-tailoring",
+			Filepath:  "/some/filepath",
+		},
+	}
+
+	bp, err = cr.GetBlueprintFromCustomizations()
+	assert.NoError(t, err)
+	assert.Equal(t, expectedOscap, bp.Customizations.OpenSCAP)
+
+	cr = ComposeRequest{
+		Customizations: &Customizations{
+			Openscap: &OpenSCAP{
+				ProfileId: "test-123",
+				Tailoring: &OpenSCAPTailoring{
+					Selected:   common.ToPtr([]string{"one", "two", "three"}),
+					Unselected: common.ToPtr([]string{"four", "five", "six"}),
+				},
+				JsonTailoring: &OpenSCAPJSONTailoring{
+					ProfileId: "test-123-tailoring",
+					Filepath:  "/some/filepath",
+				},
+			},
+		},
+	}
+
+	bp, err = cr.GetBlueprintFromCustomizations()
+	assert.Error(t, err)
 }