main: update for v0.177 API changes

This includes:
- disk.ParitioningMode->parition.PartitioningMode
- anaconda.AdditionalModules -> anaconda.EnabledModules
- use of new InstallerCustomizations
- aws uploader needs arch.Arch

Author: mvo5

bib/cmd/bootc-image-builder/image.go

@@ -19,6 +19,7 @@ import (
 	"github.com/osbuild/images/pkg/customizations/kickstart"
 	"github.com/osbuild/images/pkg/customizations/users"
 	"github.com/osbuild/images/pkg/disk"
+	"github.com/osbuild/images/pkg/disk/partition"
 	"github.com/osbuild/images/pkg/image"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/osbuild"
@@ -132,10 +133,10 @@ func checkMountpoints(filesystems []blueprint.FilesystemCustomization, policy *p
 	return nil
 }
 
-func checkFilesystemCustomizations(fsCustomizations []blueprint.FilesystemCustomization, ptmode disk.PartitioningMode) error {
+func checkFilesystemCustomizations(fsCustomizations []blueprint.FilesystemCustomization, ptmode partition.PartitioningMode) error {
 	var policy *pathpolicy.PathPolicies
 	switch ptmode {
-	case disk.BtrfsPartitioningMode:
+	case partition.BtrfsPartitioningMode:
 		// btrfs subvolumes are not supported at build time yet, so we only
 		// allow / and /boot to be customized when building a btrfs disk (the
 		// minimal policy)
@@ -327,9 +328,9 @@ func genPartitionTableFsCust(c *ManifestConfig, fsCust []blueprint.FilesystemCus
 		return nil, fmt.Errorf("pipelines: no partition tables defined for %s", c.Architecture)
 	}
 
-	partitioningMode := disk.RawPartitioningMode
+	partitioningMode := partition.RawPartitioningMode
 	if c.RootFSType == "btrfs" {
-		partitioningMode = disk.BtrfsPartitioningMode
+		partitioningMode = partition.BtrfsPartitioningMode
 	}
 	if err := checkFilesystemCustomizations(fsCust, partitioningMode); err != nil {
 		return nil, err
@@ -523,7 +524,7 @@ func manifestForISO(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest, erro
 	if c.Config != nil {
 		customizations = c.Config.Customizations
 	}
-	img.FIPS = customizations.GetFIPS()
+	img.InstallerCustomizations.FIPS = customizations.GetFIPS()
 	img.Kickstart, err = kickstart.New(customizations)
 	if err != nil {
 		return nil, err
@@ -539,10 +540,10 @@ func manifestForISO(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest, erro
 		return nil, err
 	}
 	if instCust != nil && instCust.Modules != nil {
-		img.AdditionalAnacondaModules = append(img.AdditionalAnacondaModules, instCust.Modules.Enable...)
-		img.DisabledAnacondaModules = append(img.DisabledAnacondaModules, instCust.Modules.Disable...)
+		img.InstallerCustomizations.EnabledAnacondaModules = append(img.InstallerCustomizations.EnabledAnacondaModules, instCust.Modules.Enable...)
+		img.InstallerCustomizations.DisabledAnacondaModules = append(img.InstallerCustomizations.DisabledAnacondaModules, instCust.Modules.Disable...)
 	}
-	img.AdditionalAnacondaModules = append(img.AdditionalAnacondaModules,
+	img.InstallerCustomizations.EnabledAnacondaModules = append(img.InstallerCustomizations.EnabledAnacondaModules,
 		anaconda.ModuleUsers,
 		anaconda.ModuleServices,
 		anaconda.ModuleSecurity,
@@ -551,7 +552,7 @@ func manifestForISO(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest, erro
 	img.Kickstart.OSTree = &kickstart.OSTree{
 		OSName: "default",
 	}
-	img.UseRHELLoraxTemplates = needsRHELLoraxTemplates(c.SourceInfo.OSRelease)
+	img.InstallerCustomizations.UseRHELLoraxTemplates = needsRHELLoraxTemplates(c.SourceInfo.OSRelease)
 
 	switch c.Architecture {
 	case arch.ARCH_X86_64:
@@ -562,7 +563,7 @@ func manifestForISO(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest, erro
 			BIOS:       true,
 			UEFIVendor: c.SourceInfo.UEFIVendor,
 		}
-		img.ISOBoot = manifest.Grub2ISOBoot
+		img.InstallerCustomizations.ISOBoot = manifest.Grub2ISOBoot
 	case arch.ARCH_AARCH64:
 		// aarch64 always uses UEFI, so let's enforce the vendor
 		if c.SourceInfo.UEFIVendor == "" {
@@ -599,7 +600,7 @@ func manifestForISO(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest, erro
 		return nil, fmt.Errorf("unsupported architecture %v", c.Architecture)
 	}
 	// see https://github.com/osbuild/bootc-image-builder/issues/733
-	img.RootfsType = manifest.SquashfsRootfs
+	img.InstallerCustomizations.ISORootfsType = manifest.SquashfsRootfs
 	img.Filename = "install.iso"
 
 	installRootfsType, err := disk.NewFSType(c.RootFSType)

bib/cmd/bootc-image-builder/image_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/osbuild/images/pkg/arch"
 	"github.com/osbuild/images/pkg/datasizes"
 	"github.com/osbuild/images/pkg/disk"
+	"github.com/osbuild/images/pkg/disk/partition"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/runner"
 
@@ -64,7 +65,7 @@ func TestGetDistroAndRunner(t *testing.T) {
 func TestCheckFilesystemCustomizationsValidates(t *testing.T) {
 	for _, tc := range []struct {
 		fsCust      []blueprint.FilesystemCustomization
-		ptmode      disk.PartitioningMode
+		ptmode      partition.PartitioningMode
 		expectedErr string
 	}{
 		// happy
@@ -74,21 +75,21 @@ func TestCheckFilesystemCustomizationsValidates(t *testing.T) {
 		},
 		{
 			fsCust:      []blueprint.FilesystemCustomization{},
-			ptmode:      disk.BtrfsPartitioningMode,
+			ptmode:      partition.BtrfsPartitioningMode,
 			expectedErr: "",
 		},
 		{
 			fsCust: []blueprint.FilesystemCustomization{
 				{Mountpoint: "/"}, {Mountpoint: "/boot"},
 			},
-			ptmode:      disk.RawPartitioningMode,
+			ptmode:      partition.RawPartitioningMode,
 			expectedErr: "",
 		},
 		{
 			fsCust: []blueprint.FilesystemCustomization{
 				{Mountpoint: "/"}, {Mountpoint: "/boot"},
 			},
-			ptmode:      disk.BtrfsPartitioningMode,
+			ptmode:      partition.BtrfsPartitioningMode,
 			expectedErr: "",
 		},
 		{
@@ -106,31 +107,31 @@ func TestCheckFilesystemCustomizationsValidates(t *testing.T) {
 				{Mountpoint: "/"},
 				{Mountpoint: "/ostree"},
 			},
-			ptmode:      disk.RawPartitioningMode,
+			ptmode:      partition.RawPartitioningMode,
 			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/ostree\" is not allowed",
 		},
 		{
 			fsCust: []blueprint.FilesystemCustomization{
 				{Mountpoint: "/"},
 				{Mountpoint: "/var"},
 			},
-			ptmode:      disk.RawPartitioningMode,
+			ptmode:      partition.RawPartitioningMode,
 			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/var\" is not allowed",
 		},
 		{
 			fsCust: []blueprint.FilesystemCustomization{
 				{Mountpoint: "/"},
 				{Mountpoint: "/var/data"},
 			},
-			ptmode:      disk.BtrfsPartitioningMode,
+			ptmode:      partition.BtrfsPartitioningMode,
 			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/var/data\" is not allowed",
 		},
 		{
 			fsCust: []blueprint.FilesystemCustomization{
 				{Mountpoint: "/"},
 				{Mountpoint: "/boot/"},
 			},
-			ptmode:      disk.BtrfsPartitioningMode,
+			ptmode:      partition.BtrfsPartitioningMode,
 			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/boot/\" must be canonical",
 		},
 		{
@@ -139,7 +140,7 @@ func TestCheckFilesystemCustomizationsValidates(t *testing.T) {
 				{Mountpoint: "/boot/"},
 				{Mountpoint: "/opt"},
 			},
-			ptmode:      disk.BtrfsPartitioningMode,
+			ptmode:      partition.BtrfsPartitioningMode,
 			expectedErr: "the following errors occurred while validating custom mountpoints:\npath \"/boot/\" must be canonical\npath \"/opt\" is not allowed",
 		},
 	} {
@@ -202,7 +203,7 @@ func TestLocalMountpointPolicy(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.path, func(t *testing.T) {
-			err := bib.CheckFilesystemCustomizations([]blueprint.FilesystemCustomization{{Mountpoint: tc.path}}, disk.RawPartitioningMode)
+			err := bib.CheckFilesystemCustomizations([]blueprint.FilesystemCustomization{{Mountpoint: tc.path}}, partition.RawPartitioningMode)
 			if err != nil && tc.allowed {
 				t.Errorf("expected %s to be allowed, but got error: %v", tc.path, err)
 			} else if err == nil && !tc.allowed {

bib/cmd/bootc-image-builder/main.go

@@ -379,13 +379,17 @@ func handleAWSFlags(cmd *cobra.Command) (cloud.Uploader, error) {
 	}
 	bucketName, _ := cmd.Flags().GetString("aws-bucket")
 	imageName, _ := cmd.Flags().GetString("aws-ami-name")
-	targetArch, _ := cmd.Flags().GetString("target-arch")
+	targetArchStr, _ := cmd.Flags().GetString("target-arch")
 
 	if !slices.Contains(imgTypes, "ami") {
 		return nil, fmt.Errorf("aws flags set for non-ami image type (type is set to %s)", strings.Join(imgTypes, ","))
 	}
 
 	// check as many permission prerequisites as possible before starting
+	targetArch, err := arch.FromString(targetArchStr)
+	if err != nil {
+		return nil, err
+	}
 	uploaderOpts := &awscloud.UploaderOptions{
 		TargetArch: targetArch,
 	}