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

distro: remove packageSpecSets and containers from Manifest() args

Browse source 
The arguments aren't used in the function anymore.
This commit is contained in:
Achilleas Koutsou 2023-05-16 01:15:36 +02:00 • committed by Simon de Vlieger
parent d5d7fb4b31
commit 3b1d48ec99
24 changed files with 72 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/weldr/api.go
View file

@ -2503,12 +2503,7 @@ func (api *API) composeHandler(writer http.ResponseWriter, request *http.Request
return
}
manifest, warnings, err := imageType.Manifest(bp,
options,
imageRepos,
nil,
nil,
seed)
manifest, warnings, err := imageType.Manifest(bp, options, imageRepos, seed)
if err != nil {
errors := responseError{
ID: "ManifestCreationFailed",

8
internal/weldr/api_test.go
View file

@ -883,7 +883,7 @@ func TestCompose(t *testing.T) {
require.NoError(t, err)
imgType, err := arch.GetImageType(test_distro.TestImageTypeName)
require.NoError(t, err)
manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0)
manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, 0)
require.NoError(t, err)
mf, err := manifest.Serialize(nil, nil)
@ -891,7 +891,7 @@ func TestCompose(t *testing.T) {
ostreeImgType, err := arch.GetImageType(test_distro.TestImageTypeOSTree)
require.NoError(t, err)
ostreeManifest, _, err := ostreeImgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0)
ostreeManifest, _, err := ostreeImgType.Manifest(nil, distro.ImageOptions{}, nil, 0)
require.NoError(t, err)
omf, err := ostreeManifest.Serialize(nil, nil)
@ -1001,7 +1001,7 @@ func TestCompose(t *testing.T) {
require.NoError(t, err)
imgType2, err := arch2.GetImageType(test_distro.TestImageTypeName)
require.NoError(t, err)
manifest2, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0)
manifest2, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, 0)
require.NoError(t, err)
mf2, err := manifest2.Serialize(nil, nil)
@ -1995,7 +1995,7 @@ func TestComposePOST_ImageTypeDenylist(t *testing.T) {
require.NoError(t, err)
imgType2, err := arch.GetImageType(test_distro.TestImageType2Name)
require.NoError(t, err)
manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0)
manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, 0)
require.NoError(t, err)
mf, err := manifest.Serialize(nil, nil)

4
internal/weldr/compose_test.go
View file

@ -32,7 +32,7 @@ func TestComposeStatusFromLegacyError(t *testing.T) {
if err != nil {
t.Fatalf("error getting image type from arch: %v", err)
}
manifest, _, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, nil, nil, 0)
manifest, _, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, 0)
if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err)
}
@ -85,7 +85,7 @@ func TestComposeStatusFromJobError(t *testing.T) {
if err != nil {
t.Fatalf("error getting image type from arch: %v", err)
}
manifest, _, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, nil, nil, 0)
manifest, _, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, 0)
if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err)
}