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

internal/cloudapi: Allow bp.Customizations being nil

Browse source 
Customizations being nil isn't the same as an empty object. The
edge-installer types require customizations equalling nil.

This partially reverts bb486bcccb.
This commit is contained in:
Sanne Raymaekers 2022-02-22 15:13:17 +01:00 • committed by Tom Gundersen
parent 05cbbf0cc5
commit e9daacd1dd
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
internal/cloudapi/v2/v2.go
View file

@ -173,7 +173,6 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
if err != nil {
return HTTPErrorWithInternal(ErrorFailedToInitializeBlueprint, err)
}
bp.Customizations = &blueprint.Customizations{}
// Set the blueprint customisation to take care of the user
if request.Customizations != nil && request.Customizations.Users != nil {
@ -193,7 +192,13 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
},
)
}
bp.Customizations.User = userCustomizations
if bp.Customizations == nil {
bp.Customizations = &blueprint.Customizations{
User: userCustomizations,
}
} else {
bp.Customizations.User = userCustomizations
}
}
if request.Customizations != nil && request.Customizations.Packages != nil {
@ -215,7 +220,13 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
},
)
}
bp.Customizations.Filesystem = fsCustomizations
if bp.Customizations == nil {
bp.Customizations = &blueprint.Customizations{
Filesystem: fsCustomizations,
}
} else {
bp.Customizations.Filesystem = fsCustomizations
}
}
// add the user-defined repositories only to the depsolve job for the