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

store: don't keep a "default" distro

Browse source 
Only the weldr API has the concept of a default distro. Pass that distro
explicitly to `PushCompose()` and fetch the distro from the compose in
all other functions that accessed Store.Distro.
This commit is contained in:
Lars Karlitski 2020-03-17 00:18:37 +01:00 • committed by msehnout
parent 15033faa81
commit 0f1a014aca
6 changed files with 38 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/mocks/rpmmd/fixtures.go
View file

@ -10,7 +10,6 @@ import (
"github.com/google/uuid"
"github.com/osbuild/osbuild-composer/internal/blueprint"
test_distro "github.com/osbuild/osbuild-composer/internal/distro/fedoratest"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/store"
"github.com/osbuild/osbuild-composer/internal/target"
@ -93,9 +92,8 @@ func createBaseStoreFixture() *store.Store {
},
}
d := test_distro.New()
r, _ := distro_mock.NewDefaultRegistry()
s := store.New(nil, d, *r)
s := store.New(nil, *r)
s.Blueprints[bName] = b
s.Composes = map[uuid.UUID]compose.Compose{
@ -190,9 +188,8 @@ func createStoreWithoutComposesFixture() *store.Store {
Customizations: nil,
}
d := test_distro.New()
r, _ := distro_mock.NewDefaultRegistry()
s := store.New(nil, d, *r)
s := store.New(nil, *r)
s.Blueprints[bName] = b