From edb9b284d5563cb1b1c9701f0562c637725c632a Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 3 Jun 2025 16:38:07 +0200 Subject: [PATCH] cloudapi: return http error when failing to convert disk customizations Return an HTTP error with the invalid customization message when the convertDiskCustomizations() function returns an error. Secondary: The conversion was being run twice by mistake. This has also been fixed. --- internal/cloudapi/v2/compose.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/internal/cloudapi/v2/compose.go b/internal/cloudapi/v2/compose.go index 0d3384a9e..58bf6d6ef 100644 --- a/internal/cloudapi/v2/compose.go +++ b/internal/cloudapi/v2/compose.go @@ -506,14 +506,9 @@ func (rbp *Blueprint) GetCustomizationsFromBlueprintRequest() (*blueprint.Custom c.RHSM = bpRhsm } - disk, err := convertDiskCustomizations(rbpc.Disk) - if err != nil { - return nil, err - } - c.Disk = disk bpDisk, err := convertDiskCustomizations(rbpc.Disk) if err != nil { - return nil, err + return nil, HTTPErrorWithInternal(ErrorInvalidCustomization, err) } c.Disk = bpDisk @@ -1085,7 +1080,7 @@ func (request *ComposeRequest) GetBlueprintFromCustomizations() (blueprint.Bluep bp.Customizations.Disk, err = convertDiskCustomizations(request.Customizations.Disk) if err != nil { - return bp, err + return bp, HTTPErrorWithInternal(ErrorInvalidCustomization, err) } if cacerts := request.Customizations.Cacerts; cacerts != nil {