From ae9960b8db31dfcf72d7a52018fef9168bc44c27 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Wed, 27 Apr 2022 18:13:09 +0200
Subject: [PATCH] disk: test that all mountpoints are the minimum 1 GiB

This tests that the clampFSSize() function ensures all user-defined
mountpoints are at least 1 GiB.
Added a blueprint with < 1 GiB minsizes to test this.
Testing all blueprints in TestCreatePartitionTable() now.
---
 internal/disk/disk_test.go | 57 ++++++++++++++++++++++++++++++++------
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/internal/disk/disk_test.go b/internal/disk/disk_test.go
index 8894c01a8..638b4fe81 100644
--- a/internal/disk/disk_test.go
+++ b/internal/disk/disk_test.go
@@ -3,6 +3,7 @@ package disk
 import (
 	"fmt"
 	"math/rand"
+	"strings"
 	"testing"
 
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
@@ -384,6 +385,16 @@ var testBlueprints = map[string][]blueprint.FilesystemCustomization{
 			MinSize:    7 * GiB,
 		},
 	},
+	"small": {
+		{
+			Mountpoint: "/opt",
+			MinSize:    20 * MiB,
+		},
+		{
+			Mountpoint: "/home",
+			MinSize:    500 * MiB,
+		},
+	},
 }
 
 func TestDisk_ForEachEntity(t *testing.T) {
@@ -407,20 +418,48 @@ func TestDisk_ForEachEntity(t *testing.T) {
 
 func TestCreatePartitionTable(t *testing.T) {
 	assert := assert.New(t)
+
+	sizeCheckCB := func(mnt Mountable, path []Entity) error {
+		if strings.HasPrefix(mnt.GetMountpoint(), "/boot") {
+			// /boot and subdirectories is exempt from this rule
+			return nil
+		}
+		// go up the path and check every sizeable
+		for idx, ent := range path {
+			if sz, ok := ent.(Sizeable); ok {
+				size := sz.GetSize()
+				if size < 1*GiB {
+					return fmt.Errorf("entity %d in the path from %s is smaller than the minimum 1 GiB (%d)", idx, mnt.GetMountpoint(), size)
+				}
+			}
+		}
+		return nil
+	}
+
+	sumSizes := func(bp []blueprint.FilesystemCustomization) (sum uint64) {
+		for _, mnt := range bp {
+			sum += mnt.MinSize
+		}
+		return sum
+	}
 	// math/rand is good enough in this case
 	/* #nosec G404 */
 	rng := rand.New(rand.NewSource(13))
-	for name := range testPartitionTables {
-		pt := testPartitionTables[name]
-		mpt, err := NewPartitionTable(&pt, testBlueprints["bp1"], uint64(13*MiB), false, rng)
-		assert.NoError(err, "Partition table generation failed: %s (%s)", name, err)
-		assert.NotNil(mpt, "Partition table generation failed: %s (nil partition table)", name)
-		assert.Greater(mpt.GetSize(), uint64(37*GiB))
+	for ptName := range testPartitionTables {
+		pt := testPartitionTables[ptName]
+		for bpName, bp := range testBlueprints {
+			mpt, err := NewPartitionTable(&pt, bp, uint64(13*MiB), false, rng)
+			assert.NoError(err, "Partition table generation failed: PT %q BP %q (%s)", ptName, bpName, err)
+			assert.NotNil(mpt, "Partition table generation failed: PT %q BP %q (nil partition table)", ptName, bpName)
+			assert.Greater(mpt.GetSize(), sumSizes(bp))
 
-		assert.NotNil(mpt.Type, "Partition table generation failed: %s (nil partition table type)", name)
+			assert.NotNil(mpt.Type, "Partition table generation failed: PT %q BP %q (nil partition table type)", ptName, bpName)
 
-		mnt := pt.FindMountable("/")
-		assert.NotNil(mnt, "Partition table '%s': failed to find root mountable", name)
+			mnt := pt.FindMountable("/")
+			assert.NotNil(mnt, "PT %q BP %q: failed to find root mountable", ptName, bpName)
+
+			assert.NoError(mpt.ForEachMountable(sizeCheckCB))
+		}
 	}
 }