fix: Fix to allow users to configure disk size for finch space

The following parts have been corrected in accordance with the review. - Fix text for ginkgo.It blocks in e2e/vm/additional_disk_test.go - Apply golangci-lint - Add validation finchDiskSize from finch.yaml Signed-off-by: Hayato Kiwata <[email protected]>
runfinch · Dec 14, 2023 · 8c1df1a · 8c1df1a
1 parent 097187a
commit 8c1df1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/e2e/vm/additional_disk_test.go b/e2e/vm/additional_disk_test.go
@@ -56,10 +56,9 @@ var testAdditionalDisk = func(o *option.Option, installed bool) {
 			command.Run(o, "start", containerName)
 			gomega.Expect(command.StdoutStr(o, "exec", containerName, "cat", "/tmp/test.txt")).
 				Should(gomega.Equal("foo"))
-
 		})
 
-		ginkgo.It("finch vm init by the disk size for finch area configured in finchDiskSize of ~/.finch.yaml", func() {
+		ginkgo.It("should correctly configure disk size as specified in finch.yaml", func() {
 			resetVM(o, installed)
 			resetDisks(o, installed)
 			writeFile(finchConfigFilePath, []byte("cpus: 6\nmemory: 4GiB\nvmType: qemu\nrosetta: false\nfinchDiskSize: 3GB"))

diff --git a/pkg/disk/disk.go b/pkg/disk/disk.go
@@ -11,6 +11,7 @@ import (
 	"io/fs"
 	"path"
 
+	"github.com/docker/go-units"
 	limaStore "github.com/lima-vm/lima/pkg/store"
 	"github.com/spf13/afero"
 
@@ -24,10 +25,8 @@ const (
 	diskName = "finch"
 )
 
-var (
-	// the amount of disk size allocated for finch space in the virtual machine.
-	diskSize = "50G"
-)
+// the amount of disk size allocated for finch space in the virtual machine.
+var diskSize = "50G"
 
 // UserDataDiskManager is used to check the user data disk configuration and create it if needed.
 type UserDataDiskManager interface {
@@ -196,6 +195,10 @@ func (m *userDataDiskManager) convertToRaw(diskPath string) error {
 
 func (m *userDataDiskManager) createLimaDisk() error {
 	if m.config.FinchDiskSize != nil {
+		_, err := units.RAMInBytes(*m.config.FinchDiskSize)
+		if err != nil {
+			return err
+		}
 		diskSize = *m.config.FinchDiskSize
 	}
 	cmd := m.lcc.CreateWithoutStdio("disk", "create", diskName, "--size", diskSize, "--format", "raw")