diff --git a/cmd/gen-manifests/main.go b/cmd/gen-manifests/main.go index d855a7202..ab9de66ee 100644 --- a/cmd/gen-manifests/main.go +++ b/cmd/gen-manifests/main.go @@ -156,7 +156,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d bp = blueprint.Blueprint(*cr.Blueprint) } - manifest, _, err := imgType.Manifest(&bp, options, repos, nil, nil, seedArg) + manifest, _, err := imgType.Manifest(&bp, options, repos, seedArg) if err != nil { err = fmt.Errorf("[%s] failed: %s", filename, err) return diff --git a/cmd/osbuild-dnf-json-tests/main_test.go b/cmd/osbuild-dnf-json-tests/main_test.go index 02a67f181..8569a2413 100644 --- a/cmd/osbuild-dnf-json-tests/main_test.go +++ b/cmd/osbuild-dnf-json-tests/main_test.go @@ -63,7 +63,7 @@ func TestCrossArchDepsolve(t *testing.T) { FetchChecksum: "baz", }, }, - repos[archStr], nil, nil, 0) + repos[archStr], 0) assert.NoError(t, err) for _, set := range manifest.Content.PackageSets { @@ -101,7 +101,7 @@ func TestDepsolvePackageSets(t *testing.T) { qcow2Image, err := x86Arch.GetImageType(qcow2ImageTypeName) require.Nilf(t, err, "failed to get %q image type of %q/%q distro/arch", qcow2ImageTypeName, cs9.Name(), platform.ARCH_X86_64.String()) - manifestSource, _, err := qcow2Image.Manifest(&blueprint.Blueprint{Packages: []blueprint.Package{{Name: "bind"}}}, distro.ImageOptions{}, x86Repos, nil, nil, 0) + manifestSource, _, err := qcow2Image.Manifest(&blueprint.Blueprint{Packages: []blueprint.Package{{Name: "bind"}}}, distro.ImageOptions{}, x86Repos, 0) require.Nilf(t, err, "failed to initialise manifest for %q image type of %q/%q distro/arch", qcow2ImageTypeName, cs9.Name(), platform.ARCH_X86_64.String()) imagePkgSets := manifestSource.Content.PackageSets diff --git a/cmd/osbuild-package-sets/main.go b/cmd/osbuild-package-sets/main.go index 98545ed3f..549686008 100644 --- a/cmd/osbuild-package-sets/main.go +++ b/cmd/osbuild-package-sets/main.go @@ -48,13 +48,14 @@ func main() { encoder := json.NewEncoder(os.Stdout) encoder.SetIndent("", " ") - manifest, _, err := image.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{ + options := distro.ImageOptions{ OSTree: &ostree.ImageOptions{ URL: "foo", ImageRef: "bar", FetchChecksum: "baz", }, - }, nil, nil, nil, 0) + } + manifest, _, err := image.Manifest(&blueprint.Blueprint{}, options, nil, 0) if err != nil { panic(err) } diff --git a/cmd/osbuild-pipeline/main.go b/cmd/osbuild-pipeline/main.go index 703e58a67..8dd619fe3 100644 --- a/cmd/osbuild-pipeline/main.go +++ b/cmd/osbuild-pipeline/main.go @@ -200,12 +200,7 @@ func main() { // let the cache grow to fit much more repository metadata than we usually allow solver.SetMaxCacheSize(3 * 1024 * 1024 * 1024) - manifest, _, err := imageType.Manifest(&composeRequest.Blueprint, - options, - repos, - nil, - nil, - seedArg) + manifest, _, err := imageType.Manifest(&composeRequest.Blueprint, options, repos, seedArg) if err != nil { panic(err.Error()) } diff --git a/cmd/osbuild-store-dump/main.go b/cmd/osbuild-store-dump/main.go index f20989f93..1f06aba9a 100644 --- a/cmd/osbuild-store-dump/main.go +++ b/cmd/osbuild-store-dump/main.go @@ -22,7 +22,7 @@ import ( ) func getManifest(bp blueprint.Blueprint, t distro.ImageType, a distro.Arch, d distro.Distro, cacheDir string, repos []rpmmd.RepoConfig) (manifest.OSBuildManifest, []rpmmd.PackageSpec) { - manifest, _, err := t.Manifest(&bp, distro.ImageOptions{}, repos, nil, nil, 0) + manifest, _, err := t.Manifest(&bp, distro.ImageOptions{}, repos, 0) if err != nil { panic(err) } diff --git a/internal/cloudapi/v2/server.go b/internal/cloudapi/v2/server.go index e79df5a74..0ccc1e93b 100644 --- a/internal/cloudapi/v2/server.go +++ b/internal/cloudapi/v2/server.go @@ -462,7 +462,7 @@ func generateManifest(ctx context.Context, workers *worker.Server, depsolveJobID } } - manifest, _, err := imageType.Manifest(b, options, repos, depsolveResults.PackageSpecs, containerSpecs, seed) + manifest, _, err := imageType.Manifest(b, options, repos, seed) if err != nil { reason := "Error generating manifest" jobResult.JobError = clienterrors.WorkerClientError(clienterrors.ErrorManifestGeneration, reason, nil) diff --git a/internal/distro/distro.go b/internal/distro/distro.go index 0a2a3e058..6ad98df55 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/osbuild/osbuild-composer/internal/blueprint" - "github.com/osbuild/osbuild-composer/internal/container" "github.com/osbuild/osbuild-composer/internal/disk" "github.com/osbuild/osbuild-composer/internal/manifest" "github.com/osbuild/osbuild-composer/internal/ostree" @@ -133,7 +132,7 @@ type ImageType interface { // specified in the given blueprint; it also returns any warnings (e.g. // deprecation notices) generated by the manifest. // The packageSpecSets must be labelled in the same way as the originating PackageSets. - Manifest(bp *blueprint.Blueprint, options ImageOptions, repos []rpmmd.RepoConfig, packageSpecSets map[string][]rpmmd.PackageSpec, containers []container.Spec, seed int64) (*manifest.Manifest, []string, error) + Manifest(bp *blueprint.Blueprint, options ImageOptions, repos []rpmmd.RepoConfig, seed int64) (*manifest.Manifest, []string, error) } // The ImageOptions specify options for a specific image build diff --git a/internal/distro/distro_test.go b/internal/distro/distro_test.go index 15a611843..a3d8dc3e8 100644 --- a/internal/distro/distro_test.go +++ b/internal/distro/distro_test.go @@ -54,13 +54,14 @@ func TestImageType_PackageSetsChains(t *testing.T) { bp := blueprint.Blueprint{ Customizations: customizations, } - manifest, _, err := imageType.Manifest(&bp, distro.ImageOptions{ + options := distro.ImageOptions{ OSTree: &ostree.ImageOptions{ URL: "foo", ImageRef: "bar", FetchChecksum: "baz", }, - }, nil, nil, nil, 0) + } + manifest, _, err := imageType.Manifest(&bp, options, nil, 0) require.NoError(t, err) imagePkgSets := manifest.Content.PackageSets for packageSetName := range imageType.PackageSetsChains() { @@ -166,7 +167,7 @@ func TestImageTypePipelineNames(t *testing.T) { packageSets[plName] = minimalPackageSet } - m, _, err := imageType.Manifest(&bp, options, repos, nil, nil, seed) + m, _, err := imageType.Manifest(&bp, options, repos, seed) assert.NoError(err) containers := make(map[string][]container.Spec, 0) @@ -453,7 +454,7 @@ func TestPipelineRepositories(t *testing.T) { } repos := tCase.repos - manifest, _, err := imageType.Manifest(&bp, options, repos, nil, nil, 0) + manifest, _, err := imageType.Manifest(&bp, options, repos, 0) require.NoError(err) packageSets := manifest.Content.PackageSets diff --git a/internal/distro/distro_test_common/distro_test_common.go b/internal/distro/distro_test_common/distro_test_common.go index 2f6e1714f..6ecb019cb 100644 --- a/internal/distro/distro_test_common/distro_test_common.go +++ b/internal/distro/distro_test_common/distro_test_common.go @@ -144,12 +144,7 @@ func TestDistro_Manifest(t *testing.T, pipelinePath string, prefix string, regis imgPackageSpecSets = tt.PackageSpecSets } - manifest, _, err := imageType.Manifest(tt.ComposeRequest.Blueprint, - options, - repos, - nil, - nil, - RandomTestSeed) + manifest, _, err := imageType.Manifest(tt.ComposeRequest.Blueprint, options, repos, RandomTestSeed) if err != nil { t.Errorf("distro.Manifest() error = %v", err) return @@ -175,7 +170,7 @@ func TestDistro_Manifest(t *testing.T, pipelinePath string, prefix string, regis } func getImageTypePkgSpecSets(imageType distro.ImageType, bp blueprint.Blueprint, options distro.ImageOptions, repos []rpmmd.RepoConfig, cacheDir, dnfJsonPath string) map[string][]rpmmd.PackageSpec { - manifest, _, err := imageType.Manifest(&bp, options, repos, nil, nil, 0) + manifest, _, err := imageType.Manifest(&bp, options, repos, 0) if err != nil { panic("Could not generate manifest for package sets: " + err.Error()) } @@ -212,7 +207,7 @@ func kernelCount(imgType distro.ImageType, bp blueprint.Blueprint) int { ImageRef: "bar", FetchChecksum: "baz", } - manifest, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: ostreeOptions}, nil, nil, nil, 0) + manifest, _, err := imgType.Manifest(&bp, distro.ImageOptions{OSTree: ostreeOptions}, nil, 0) if err != nil { panic(err) } diff --git a/internal/distro/fedora/distro_test.go b/internal/distro/fedora/distro_test.go index 9e73c41d4..3b1d1a8ed 100644 --- a/internal/distro/fedora/distro_test.go +++ b/internal/distro/fedora/distro_test.go @@ -254,7 +254,7 @@ func TestImageType_BuildPackages(t *testing.T) { if assert.NoErrorf(t, err, "d.GetArch(%v) returned err = %v; expected nil", archLabel, err) { continue } - manifest, _, err := itStruct.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{}, nil, nil, nil, 0) + manifest, _, err := itStruct.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{}, nil, 0) assert.NoError(t, err) buildPkgs := manifest.Content.PackageSets["build"] assert.NotNil(t, buildPkgs) @@ -427,7 +427,7 @@ func TestDistro_ManifestError(t *testing.T) { imgOpts := distro.ImageOptions{ Size: imgType.Size(0), } - _, _, err := imgType.Manifest(&bp, imgOpts, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, imgOpts, nil, 0) if imgTypeName == "iot-commit" || imgTypeName == "iot-container" { assert.EqualError(t, err, "kernel boot parameter customizations are not supported for ostree types") } else if imgTypeName == "iot-installer" { @@ -577,7 +577,7 @@ func TestDistro_CustomFileSystemManifestError(t *testing.T) { arch, _ := fedoraDistro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "iot-commit" || imgTypeName == "iot-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if imgTypeName == "iot-raw-image" { @@ -607,7 +607,7 @@ func TestDistro_TestRootMountPoint(t *testing.T) { arch, _ := fedoraDistro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "iot-commit" || imgTypeName == "iot-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if imgTypeName == "iot-raw-image" { @@ -641,7 +641,7 @@ func TestDistro_CustomFileSystemSubDirectories(t *testing.T) { arch, _ := fedoraDistro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if strings.HasPrefix(imgTypeName, "iot-") || strings.HasPrefix(imgTypeName, "image-") { continue } else { @@ -679,7 +679,7 @@ func TestDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) { arch, _ := fedoraDistro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if strings.HasPrefix(imgTypeName, "iot-") || strings.HasPrefix(imgTypeName, "image-") { continue } else { @@ -713,7 +713,7 @@ func TestDistro_DirtyMountpointsNotAllowed(t *testing.T) { arch, _ := fedoraDistro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if strings.HasPrefix(imgTypeName, "iot-") || strings.HasPrefix(imgTypeName, "image-") { continue } else { @@ -743,7 +743,7 @@ func TestDistro_CustomFileSystemPatternMatching(t *testing.T) { arch, _ := fedoraDistro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "iot-commit" || imgTypeName == "iot-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if imgTypeName == "iot-raw-image" { @@ -773,7 +773,7 @@ func TestDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) { arch, _ := fedoraDistro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "iot-commit" || imgTypeName == "iot-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if imgTypeName == "iot-raw-image" { diff --git a/internal/distro/fedora/imagetype.go b/internal/distro/fedora/imagetype.go index 2aa46e2ae..a52bbb93a 100644 --- a/internal/distro/fedora/imagetype.go +++ b/internal/distro/fedora/imagetype.go @@ -261,8 +261,6 @@ func (t *imageType) PartitionType() string { func (t *imageType) Manifest(bp *blueprint.Blueprint, options distro.ImageOptions, repos []rpmmd.RepoConfig, - packageSpecs map[string][]rpmmd.PackageSpec, - containers []container.Spec, seed int64) (*manifest.Manifest, []string, error) { warnings, err := t.checkOptions(bp, options) diff --git a/internal/distro/rhel7/distro_test.go b/internal/distro/rhel7/distro_test.go index f310bb3f0..ed218d1d3 100644 --- a/internal/distro/rhel7/distro_test.go +++ b/internal/distro/rhel7/distro_test.go @@ -117,7 +117,7 @@ func TestImageType_BuildPackages(t *testing.T) { if assert.NoErrorf(t, err, "d.GetArch(%v) returned err = %v; expected nil", archLabel, err) { continue } - manifest, _, err := itStruct.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{}, nil, nil, nil, 0) + manifest, _, err := itStruct.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{}, nil, 0) assert.NoError(t, err) buildPkgs := manifest.Content.PackageSets["build"] assert.NotNil(t, buildPkgs) @@ -179,7 +179,7 @@ func TestDistro_ManifestError(t *testing.T) { imgOpts := distro.ImageOptions{ Size: imgType.Size(0), } - _, _, err := imgType.Manifest(&bp, imgOpts, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, imgOpts, nil, 0) assert.NoError(t, err) } } @@ -285,7 +285,7 @@ func TestDistro_CustomFileSystemManifestError(t *testing.T) { arch, _ := r7distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) assert.EqualError(t, err, "The following custom mountpoints are not supported [\"/etc\"]") } } @@ -307,7 +307,7 @@ func TestDistro_TestRootMountPoint(t *testing.T) { arch, _ := r7distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) assert.NoError(t, err) } } @@ -333,7 +333,7 @@ func TestDistro_CustomFileSystemSubDirectories(t *testing.T) { arch, _ := r7distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) assert.NoError(t, err) } } @@ -367,7 +367,7 @@ func TestDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) { arch, _ := r7distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) assert.NoError(t, err) } } @@ -397,7 +397,7 @@ func TestDistro_DirtyMountpointsNotAllowed(t *testing.T) { arch, _ := r7distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) assert.EqualError(t, err, "The following custom mountpoints are not supported [\"//\" \"/var//\" \"/var//log/audit/\"]") } } @@ -423,7 +423,7 @@ func TestDistro_CustomFileSystemPatternMatching(t *testing.T) { arch, _ := r7distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) assert.EqualError(t, err, "The following custom mountpoints are not supported [\"/variable\" \"/variable/log/audit\"]") } } @@ -445,7 +445,7 @@ func TestDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) { arch, _ := r7distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) assert.NoError(t, err) } } diff --git a/internal/distro/rhel7/imagetype.go b/internal/distro/rhel7/imagetype.go index c8c8b956a..7512db62f 100644 --- a/internal/distro/rhel7/imagetype.go +++ b/internal/distro/rhel7/imagetype.go @@ -152,8 +152,6 @@ func (t *imageType) PartitionType() string { func (t *imageType) Manifest(bp *blueprint.Blueprint, options distro.ImageOptions, repos []rpmmd.RepoConfig, - packageSpecs map[string][]rpmmd.PackageSpec, - containers []container.Spec, seed int64) (*manifest.Manifest, []string, error) { warnings, err := t.checkOptions(bp, options) diff --git a/internal/distro/rhel8/distro_test.go b/internal/distro/rhel8/distro_test.go index 3d0b85f87..ed8d16966 100644 --- a/internal/distro/rhel8/distro_test.go +++ b/internal/distro/rhel8/distro_test.go @@ -285,7 +285,7 @@ func TestImageType_BuildPackages(t *testing.T) { if assert.NoErrorf(t, err, "d.GetArch(%v) returned err = %v; expected nil", archLabel, err) { continue } - manifest, _, err := itStruct.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{}, nil, nil, nil, 0) + manifest, _, err := itStruct.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{}, nil, 0) assert.NoError(t, err) buildPkgs := manifest.Content.PackageSets["build"] assert.NotNil(t, buildPkgs) @@ -475,7 +475,7 @@ func TestDistro_ManifestError(t *testing.T) { imgOpts := distro.ImageOptions{ Size: imgType.Size(0), } - _, _, err := imgType.Manifest(&bp, imgOpts, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, imgOpts, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "kernel boot parameter customizations are not supported for ostree types") } else if imgTypeName == "edge-raw-image" { @@ -658,7 +658,7 @@ func TestDistro_CustomFileSystemManifestError(t *testing.T) { arch, _ := r8distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if unsupported[imgTypeName] { @@ -692,7 +692,7 @@ func TestDistro_TestRootMountPoint(t *testing.T) { arch, _ := r8distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if unsupported[imgTypeName] { @@ -732,7 +732,7 @@ func TestDistro_CustomFileSystemSubDirectories(t *testing.T) { arch, _ := r8distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if unsupported[imgTypeName] { assert.Error(t, err) } else { @@ -778,7 +778,7 @@ func TestDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) { arch, _ := r8distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if unsupported[imgTypeName] { assert.Error(t, err) } else { @@ -820,7 +820,7 @@ func TestDistro_DirtyMountpointsNotAllowed(t *testing.T) { arch, _ := r8distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if unsupported[imgTypeName] { assert.Error(t, err) } else { @@ -856,7 +856,7 @@ func TestDistro_CustomFileSystemPatternMatching(t *testing.T) { arch, _ := r8distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if unsupported[imgTypeName] { @@ -890,7 +890,7 @@ func TestDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) { arch, _ := r8distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if unsupported[imgTypeName] { diff --git a/internal/distro/rhel8/imagetype.go b/internal/distro/rhel8/imagetype.go index 94f76d4c4..d5f0a3053 100644 --- a/internal/distro/rhel8/imagetype.go +++ b/internal/distro/rhel8/imagetype.go @@ -186,8 +186,6 @@ func (t *imageType) PartitionType() string { func (t *imageType) Manifest(bp *blueprint.Blueprint, options distro.ImageOptions, repos []rpmmd.RepoConfig, - packageSpecs map[string][]rpmmd.PackageSpec, - containers []container.Spec, seed int64) (*manifest.Manifest, []string, error) { warnings, err := t.checkOptions(bp, options) diff --git a/internal/distro/rhel9/distro_test.go b/internal/distro/rhel9/distro_test.go index 31ffa6c85..588b57a5a 100644 --- a/internal/distro/rhel9/distro_test.go +++ b/internal/distro/rhel9/distro_test.go @@ -270,7 +270,7 @@ func TestImageType_BuildPackages(t *testing.T) { if assert.NoErrorf(t, err, "d.GetArch(%v) returned err = %v; expected nil", archLabel, err) { continue } - manifest, _, err := itStruct.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{}, nil, nil, nil, 0) + manifest, _, err := itStruct.Manifest(&blueprint.Blueprint{}, distro.ImageOptions{}, nil, 0) assert.NoError(t, err) buildPkgs := manifest.Content.PackageSets["build"] assert.NotNil(t, buildPkgs) @@ -458,7 +458,7 @@ func TestDistro_ManifestError(t *testing.T) { imgOpts := distro.ImageOptions{ Size: imgType.Size(0), } - _, _, err := imgType.Manifest(&bp, imgOpts, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, imgOpts, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "kernel boot parameter customizations are not supported for ostree types") } else if imgTypeName == "edge-raw-image" { @@ -631,7 +631,7 @@ func TestDistro_CustomFileSystemManifestError(t *testing.T) { arch, _ := r9distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" { @@ -659,7 +659,7 @@ func TestDistro_TestRootMountPoint(t *testing.T) { arch, _ := r9distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" { @@ -691,7 +691,7 @@ func TestDistro_CustomFileSystemSubDirectories(t *testing.T) { arch, _ := r9distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if strings.HasPrefix(imgTypeName, "edge-") { continue } else { @@ -729,7 +729,7 @@ func TestDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) { arch, _ := r9distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if strings.HasPrefix(imgTypeName, "edge-") { continue } else { @@ -763,7 +763,7 @@ func TestDistro_DirtyMountpointsNotAllowed(t *testing.T) { arch, _ := r9distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if strings.HasPrefix(imgTypeName, "edge-") { continue } else { @@ -793,7 +793,7 @@ func TestDistro_CustomFileSystemPatternMatching(t *testing.T) { arch, _ := r9distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" { @@ -821,7 +821,7 @@ func TestDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) { arch, _ := r9distro.GetArch(archName) for _, imgTypeName := range arch.ListImageTypes() { imgType, _ := arch.GetImageType(imgTypeName) - _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, nil, nil, 0) + _, _, err := imgType.Manifest(&bp, distro.ImageOptions{}, nil, 0) if imgTypeName == "edge-commit" || imgTypeName == "edge-container" { assert.EqualError(t, err, "Custom mountpoints are not supported for ostree types") } else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" || imgTypeName == "edge-raw-image" { diff --git a/internal/distro/rhel9/imagetype.go b/internal/distro/rhel9/imagetype.go index f38a7712b..6a2551e13 100644 --- a/internal/distro/rhel9/imagetype.go +++ b/internal/distro/rhel9/imagetype.go @@ -189,8 +189,6 @@ func (t *imageType) PartitionType() string { func (t *imageType) Manifest(bp *blueprint.Blueprint, options distro.ImageOptions, repos []rpmmd.RepoConfig, - packageSpecs map[string][]rpmmd.PackageSpec, - containers []container.Spec, seed int64) (*manifest.Manifest, []string, error) { warnings, err := t.checkOptions(bp, options) diff --git a/internal/distro/test_distro/distro.go b/internal/distro/test_distro/distro.go index e8ff543aa..5439cf524 100644 --- a/internal/distro/test_distro/distro.go +++ b/internal/distro/test_distro/distro.go @@ -6,7 +6,6 @@ import ( "sort" "github.com/osbuild/osbuild-composer/internal/blueprint" - "github.com/osbuild/osbuild-composer/internal/container" "github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/distroregistry" "github.com/osbuild/osbuild-composer/internal/manifest" @@ -242,7 +241,7 @@ func (t *TestImageType) Exports() []string { return distro.ExportsFallback() } -func (t *TestImageType) Manifest(b *blueprint.Blueprint, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSpecSets map[string][]rpmmd.PackageSpec, containers []container.Spec, seed int64) (*manifest.Manifest, []string, error) { +func (t *TestImageType) Manifest(b *blueprint.Blueprint, options distro.ImageOptions, repos []rpmmd.RepoConfig, seed int64) (*manifest.Manifest, []string, error) { var bpPkgs []string if b != nil { mountpoints := b.Customizations.GetFilesystems() diff --git a/internal/store/fixtures.go b/internal/store/fixtures.go index ef635c4e0..2ad93815d 100644 --- a/internal/store/fixtures.go +++ b/internal/store/fixtures.go @@ -51,7 +51,7 @@ func FixtureBase() *Store { if err != nil { panic(fmt.Sprintf("failed to get image type %s for a test distro architecture: %v", test_distro.TestImageTypeName, err)) } - manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0) + manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, 0) if err != nil { panic(fmt.Sprintf("failed to create a manifest: %v", err)) } @@ -193,7 +193,7 @@ func FixtureFinished() *Store { if err != nil { panic(fmt.Sprintf("failed to get image type %s for a test distro architecture: %v", test_distro.TestImageTypeName, err)) } - manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, nil, nil, 0) + manifest, _, err := imgType.Manifest(nil, distro.ImageOptions{}, nil, 0) if err != nil { panic(fmt.Sprintf("failed to create a manifest: %v", err)) } diff --git a/internal/store/store_test.go b/internal/store/store_test.go index 67b4a0e49..b8f790c43 100644 --- a/internal/store/store_test.go +++ b/internal/store/store_test.go @@ -52,7 +52,7 @@ func (suite *storeTest) SetupSuite() { suite.myDistro = test_distro.New() suite.myArch, _ = suite.myDistro.GetArch(test_distro.TestArchName) suite.myImageType, _ = suite.myArch.GetImageType(test_distro.TestImageTypeName) - manifest, _, _ := suite.myImageType.Manifest(&suite.myBP, suite.myImageOptions, suite.myRepoConfig, nil, nil, 0) + manifest, _, _ := suite.myImageType.Manifest(&suite.myBP, suite.myImageOptions, suite.myRepoConfig, 0) suite.myManifest, _ = manifest.Serialize(nil, nil) suite.mySourceConfig = SourceConfig{ Name: "testSourceConfig", diff --git a/internal/weldr/api.go b/internal/weldr/api.go index 6b39cbe35..6bb2c884f 100644 --- a/internal/weldr/api.go +++ b/internal/weldr/api.go @@ -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", diff --git a/internal/weldr/api_test.go b/internal/weldr/api_test.go index 724bda1c4..d35728a14 100644 --- a/internal/weldr/api_test.go +++ b/internal/weldr/api_test.go @@ -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) diff --git a/internal/weldr/compose_test.go b/internal/weldr/compose_test.go index 513f44542..54cb5418e 100644 --- a/internal/weldr/compose_test.go +++ b/internal/weldr/compose_test.go @@ -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) } diff --git a/internal/worker/server_test.go b/internal/worker/server_test.go index ec2085360..5bd3d8ad5 100644 --- a/internal/worker/server_test.go +++ b/internal/worker/server_test.go @@ -131,7 +131,7 @@ func TestCreate(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) } @@ -160,7 +160,7 @@ func TestCancel(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) } @@ -201,7 +201,7 @@ func TestUpdate(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) } @@ -235,7 +235,7 @@ func TestArgs(t *testing.T) { require.NoError(t, err) imageType, err := arch.GetImageType(test_distro.TestImageTypeName) require.NoError(t, 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) require.NoError(t, err) mf, err := manifest.Serialize(nil, nil) @@ -284,7 +284,7 @@ func TestUpload(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) } @@ -318,7 +318,7 @@ func TestUploadNotAcceptingArtifacts(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) } @@ -352,7 +352,7 @@ func TestUploadAlteredBasePath(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) }