pkg: use new datasizes package

This commit uses the new `datasizes` package. Its a very boring
commit.

cmd/osbuild-playground/playground.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/osbuild/images/internal/common"
+	"github.com/osbuild/images/pkg/datasizes"
 	"github.com/osbuild/images/pkg/distro"
 	"github.com/osbuild/images/pkg/dnfjson"
 	"github.com/osbuild/images/pkg/image"
@@ -22,7 +22,7 @@ func RunPlayground(img image.ImageKind, d distro.Distro, arch distro.Arch, repos
 	solver := dnfjson.NewSolver(d.ModulePlatformID(), d.Releasever(), arch.Name(), d.Name(), path.Join(state_dir, "rpmmd"))
 
 	// Set cache size to 1 GiB
-	solver.SetMaxCacheSize(1 * common.GiB)
+	solver.SetMaxCacheSize(1 * datasizes.GiB)
 
 	manifest := manifest.New()
 

cmd/otk/osbuild-gen-partition-table/main.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/osbuild/images/internal/buildconfig"
 	"github.com/osbuild/images/internal/cmdutil"
-	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/internal/otkdisk"
 	"github.com/osbuild/images/pkg/blueprint"
+	"github.com/osbuild/images/pkg/datasizes"
 	"github.com/osbuild/images/pkg/disk"
 	"github.com/osbuild/images/pkg/osbuild"
 )
@@ -120,7 +120,7 @@ func makePartitionTableFromOtkInput(input *Input) (*disk.PartitionTable, error)
 
 	var startOffset uint64
 	if input.Properties.StartOffset != "" {
-		startOffset, err = common.DataSizeToUint64(input.Properties.StartOffset)
+		startOffset, err = datasizes.Parse(input.Properties.StartOffset)
 		if err != nil {
 			return nil, err
 		}
@@ -137,7 +137,7 @@ func makePartitionTableFromOtkInput(input *Input) (*disk.PartitionTable, error)
 			return nil, fmt.Errorf("internal error: bios partition *must* go first")
 		}
 		pt.Partitions = append(pt.Partitions, disk.Partition{
-			Size:     1 * common.MebiByte,
+			Size:     1 * datasizes.MebiByte,
 			Bootable: true,
 			Type:     disk.BIOSBootPartitionGUID,
 			UUID:     disk.BIOSBootPartitionUUID,
@@ -148,7 +148,7 @@ func makePartitionTableFromOtkInput(input *Input) (*disk.PartitionTable, error)
 		if size == "" {
 			size = "1 GiB"
 		}
-		uintSize, err := common.DataSizeToUint64(size)
+		uintSize, err := datasizes.Parse(size)
 		if err != nil {
 			return nil, err
 		}
@@ -180,7 +180,7 @@ func makePartitionTableFromOtkInput(input *Input) (*disk.PartitionTable, error)
 	}
 
 	for _, part := range input.Partitions {
-		uintSize, err := common.DataSizeToUint64(part.Size)
+		uintSize, err := datasizes.Parse(part.Size)
 		if err != nil {
 			return nil, err
 		}
@@ -212,13 +212,13 @@ func getDiskSizeFrom(input *Input) (diskSize uint64, err error) {
 	var defaultSize, modMinSize uint64
 
 	if input.Properties.DefaultSize != "" {
-		defaultSize, err = common.DataSizeToUint64(input.Properties.DefaultSize)
+		defaultSize, err = datasizes.Parse(input.Properties.DefaultSize)
 		if err != nil {
 			return 0, err
 		}
 	}
 	if input.Modifications.MinDiskSize != "" {
-		modMinSize, err = common.DataSizeToUint64(input.Modifications.MinDiskSize)
+		modMinSize, err = datasizes.Parse(input.Modifications.MinDiskSize)
 		if err != nil {
 			return 0, err
 		}

cmd/otk/osbuild-gen-partition-table/main_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	genpart "github.com/osbuild/images/cmd/otk/osbuild-gen-partition-table"
-	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/internal/otkdisk"
 	"github.com/osbuild/images/pkg/blueprint"
+	"github.com/osbuild/images/pkg/datasizes"
 	"github.com/osbuild/images/pkg/disk"
 )
 
@@ -465,7 +465,7 @@ func TestGenPartitionTableCustomizationExtraMp(t *testing.T) {
 			Filesystems: []blueprint.FilesystemCustomization{
 				{
 					Mountpoint: "/var/log",
-					MinSize:    3 * common.GigaByte,
+					MinSize:    3 * datasizes.GigaByte,
 				},
 			},
 		},
@@ -554,7 +554,7 @@ func TestGenPartitionTableCustomizationExtraMpPlusModificationPartitionMode(t *t
 			Filesystems: []blueprint.FilesystemCustomization{
 				{
 					Mountpoint: "/var/log",
-					MinSize:    3 * common.GigaByte,
+					MinSize:    3 * datasizes.GigaByte,
 				},
 			},
 		},

cmd/otk/osbuild-make-grub2-inst-stage/main_test.go

@@ -8,23 +8,23 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	makeGrub2Inst "github.com/osbuild/images/cmd/otk/osbuild-make-grub2-inst-stage"
-	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/internal/otkdisk"
+	"github.com/osbuild/images/pkg/datasizes"
 	"github.com/osbuild/images/pkg/disk"
 )
 
 var fakePt = &disk.PartitionTable{
 	Type: "gpt",
 	Partitions: []disk.Partition{
 		{
-			Size:     1 * common.MiB,
-			Start:    1 * common.MiB,
+			Size:     1 * datasizes.MiB,
+			Start:    1 * datasizes.MiB,
 			Bootable: true,
 			Type:     disk.BIOSBootPartitionGUID,
 			UUID:     disk.BIOSBootPartitionUUID,
 		},
 		{
-			Size: 1 * common.GiB,
+			Size: 1 * datasizes.GiB,
 			Payload: &disk.Filesystem{
 				Type:       "ext4",
 				Mountpoint: "/",

internal/common/constants.go

@@ -1,6 +1,8 @@
 package common
 
-import "fmt"
+import (
+	"fmt"
+)
 
 // These constants are set during buildtime using additional
 // compiler flags. Not all of them are necessarily defined

internal/testdisk/partition.go

@@ -1,11 +1,11 @@
 package testdisk
 
 import (
-	"github.com/osbuild/images/internal/common"
+	"github.com/osbuild/images/pkg/datasizes"
 	"github.com/osbuild/images/pkg/disk"
 )
 
-const FakePartitionSize = uint64(789) * common.MiB
+const FakePartitionSize = uint64(789) * datasizes.MiB
 
 // MakeFakePartitionTable is a helper to create partition table structs
 // for tests. It uses sensible defaults for common scenarios.
@@ -43,7 +43,7 @@ func MakeFakeBtrfsPartitionTable(mntPoints ...string) *disk.PartitionTable {
 	var subvolumes []disk.BtrfsSubvolume
 	pt := &disk.PartitionTable{
 		Type:       "gpt",
-		Size:       10 * common.GiB,
+		Size:       10 * datasizes.GiB,
 		Partitions: []disk.Partition{},
 	}
 	size := uint64(0)
@@ -52,24 +52,24 @@ func MakeFakeBtrfsPartitionTable(mntPoints ...string) *disk.PartitionTable {
 		case "/boot":
 			pt.Partitions = append(pt.Partitions, disk.Partition{
 				Start: size,
-				Size:  1 * common.GiB,
+				Size:  1 * datasizes.GiB,
 				Payload: &disk.Filesystem{
 					Type:       "ext4",
 					Mountpoint: mntPoint,
 				},
 			})
-			size += 1 * common.GiB
+			size += 1 * datasizes.GiB
 		case "/boot/efi":
 			pt.Partitions = append(pt.Partitions, disk.Partition{
 				Start: size,
-				Size:  100 * common.MiB,
+				Size:  100 * datasizes.MiB,
 				Payload: &disk.Filesystem{
 					Type:       "vfat",
 					Mountpoint: mntPoint,
 					UUID:       disk.EFIFilesystemUUID,
 				},
 			})
-			size += 100 * common.MiB
+			size += 100 * datasizes.MiB
 		default:
 			name := mntPoint
 			if name == "/" {
@@ -89,14 +89,14 @@ func MakeFakeBtrfsPartitionTable(mntPoints ...string) *disk.PartitionTable {
 
 	pt.Partitions = append(pt.Partitions, disk.Partition{
 		Start: size,
-		Size:  9 * common.GiB,
+		Size:  9 * datasizes.GiB,
 		Payload: &disk.Btrfs{
 			UUID:       disk.RootPartitionUUID,
 			Subvolumes: subvolumes,
 		},
 	})
 
-	size += 9 * common.GiB
+	size += 9 * datasizes.GiB
 	pt.Size = size
 
 	return pt
@@ -108,7 +108,7 @@ func MakeFakeLVMPartitionTable(mntPoints ...string) *disk.PartitionTable {
 	var lvs []disk.LVMLogicalVolume
 	pt := &disk.PartitionTable{
 		Type:       "gpt",
-		Size:       10 * common.GiB,
+		Size:       10 * datasizes.GiB,
 		Partitions: []disk.Partition{},
 	}
 	size := uint64(0)
@@ -117,24 +117,24 @@ func MakeFakeLVMPartitionTable(mntPoints ...string) *disk.PartitionTable {
 		case "/boot":
 			pt.Partitions = append(pt.Partitions, disk.Partition{
 				Start: size,
-				Size:  1 * common.GiB,
+				Size:  1 * datasizes.GiB,
 				Payload: &disk.Filesystem{
 					Type:       "ext4",
 					Mountpoint: mntPoint,
 				},
 			})
-			size += 1 * common.GiB
+			size += 1 * datasizes.GiB
 		case "/boot/efi":
 			pt.Partitions = append(pt.Partitions, disk.Partition{
 				Start: size,
-				Size:  100 * common.MiB,
+				Size:  100 * datasizes.MiB,
 				Payload: &disk.Filesystem{
 					Type:       "vfat",
 					Mountpoint: mntPoint,
 					UUID:       disk.EFIFilesystemUUID,
 				},
 			})
-			size += 100 * common.MiB
+			size += 100 * datasizes.MiB
 		default:
 			name := "lv-for-" + mntPoint
 			if name == "/" {
@@ -155,13 +155,13 @@ func MakeFakeLVMPartitionTable(mntPoints ...string) *disk.PartitionTable {
 
 	pt.Partitions = append(pt.Partitions, disk.Partition{
 		Start: size,
-		Size:  9 * common.GiB,
+		Size:  9 * datasizes.GiB,
 		Payload: &disk.LVMVolumeGroup{
 			LogicalVolumes: lvs,
 		},
 	})
 
-	size += 9 * common.GiB
+	size += 9 * datasizes.GiB
 	pt.Size = size
 
 	return pt

pkg/blueprint/blueprint_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osbuild/images/internal/common"
+	"github.com/osbuild/images/pkg/datasizes"
 )
 
 func TestBlueprintParse(t *testing.T) {
@@ -67,7 +67,7 @@ minsize = "20 GiB"
 	assert.Equal(t, "/var", bp.Customizations.Filesystem[0].Mountpoint)
 	assert.Equal(t, uint64(2147483648), bp.Customizations.Filesystem[0].MinSize)
 	assert.Equal(t, "/opt", bp.Customizations.Filesystem[1].Mountpoint)
-	assert.Equal(t, uint64(20*common.GiB), bp.Customizations.Filesystem[1].MinSize)
+	assert.Equal(t, uint64(20*datasizes.GiB), bp.Customizations.Filesystem[1].MinSize)
 }
 
 func TestGetPackages(t *testing.T) {

pkg/blueprint/filesystem_customizations.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/osbuild/images/internal/common"
+	"github.com/osbuild/images/pkg/datasizes"
 	"github.com/osbuild/images/pkg/pathpolicy"
 )
 
@@ -32,7 +32,7 @@ func (fsc *FilesystemCustomization) UnmarshalTOML(data interface{}) error {
 		}
 		fsc.MinSize = uint64(minSize)
 	case string:
-		minSize, err := common.DataSizeToUint64(d["minsize"].(string))
+		minSize, err := datasizes.Parse(d["minsize"].(string))
 		if err != nil {
 			return fmt.Errorf("TOML unmarshal: minsize is not valid filesystem size (%w)", err)
 		}
@@ -63,7 +63,7 @@ func (fsc *FilesystemCustomization) UnmarshalJSON(data []byte) error {
 	case float64:
 		fsc.MinSize = uint64(d["minsize"].(float64))
 	case string:
-		minSize, err := common.DataSizeToUint64(d["minsize"].(string))
+		minSize, err := datasizes.Parse(d["minsize"].(string))
 		if err != nil {
 			return fmt.Errorf("JSON unmarshal: minsize is not valid filesystem size (%w)", err)
 		}

pkg/disk/disk_test.go

@@ -9,14 +9,14 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/pkg/blueprint"
+	"github.com/osbuild/images/pkg/datasizes"
 )
 
 const (
-	KiB = common.KiB
-	MiB = common.MiB
-	GiB = common.GiB
+	KiB = datasizes.KiB
+	MiB = datasizes.MiB
+	GiB = datasizes.GiB
 )
 
 func TestDisk_AlignUp(t *testing.T) {

pkg/disk/luks.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/osbuild/images/internal/common"
+	"github.com/osbuild/images/pkg/datasizes"
 )
 
 // Argon2id defines parameters for the key derivation function for LUKS.
@@ -116,7 +116,7 @@ func (lc *LUKSContainer) MetadataSize() uint64 {
 	}
 
 	// 16 MiB is the default size for the LUKS2 header
-	return 16 * common.MiB
+	return 16 * datasizes.MiB
 }
 
 func (lc *LUKSContainer) minSize(size uint64) uint64 {

pkg/disk/lvm.go

@@ -5,12 +5,12 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/osbuild/images/internal/common"
+	"github.com/osbuild/images/pkg/datasizes"
 )
 
 // Default physical extent size in bytes: logical volumes
 // created inside the VG will be aligned to this.
-const LVMDefaultExtentSize = 4 * common.MebiByte
+const LVMDefaultExtentSize = 4 * datasizes.MebiByte
 
 type LVMVolumeGroup struct {
 	Name        string
@@ -143,7 +143,7 @@ func (vg *LVMVolumeGroup) MetadataSize() uint64 {
 	// of the metadata and its location and thus the start of the physical
 	// extent. For now we assume the default which results in a start of
 	// the physical extent 1 MiB
-	return 1 * common.MiB
+	return 1 * datasizes.MiB
 }
 
 func (vg *LVMVolumeGroup) minSize(size uint64) uint64 {