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

weldr: Add optional distro selection to modules and projects/info route

Browse source
This commit is contained in:
Brian C. Lane 2021-04-19 15:23:01 -07:00 • committed by Ondřej Budai
parent b98cf3c4f7
commit 2b63b3cbed
1 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
internal/weldr/api.go
View file

@ -1079,7 +1079,18 @@ func (api *API) modulesInfoHandler(writer http.ResponseWriter, request *http.Req
names := strings.Split(modules, ",")
availablePackages, err := api.fetchPackageList(api.hostDistroName)
// Optional distro parameter
// If it is empty it will return api.hostDistroName
distroName, err := api.parseDistro(request.URL.Query())
if err != nil {
errors := responseError{
ID: "DistroError",
Msg: err.Error(),
}
statusResponseError(writer, http.StatusBadRequest, errors)
return
}
availablePackages, err := api.fetchPackageList(distroName)
if err != nil {
errors := responseError{
@ -1113,7 +1124,7 @@ func (api *API) modulesInfoHandler(writer http.ResponseWriter, request *http.Req
packageInfos := foundPackages.ToPackageInfos()
if modulesRequested {
repos, err := api.repoRegistry.ReposByArch(api.arch, false)
repos, err := api.allRepositories(distroName)
if err != nil {
errors := responseError{
ID: "InternalError",
@ -1122,9 +1133,18 @@ func (api *API) modulesInfoHandler(writer http.ResponseWriter, request *http.Req
statusResponseError(writer, http.StatusBadRequest, errors)
return
}
d := api.distros.GetDistro(distroName)
if d == nil {
errors := responseError{
ID: "DistroError",
Msg: fmt.Sprintf("Unknown distribution: %s", distroName),
}
statusResponseError(writer, http.StatusBadRequest, errors)
return
}
for i := range packageInfos {
err := packageInfos[i].FillDependencies(api.rpmmd, repos, api.distro.ModulePlatformID(), api.arch.Name())
err := packageInfos[i].FillDependencies(api.rpmmd, repos, d.ModulePlatformID(), api.arch.Name())
if err != nil {
errors := responseError{
ID: errorId,