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

cloudapi: Move GetCustomizationsFromBlueprintRequest

Browse source 
This function only depends on the Blueprint (cloudapi request type, not
the internal/blueprint) so move it to a function on that so that it can
be reused by other users of the cloudapi Blueprint.

Related: RHEL-60125
This commit is contained in:
Brian C. Lane 2024-09-13 16:25:14 -07:00 • committed by Brian C. Lane
parent 5a9bb8e10a
commit 08dc5f3041
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/cloudapi/v2/compose.go
View file

@ -35,18 +35,18 @@ func (bcpm BlueprintCustomizationsPartitioningMode) String() string {
} }
} }
// GetCustomizationsFromBlueprintRequest populates a blueprint customization struct // GetCustomizationsFromBlueprint populates a blueprint customization struct
// with the data from the blueprint section of a ComposeRequest, which is similar but // with the data from request Blueprint, which is similar but
// slightly different from the Cloudapi's Customizations section // slightly different from the Cloudapi's Customizations section
// This starts with a new empty blueprint.Customization object // This starts with a new empty blueprint.Customization object
// If there are no customizations, it returns nil // If there are no customizations, it returns nil
func (request *ComposeRequest) GetCustomizationsFromBlueprintRequest() (*blueprint.Customizations, error) { func (rbp *Blueprint) GetCustomizationsFromBlueprintRequest() (*blueprint.Customizations, error) {
if request.Blueprint.Customizations == nil { if rbp.Customizations == nil {
return nil, nil return nil, nil
} }
c := &blueprint.Customizations{} c := &blueprint.Customizations{}
rbpc := request.Blueprint.Customizations rbpc := rbp.Customizations
if rbpc.Hostname != nil { if rbpc.Hostname != nil {
c.Hostname = rbpc.Hostname c.Hostname = rbpc.Hostname
@ -499,8 +499,12 @@ func (request *ComposeRequest) GetBlueprintFromCompose() (blueprint.Blueprint, e
return bp, err return bp, err
} }
return ConvertRequestBP(*request.Blueprint)
}
// ConvertRequestBP takes a request Blueprint and returns a composer blueprint.Blueprint
func ConvertRequestBP(rbp Blueprint) (blueprint.Blueprint, error) {
var bp blueprint.Blueprint var bp blueprint.Blueprint
rbp := request.Blueprint
// Copy all the parts from the OpenAPI Blueprint into a blueprint.Blueprint // Copy all the parts from the OpenAPI Blueprint into a blueprint.Blueprint
// NOTE: Openapi fields may be nil, test for that first. // NOTE: Openapi fields may be nil, test for that first.
@ -553,7 +557,7 @@ func (request *ComposeRequest) GetBlueprintFromCompose() (blueprint.Blueprint, e
} }
} }
customizations, err := request.GetCustomizationsFromBlueprintRequest() customizations, err := rbp.GetCustomizationsFromBlueprintRequest()
if err != nil { if err != nil {
return bp, err return bp, err
} }