(feat): Improve backend validation for resize

reecetech · Nov 26, 2023 · 6fe11fb · 6fe11fb
1 parent 351f315
commit 6fe11fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/configs/ubuntu.yml b/configs/ubuntu.yml
@@ -9,5 +9,4 @@ devices:
     group: ubuntu
     user: ubuntu
     permissions: 644
-    remount: true
     resizeFs: true
diff --git a/internal/backend/resize.go b/internal/backend/resize.go
@@ -86,6 +86,12 @@ func (dmb *LinuxDeviceResizeBackend) From(config *config.Config) error {
 		if err != nil {
 			return err
 		}
+		dmb.blockDevices[bd.Name] = bd
+		// Can not fetch file system metrics from a device with
+		// no file system. Therefore, we continue if this is the case
+		if bd.FileSystem == model.Unformatted {
+			continue
+		}
 		fs, err := dmb.fileSystemServiceFactory.Select(bd.FileSystem)
 		if err != nil {
 			return err
@@ -100,7 +106,6 @@ func (dmb *LinuxDeviceResizeBackend) From(config *config.Config) error {
 		if err != nil {
 			return err
 		}
-		dmb.blockDevices[bd.Name] = bd
 		dmb.blockDeviceMetrics[bd.Name] = &BlockDeviceMetrics{
 			BlockDeviceSize: bss,
 			FileSystemSize:  fss,

diff --git a/internal/layer/resize.go b/internal/layer/resize.go
@@ -7,6 +7,7 @@ import (
 	"github.com/reecetech/ebs-bootstrap/internal/action"
 	"github.com/reecetech/ebs-bootstrap/internal/backend"
 	"github.com/reecetech/ebs-bootstrap/internal/config"
+	"github.com/reecetech/ebs-bootstrap/internal/model"
 )
 
 type ResizeDeviceLayer struct {
@@ -33,6 +34,9 @@ func (fdl *ResizeDeviceLayer) Modify(c *config.Config) ([]action.Action, error)
 		if err != nil {
 			return nil, err
 		}
+		if bd.FileSystem == model.Unformatted {
+			return nil, fmt.Errorf("🔴 %s: Can not resize a device with no file system", bd.Name)
+		}
 		metrics, err := fdl.deviceResizeBackend.GetBlockDeviceMetrics(name)
 		if err != nil {
 			return nil, err