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

distro: don't expose repositories in distro objects

Browse source 
Mixing the way to build a distribution with where to get the source
packages from is wrong: it breaks pre-release repos, local mirrors, and
other use cases. To accommodate those, we introduced
`/etc/osbuild-composer/repositories`.

However, that doesn't work for the RCM API, which receives repository
URLs to use from outside requests. This API has been wrongly using the
`additionalRepos` parameter to inject those repos. That's broken,
because the resulting manifests contained both the installed repos and
the repos from the request.

To fix this, stop exposing repositories from the distros, but require
passing them on every call to `Manifest()`. This makes `additionalRepos`
redundant.

Fixes #341
This commit is contained in:
Lars Karlitski 2020-03-18 16:09:36 +01:00 • committed by Tom Gundersen
parent b618829d45
commit 77556973cc
19 changed files with 206 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/weldr/api.go
View file

@ -33,12 +33,13 @@ type API struct {
rpmmd rpmmd.RPMMD
arch string
distro distro.Distro
repos []rpmmd.RepoConfig
logger *log.Logger
router *httprouter.Router
}
func New(rpmmd rpmmd.RPMMD, arch string, distro distro.Distro, logger *log.Logger, store *store.Store) *API {
func New(rpmmd rpmmd.RPMMD, arch string, distro distro.Distro, repos []rpmmd.RepoConfig, logger *log.Logger, store *store.Store) *API {
// This needs to be shared with the worker API so that they can communicate with each other
// builds := make(chan queue.Build, 200)
api := &API{
@ -46,6 +47,7 @@ func New(rpmmd rpmmd.RPMMD, arch string, distro distro.Distro, logger *log.Logge
rpmmd: rpmmd,
arch: arch,
distro: distro,
repos: repos,
logger: logger,
}
@ -232,7 +234,7 @@ func (api *API) sourceListHandler(writer http.ResponseWriter, request *http.Requ
names := api.store.ListSources()
for _, repo := range api.distro.Repositories(api.arch) {
for _, repo := range api.repos {
names = append(names, repo.Id)
}
@ -275,14 +277,14 @@ func (api *API) sourceInfoHandler(writer http.ResponseWriter, request *http.Requ
// if names is "*" we want all sources
if names == "*" {
sources = api.store.GetAllSources()
for _, repo := range api.distro.Repositories(api.arch) {
for _, repo := range api.repos {
sources[repo.Id] = store.NewSourceConfig(repo, true)
}
} else {
for _, name := range strings.Split(names, ",") {
// check if the source is one of the base repos
found := false
for _, repo := range api.distro.Repositories(api.arch) {
for _, repo := range api.repos {
if name == repo.Id {
sources[repo.Id] = store.NewSourceConfig(repo, true)
found = true
@ -622,7 +624,7 @@ func (api *API) modulesInfoHandler(writer http.ResponseWriter, request *http.Req
if modulesRequested {
for i := range packageInfos {
err := packageInfos[i].FillDependencies(api.rpmmd, api.distro.Repositories(api.arch), api.distro.ModulePlatformID())
err := packageInfos[i].FillDependencies(api.rpmmd, api.repos, api.distro.ModulePlatformID())
if err != nil {
errors := responseError{
ID: errorId,
@ -653,7 +655,7 @@ func (api *API) projectsDepsolveHandler(writer http.ResponseWriter, request *htt
names := strings.Split(params.ByName("projects"), ",")
packages, _, err := api.rpmmd.Depsolve(names, nil, api.distro.Repositories(api.arch), api.distro.ModulePlatformID())
packages, _, err := api.rpmmd.Depsolve(names, nil, api.repos, api.distro.ModulePlatformID())
if err != nil {
errors := responseError{
@ -1948,7 +1950,7 @@ func (api *API) composeFailedHandler(writer http.ResponseWriter, request *http.R
}
func (api *API) fetchPackageList() (rpmmd.PackageList, error) {
repos := api.distro.Repositories(api.arch)
repos := append([]rpmmd.RepoConfig{}, api.repos...)
for _, source := range api.store.GetAllSources() {
repos = append(repos, source.RepoConfig())
}
@ -1969,7 +1971,7 @@ func getPkgNameGlob(pkg blueprint.Package) string {
}
func (api *API) depsolveBlueprint(bp *blueprint.Blueprint, outputType, arch string) ([]rpmmd.PackageSpec, []rpmmd.PackageSpec, error) {
repos := api.distro.Repositories(api.arch)
repos := append([]rpmmd.RepoConfig{}, api.repos...)
for _, source := range api.store.GetAllSources() {
repos = append(repos, source.RepoConfig())
}