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

api: Add support for upload API

Browse source 
This commit introduces basic support for upload API. Currently, all the routes
required by cockpit-composer are supported (except for /compose/log).

Also, ComposeEntry struct is moved outside of the store package. I decided
to do it because it isn't connected in any way to store, it's more connected
to API. Due to this move there's currently a known bug that image size is
not returned. This should be solved by moving Image struct inside Compose
struct by follow-up PR.
This commit is contained in:
Ondřej Budai 2019-11-28 15:15:27 +01:00 • committed by Tom Gundersen
parent be1cf79d6a
commit f4991cb1ca
7 changed files with 570 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import (
"github.com/osbuild/osbuild-composer/internal/distro"
"github.com/osbuild/osbuild-composer/internal/rpmmd"
"github.com/osbuild/osbuild-composer/internal/store"
"github.com/osbuild/osbuild-composer/internal/target"
)
type FixtureGenerator func() Fixture
@ -54,44 +55,78 @@ func generatePackageList() rpmmd.PackageList {
func createBaseStoreFixture() *store.Store {
var bName = "test"
var b = blueprint.Blueprint{Name: bName, Version: "0.0.0"}
var b = blueprint.Blueprint{
Name: bName,
Version: "0.0.0",
Packages: []blueprint.Package{},
Modules: []blueprint.Package{},
Groups: []blueprint.Group{},
Customizations: nil,
}
var date = time.Date(2019, 11, 27, 13, 19, 0, 0, time.FixedZone("UTC+1", 60*60))
var localTarget = &target.Target{
Uuid: uuid.MustParse("20000000-0000-0000-0000-000000000000"),
Name: "org.osbuild.local",
ImageName: "localimage",
Created: date,
Status: "WAITING",
Options: &target.LocalTargetOptions{
Location: "/tmp/localimage",
},
}
var awsTarget = &target.Target{
Uuid: uuid.MustParse("10000000-0000-0000-0000-000000000000"),
Name: "org.osbuild.aws",
ImageName: "awsimage",
Created: date,
Status: "WAITING",
Options: &target.AWSTargetOptions{
Region: "frankfurt",
AccessKeyID: "accesskey",
SecretAccessKey: "secretkey",
Bucket: "clay",
Key: "imagekey",
},
}
d := distro.New("fedora-30")
s := store.New(nil, d)
s.Blueprints[bName] = b
s.Composes = map[uuid.UUID]store.Compose{
uuid.MustParse("e65f76f8-b0d9-4974-9dd7-745ae80b4721"): store.Compose{
uuid.MustParse("30000000-0000-0000-0000-000000000000"): store.Compose{
QueueStatus: "WAITING",
Blueprint: &b,
OutputType: "tar",
Targets: nil,
Targets: []*target.Target{localTarget, awsTarget},
JobCreated: date,
},
uuid.MustParse("e65f76f8-b0d9-4974-9dd7-745ae80b4722"): store.Compose{
uuid.MustParse("30000000-0000-0000-0000-000000000001"): store.Compose{
QueueStatus: "RUNNING",
Blueprint: &b,
OutputType: "tar",
Targets: nil,
Targets: []*target.Target{localTarget},
JobCreated: date,
JobStarted: date,
},
uuid.MustParse("e65f76f8-b0d9-4974-9dd7-745ae80b4723"): store.Compose{
uuid.MustParse("30000000-0000-0000-0000-000000000002"): store.Compose{
QueueStatus: "FINISHED",
Blueprint: &b,
OutputType: "tar",
Targets: nil,
Targets: []*target.Target{localTarget, awsTarget},
JobCreated: date,
JobStarted: date,
JobFinished: date,
},
uuid.MustParse("e65f76f8-b0d9-4974-9dd7-745ae80b4724"): store.Compose{
uuid.MustParse("30000000-0000-0000-0000-000000000003"): store.Compose{
QueueStatus: "FAILED",
Blueprint: &b,
OutputType: "tar",
Targets: nil,
Targets: []*target.Target{localTarget, awsTarget},
JobCreated: date,
JobStarted: date,
JobFinished: date,
@ -101,6 +136,44 @@ func createBaseStoreFixture() *store.Store {
return s
}
func createBaseDepsolveFixture() []rpmmd.PackageSpec {
return []rpmmd.PackageSpec{
{
Name: "dep-package1",
Epoch: 0,
Version: "1.33",
Release: "2.fc30",
Arch: "x86_64",
},
{
Name: "dep-package2",
Epoch: 0,
Version: "2.9",
Release: "1.fc30",
Arch: "x86_64",
},
}
}
func createStoreWithoutComposesFixture() *store.Store {
var bName = "test"
var b = blueprint.Blueprint{
Name: bName,
Version: "0.0.0",
Packages: []blueprint.Package{},
Modules: []blueprint.Package{},
Groups: []blueprint.Group{},
Customizations: nil,
}
d := distro.New("fedora-30")
s := store.New(nil, d)
s.Blueprints[bName] = b
return s
}
func BaseFixture() Fixture {
return Fixture{
fetchPackageList{
@ -108,28 +181,27 @@ func BaseFixture() Fixture {
nil,
},
depsolve{
[]rpmmd.PackageSpec{
{
Name: "dep-package1",
Epoch: 0,
Version: "1.33",
Release: "2.fc30",
Arch: "x86_64",
},
{
Name: "dep-package2",
Epoch: 0,
Version: "2.9",
Release: "1.fc30",
Arch: "x86_64",
},
},
createBaseDepsolveFixture(),
nil,
},
createBaseStoreFixture(),
}
}
func NoComposesFixture() Fixture {
return Fixture{
fetchPackageList{
generatePackageList(),
nil,
},
depsolve{
createBaseDepsolveFixture(),
nil,
},
createStoreWithoutComposesFixture(),
}
}
func NonExistingPackage() Fixture {
return Fixture{
fetchPackageList{