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

cloudapi: Override the request distro with the blueprint distro

Browse source 
When the blueprint sets a specific distribution it should be used
instead of the distribution from the compose request.

Includes a test to make sure it uses repositories from the blueprint,
not the request.
This commit is contained in:
Brian C. Lane 2024-03-12 13:26:18 -07:00 • committed by Achilleas Koutsou
parent f311adf35d
commit d3fc53bdec
2 changed files with 45 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -967,11 +967,6 @@ func (request *ComposeRequest) GetPartitioningMode() (disk.PartitioningMode, err
// GetImageRequests converts a composeRequest structure from the API to an intermediate imageRequest structure
// that's used for generating manifests and orchestrating worker jobs.
func (request *ComposeRequest) GetImageRequests(distroFactory *distrofactory.Factory, repoRegistry *reporegistry.RepoRegistry) ([]imageRequest, error) {
distribution := distroFactory.GetDistro(request.Distribution)
if distribution == nil {
return nil, HTTPError(ErrorUnsupportedDistribution)
}
// OpenAPI enforces blueprint or customization, not both
// but check anyway
if request.Customizations != nil && request.Blueprint != nil {
@ -984,6 +979,19 @@ func (request *ComposeRequest) GetImageRequests(distroFactory *distrofactory.Fac
return nil, err
}
// Used when no repositories are included. Must be the original name because it may
// be an alias and you cannot map back from the distrofactory to the original string.
originalDistroName := request.Distribution
// If there is a distribution in the blueprint it overrides the request's distro
if len(bp.Distro) > 0 {
originalDistroName = bp.Distro
}
distribution := distroFactory.GetDistro(originalDistroName)
if distribution == nil {
return nil, HTTPError(ErrorUnsupportedDistribution)
}
// add the user-defined repositories only to the depsolve job for the
// payload (the packages for the final image)
payloadRepositories := request.GetPayloadRepositories()
@ -1024,9 +1032,10 @@ func (request *ComposeRequest) GetImageRequests(distroFactory *distrofactory.Fac
return nil, err
}
// If no repositories are included with the imageRequest use the defaults for the distro
// If no repositories are included with the imageRequest use the defaults for
// the distro selected by the blueprint, or the compose request.
if len(ir.Repositories) == 0 {
dr, err := repoRegistry.ReposByImageTypeName(request.Distribution, arch.Name(), imageType.Name())
dr, err := repoRegistry.ReposByImageTypeName(originalDistroName, arch.Name(), imageType.Name())
if err != nil {
return nil, err
}