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

manifest: container specs added during serialization

Browse source 
Add a second argument, map[string][]container.Spec, during
serialization, which serves the same purpose as the depsolved package
sets.
This commit is contained in:
Achilleas Koutsou 2023-05-15 21:39:11 +02:00 • committed by Simon de Vlieger
parent b1f185959b
commit 267a27a1a8
21 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/weldr/api.go
View file

@ -2532,7 +2532,7 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
return
}
mf, err := manifest.Serialize(packageSets)
mf, err := manifest.Serialize(packageSets, nil)
if err != nil {
errors := responseError{
ID: "ManifestCreationFailed",

8
internal/weldr/api_test.go
View file

@ -886,7 +886,7 @@ func TestCompose(t *testing.T) {
manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0)
require.NoError(t, err)
mf, err := manifest.Serialize(nil)
mf, err := manifest.Serialize(nil, nil)
require.NoError(t, err)
ostreeImgType, err := arch.GetImageType(test_distro.TestImageTypeOSTree)
@ -894,7 +894,7 @@ func TestCompose(t *testing.T) {
ostreeManifest, _, err := ostreeImgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0)
require.NoError(t, err)
omf, err := ostreeManifest.Serialize(nil)
omf, err := ostreeManifest.Serialize(nil, nil)
require.NoError(t, err)
expectedComposeLocal := &store.Compose{
@ -1004,7 +1004,7 @@ func TestCompose(t *testing.T) {
manifest2, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0)
require.NoError(t, err)
mf2, err := manifest2.Serialize(nil)
mf2, err := manifest2.Serialize(nil, nil)
require.NoError(t, err)
expectedComposeGoodDistro := &store.Compose{
@ -1998,7 +1998,7 @@ func TestComposePOST_ImageTypeDenylist(t *testing.T) {
manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0)
require.NoError(t, err)
mf, err := manifest.Serialize(nil)
mf, err := manifest.Serialize(nil, nil)
require.NoError(t, err)
expectedComposeLocal := &store.Compose{

4
internal/weldr/compose_test.go
View file

@ -36,7 +36,7 @@ func TestComposeStatusFromLegacyError(t *testing.T) {
if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err)
}
mf, err := manifest.Serialize(nil)
mf, err := manifest.Serialize(nil, nil)
if err != nil {
t.Fatalf("error serializing osbuild manifest: %v", err)
}
@ -89,7 +89,7 @@ func TestComposeStatusFromJobError(t *testing.T) {
if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err)
}
mf, err := manifest.Serialize(nil)
mf, err := manifest.Serialize(nil, nil)
if err != nil {
t.Fatalf("error serializing osbuild manifest: %v", err)
}