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

osbuild/images update: ignore repoconfigs where appropriate

Browse source
This commit is contained in:
Sanne Raymaekers 2024-04-15 12:29:24 +02:00
parent d6cfd04704
commit d0a6828bd7
6 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/store/fixtures.go
View file

@ -86,7 +86,7 @@ func FixtureBase(hostDistroName, hostArchName string) *Fixture {
panic(fmt.Sprintf("failed to create a manifest: %v", err)) panic(fmt.Sprintf("failed to create a manifest: %v", err))
} }
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
panic(fmt.Sprintf("failed to create a manifest: %v", err)) panic(fmt.Sprintf("failed to create a manifest: %v", err))
} }
@ -236,7 +236,7 @@ func FixtureFinished(hostDistroName, hostArchName string) *Fixture {
panic(fmt.Sprintf("failed to create a manifest: %v", err)) panic(fmt.Sprintf("failed to create a manifest: %v", err))
} }
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
panic(fmt.Sprintf("failed to create a manifest: %v", err)) panic(fmt.Sprintf("failed to create a manifest: %v", err))
} }
@ -470,7 +470,7 @@ func FixtureJobs(hostDistroName, hostArchName string) *Fixture {
panic(fmt.Sprintf("failed to create a manifest: %v", err)) panic(fmt.Sprintf("failed to create a manifest: %v", err))
} }
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
panic(fmt.Sprintf("failed to create a manifest: %v", err)) panic(fmt.Sprintf("failed to create a manifest: %v", err))
} }

2
internal/store/store_test.go
View file

@ -59,7 +59,7 @@ func (suite *storeTest) SetupSuite() {
suite.NoError(err) suite.NoError(err)
ibp := blueprint.Convert(suite.myBP) ibp := blueprint.Convert(suite.myBP)
manifest, _, _ := suite.myImageType.Manifest(&ibp, suite.myImageOptions, suite.myRepoConfig, 0) manifest, _, _ := suite.myImageType.Manifest(&ibp, suite.myImageOptions, suite.myRepoConfig, 0)
suite.myManifest, _ = manifest.Serialize(nil, nil, nil) suite.myManifest, _ = manifest.Serialize(nil, nil, nil, nil)
suite.mySourceConfig = SourceConfig{ suite.mySourceConfig = SourceConfig{
Name: "testSourceConfig", Name: "testSourceConfig",
} }

8
internal/weldr/api.go
View file

@ -326,7 +326,7 @@ func (api *API) PreloadMetadata() {
} }
solver := api.solver.NewWithConfig(d.ModulePlatformID(), d.Releasever(), api.hostArch, d.Name()) solver := api.solver.NewWithConfig(d.ModulePlatformID(), d.Releasever(), api.hostArch, d.Name())
_, err = solver.Depsolve([]rpmmd.PackageSet{{Include: []string{"filesystem"}, Repositories: repos}}) _, _, err = solver.Depsolve([]rpmmd.PackageSet{{Include: []string{"filesystem"}, Repositories: repos}})
if err != nil { if err != nil {
log.Printf("Problem preloading distro metadata for %s: %s", distro, err) log.Printf("Problem preloading distro metadata for %s: %s", distro, err)
} }
@ -1290,7 +1290,7 @@ func (api *API) modulesInfoHandler(writer http.ResponseWriter, request *http.Req
solver := api.solver.NewWithConfig(d.ModulePlatformID(), d.Releasever(), archName, d.Name()) solver := api.solver.NewWithConfig(d.ModulePlatformID(), d.Releasever(), archName, d.Name())
for i := range packageInfos { for i := range packageInfos {
pkgName := packageInfos[i].Name pkgName := packageInfos[i].Name
solved, err := solver.Depsolve([]rpmmd.PackageSet{{Include: []string{pkgName}, Repositories: repos}}) solved, _, err := solver.Depsolve([]rpmmd.PackageSet{{Include: []string{pkgName}, Repositories: repos}})
if err != nil { if err != nil {
errors := responseError{ errors := responseError{
ID: errorId, ID: errorId,
@ -1377,7 +1377,7 @@ func (api *API) projectsDepsolveHandler(writer http.ResponseWriter, request *htt
} }
solver := api.solver.NewWithConfig(d.ModulePlatformID(), d.Releasever(), archName, d.Name()) solver := api.solver.NewWithConfig(d.ModulePlatformID(), d.Releasever(), archName, d.Name())
deps, err := solver.Depsolve([]rpmmd.PackageSet{{Include: names, Repositories: repos}}) deps, _, err := solver.Depsolve([]rpmmd.PackageSet{{Include: names, Repositories: repos}})
if err != nil { if err != nil {
errors := responseError{ errors := responseError{
ID: "ProjectsError", ID: "ProjectsError",
@ -3611,7 +3611,7 @@ func (api *API) depsolveBlueprint(bp blueprint.Blueprint) ([]rpmmd.PackageSpec,
} }
solver := api.solver.NewWithConfig(d.ModulePlatformID(), d.Releasever(), arch, d.Name()) solver := api.solver.NewWithConfig(d.ModulePlatformID(), d.Releasever(), arch, d.Name())
solved, err := solver.Depsolve([]rpmmd.PackageSet{{Include: bp.GetPackages(), Repositories: repos}}) solved, _, err := solver.Depsolve([]rpmmd.PackageSet{{Include: bp.GetPackages(), Repositories: repos}})
if err != nil { if err != nil {
return nil, err return nil, err
} }

10
internal/weldr/api_test.go
View file

@ -954,7 +954,7 @@ func TestCompose(t *testing.T) {
rPkgs, rContainers, rCommits := ResolveContent(manifest.GetPackageSetChains(), manifest.GetContainerSourceSpecs(), manifest.GetOSTreeSourceSpecs()) rPkgs, rContainers, rCommits := ResolveContent(manifest.GetPackageSetChains(), manifest.GetContainerSourceSpecs(), manifest.GetOSTreeSourceSpecs())
mf, err := manifest.Serialize(rPkgs, rContainers, rCommits) mf, err := manifest.Serialize(rPkgs, rContainers, rCommits, nil)
require.NoError(t, err) require.NoError(t, err)
ostreeImgType, err := arch.GetImageType(test_distro.TestImageTypeOSTree) ostreeImgType, err := arch.GetImageType(test_distro.TestImageTypeOSTree)
@ -965,7 +965,7 @@ func TestCompose(t *testing.T) {
rPkgs, rContainers, rCommits = ResolveContent(ostreeManifest.GetPackageSetChains(), ostreeManifest.GetContainerSourceSpecs(), ostreeManifest.GetOSTreeSourceSpecs()) rPkgs, rContainers, rCommits = ResolveContent(ostreeManifest.GetPackageSetChains(), ostreeManifest.GetContainerSourceSpecs(), ostreeManifest.GetOSTreeSourceSpecs())
omf, err := ostreeManifest.Serialize(rPkgs, rContainers, rCommits) omf, err := ostreeManifest.Serialize(rPkgs, rContainers, rCommits, nil)
require.NoError(t, err) require.NoError(t, err)
expectedComposeLocal := &store.Compose{ expectedComposeLocal := &store.Compose{
@ -1076,7 +1076,7 @@ func TestCompose(t *testing.T) {
rPkgs, rContainers, rCommits = ResolveContent(ostreeManifestOther.GetPackageSetChains(), ostreeManifestOther.GetContainerSourceSpecs(), ostreeManifestOther.GetOSTreeSourceSpecs()) rPkgs, rContainers, rCommits = ResolveContent(ostreeManifestOther.GetPackageSetChains(), ostreeManifestOther.GetContainerSourceSpecs(), ostreeManifestOther.GetOSTreeSourceSpecs())
omfo, err := ostreeManifest.Serialize(rPkgs, rContainers, rCommits) omfo, err := ostreeManifest.Serialize(rPkgs, rContainers, rCommits, nil)
require.NoError(t, err) require.NoError(t, err)
expectedComposeOSTreeOther := &store.Compose{ expectedComposeOSTreeOther := &store.Compose{
Blueprint: &blueprint.Blueprint{ Blueprint: &blueprint.Blueprint{
@ -1118,7 +1118,7 @@ func TestCompose(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
rPkgs, rContainers, rCommits = ResolveContent(manifest2.GetPackageSetChains(), manifest2.GetContainerSourceSpecs(), manifest2.GetOSTreeSourceSpecs()) rPkgs, rContainers, rCommits = ResolveContent(manifest2.GetPackageSetChains(), manifest2.GetContainerSourceSpecs(), manifest2.GetOSTreeSourceSpecs())
mf2, err := manifest2.Serialize(rPkgs, rContainers, rCommits) mf2, err := manifest2.Serialize(rPkgs, rContainers, rCommits, nil)
require.NoError(t, err) require.NoError(t, err)
expectedComposeGoodDistro := &store.Compose{ expectedComposeGoodDistro := &store.Compose{
@ -2156,7 +2156,7 @@ func TestComposePOST_ImageTypeDenylist(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
rPkgs, rContainers, rCommits := ResolveContent(manifest.GetPackageSetChains(), manifest.GetContainerSourceSpecs(), manifest.GetOSTreeSourceSpecs()) rPkgs, rContainers, rCommits := ResolveContent(manifest.GetPackageSetChains(), manifest.GetContainerSourceSpecs(), manifest.GetOSTreeSourceSpecs())
mf, err := manifest.Serialize(rPkgs, rContainers, rCommits) mf, err := manifest.Serialize(rPkgs, rContainers, rCommits, nil)
require.NoError(t, err) require.NoError(t, err)
expectedComposeLocal := &store.Compose{ expectedComposeLocal := &store.Compose{

4
internal/weldr/compose_test.go
View file

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

16
internal/worker/server_test.go
View file

@ -145,7 +145,7 @@ func TestCreate(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
@ -176,7 +176,7 @@ func TestCancel(t *testing.T) {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
server := newTestServer(t, t.TempDir(), defaultConfig, false) server := newTestServer(t, t.TempDir(), defaultConfig, false)
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
@ -217,7 +217,7 @@ func TestUpdate(t *testing.T) {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
server := newTestServer(t, t.TempDir(), defaultConfig, false) server := newTestServer(t, t.TempDir(), defaultConfig, false)
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
@ -249,7 +249,7 @@ func TestArgs(t *testing.T) {
manifest, _, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, 0) manifest, _, err := imageType.Manifest(nil, distro.ImageOptions{Size: imageType.Size(0)}, nil, 0)
require.NoError(t, err) require.NoError(t, err)
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
require.NoError(t, err) require.NoError(t, err)
job := worker.OSBuildJob{ job := worker.OSBuildJob{
@ -300,7 +300,7 @@ func TestUpload(t *testing.T) {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
server := newTestServer(t, t.TempDir(), defaultConfig, true) server := newTestServer(t, t.TempDir(), defaultConfig, true)
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
@ -335,7 +335,7 @@ func TestUploadNotAcceptingArtifacts(t *testing.T) {
} }
server := newTestServer(t, t.TempDir(), defaultConfig, false) server := newTestServer(t, t.TempDir(), defaultConfig, false)
handler := server.Handler() handler := server.Handler()
mf, _ := manifest.Serialize(nil, nil, nil) mf, _ := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
@ -367,7 +367,7 @@ func TestUploadAlteredBasePath(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
@ -1541,7 +1541,7 @@ func TestRequestJobForWorker(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }
mf, err := manifest.Serialize(nil, nil, nil) mf, err := manifest.Serialize(nil, nil, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error creating osbuild manifest: %v", err) t.Fatalf("error creating osbuild manifest: %v", err)
} }