Merge pull request #55 from SLH335/filesystems

feat: choose filesystem type when creating volume

Author: RocketRene

plugin.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -89,6 +90,7 @@ func (d plugin) Create(r *volume.CreateRequest) error {
 
 	// DEFAULT SIZE IN GB
 	var size = 10
+	var filesystem = "ext4"
 	var err error
 
 	if s, ok := r.Options["size"]; ok {
@@ -99,6 +101,15 @@ func (d plugin) Create(r *volume.CreateRequest) error {
 		}
 	}
 
+	if f, ok := r.Options["type"]; ok {
+		f = strings.ToLower(f)
+		if !slices.Contains(filesystems, f) {
+			logger.WithError(err).Error("Error parsing filesystem type option")
+			return fmt.Errorf("Invalid filesystem option: %s", f)
+		}
+		filesystem = f
+	}
+
 	vol, err := volumes.Create(ctx, d.blockClient, volumes.CreateOpts{
 		Size: size,
 		Name: r.Name,
@@ -109,6 +120,35 @@ func (d plugin) Create(r *volume.CreateRequest) error {
 		return err
 	}
 
+	//
+	// Attaching block volume to compute instance
+
+	opts := volumeattach.CreateOpts{VolumeID: vol.ID}
+	_, err = volumeattach.Create(ctx, d.computeClient, d.config.MachineID, opts).Extract()
+
+	if err != nil {
+		logger.WithError(err).Errorf("Error attaching volume: %s", err.Error())
+		return err
+	}
+
+	//
+	// Waiting for device appearance
+
+	dev, err := findDeviceWithTimeout(vol.ID)
+
+	if err != nil {
+		logger.WithError(err).Error("Block device not found")
+		return err
+	}
+
+	logger.WithField("dev", dev).Debug("Found device")
+
+	logger.Debug("Volume is empty, formatting")
+	if err := formatFilesystem(dev, r.Name, filesystem); err != nil {
+		logger.WithError(err).Error("Formatting failed")
+		return err
+	}
+
 	logger.WithField("id", vol.ID).Debug("Volume created")
 
 	return nil
@@ -253,7 +293,7 @@ func (d plugin) Mount(r *volume.MountRequest) (*volume.MountResponse, error) {
 
 	if fsType == "" {
 		logger.Debug("Volume is empty, formatting")
-		if err := formatFilesystem(dev, r.Name); err != nil {
+		if err := formatFilesystem(dev, r.Name, "ext4"); err != nil {
 			logger.WithError(err).Error("Formatting failed")
 			return nil, err
 		}

util.go

@@ -5,9 +5,21 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"slices"
 	"time"
 )
 
+var filesystems []string = []string{
+	"btrfs",
+	"ext2",
+	"ext3",
+	"ext4",
+	"fat",
+	"fat32",
+	"ntfs",
+	"xfs",
+}
+
 func getFilesystemType(dev string) (string, error) {
 	out, err := exec.Command("blkid", "-s", "TYPE", "-o", "value", dev).CombinedOutput()
 
@@ -22,9 +34,13 @@ func getFilesystemType(dev string) (string, error) {
 	return string(out), nil
 }
 
-func formatFilesystem(dev string, label string) error {
-	out, err := exec.Command("mkfs.ext4", "-L", label, dev).CombinedOutput()
+func formatFilesystem(dev, label, filesystem string) error {
+	_, err := exec.LookPath("mkfs." + filesystem)
+	if err != nil || !slices.Contains(filesystems, filesystem) {
+		return errors.New(fmt.Sprintf("filesystem '%s' does not exist", filesystem))
+	}
 
+	out, err := exec.Command(fmt.Sprintf("mkfs.%s", filesystem), "-L", label, dev).CombinedOutput()
 	if err != nil {
 		return errors.New(string(out))
 	}