Remove --rootfs-fs-size flag and FsSizeGB support

Author: dangra

internal/command/machine/run.go

@@ -158,10 +158,6 @@ var sharedFlags = flag.Set{
 		Name:        "rootfs-size",
 		Description: "Root filesystem size in GB. Accepts a plain number (in GB) or a human-readable size (e.g. 2gb, 5gb). Uses an overlayfs to allow the root filesystem to exceed its default size. Set to 0 to unset.",
 	},
-	flag.String{
-		Name:        "rootfs-fs-size",
-		Description: "Root filesystem size in GB. Accepts a plain number (in GB) or a human-readable size (e.g. 2gb, 5gb). Sets the size of the filesystem itself, independent of the rootfs volume size. Set to 0 to unset.",
-	},
 	flag.String{
 		Name:        "swap-size",
 		Description: "Swap size in MB. Accepts a plain number (in MB) or a human-readable size (e.g. 512mb, 1gb).",
@@ -716,7 +712,7 @@ func determineMachineConfig(
 	}
 
 	// Root filesystem persistence and size
-	if flag.IsSpecified(ctx, "rootfs-persist") || flag.IsSpecified(ctx, "rootfs-size") || flag.IsSpecified(ctx, "rootfs-fs-size") {
+	if flag.IsSpecified(ctx, "rootfs-persist") || flag.IsSpecified(ctx, "rootfs-size") {
 		if machineConf.Rootfs == nil {
 			machineConf.Rootfs = &fly.MachineRootfs{}
 		}
@@ -745,24 +741,6 @@ func determineMachineConfig(
 			machineConf.Rootfs.SizeGB = uint64(sizeGB)
 		}
 
-		if flag.IsSpecified(ctx, "rootfs-fs-size") {
-			sizeGB, err := helpers.ParseSize(flag.GetString(ctx, "rootfs-fs-size"), units.RAMInBytes, units.GiB)
-			if err != nil {
-				return machineConf, fmt.Errorf("invalid rootfs fs size: %w", err)
-			}
-			if sizeGB < 0 {
-				return machineConf, fmt.Errorf("--rootfs-fs-size must not be negative")
-			}
-			machineConf.Rootfs.FsSizeGB = uint64(sizeGB)
-		}
-
-		if machineConf.Rootfs.FsSizeGB > 0 {
-			if machineConf.Rootfs.SizeGB == 0 {
-				machineConf.Rootfs.SizeGB = machineConf.Rootfs.FsSizeGB
-			} else if machineConf.Rootfs.FsSizeGB > machineConf.Rootfs.SizeGB {
-				return machineConf, fmt.Errorf("--rootfs-fs-size must be smaller than or equal to --rootfs-size")
-			}
-		}
 	}
 
 	if flag.IsSpecified(ctx, "swap-size") {

test/preflight/fly_machine_test.go

@@ -127,51 +127,24 @@ func TestFlyMachineRun_standbyFor(t *testing.T) {
 	require.Equal(f, []string{s1.ID}, s2.Config.Standbys)
 }
 
-// test --rootfs-size and --rootfs-fs-size flags
+// test --rootfs-size flag
 func TestFlyMachineRun_rootfsSize(t *testing.T) {
 	f := testlib.NewTestEnvFromEnv(t)
 	appName := f.CreateRandomAppMachines()
 
-	// Run with --rootfs-size only
+	// Run with --rootfs-size
 	f.Fly("machine run -a %s nginx --rootfs-size 5 --region %s", appName, f.PrimaryRegion())
 	ml := f.MachinesList(appName)
 	require.Equal(f, 1, len(ml))
 	m := ml[0]
 	require.NotNil(f, m.Config.Rootfs)
 	require.Equal(f, uint64(5), m.Config.Rootfs.SizeGB)
-	require.Equal(f, uint64(0), m.Config.Rootfs.FsSizeGB)
-
-	// Update with --rootfs-fs-size, must be <= rootfs-size
-	f.Fly("machine update -a %s %s --rootfs-fs-size 3 -y", appName, m.ID)
-	m = f.MachinesList(appName)[0]
-	require.NotNil(f, m.Config.Rootfs)
-	require.Equal(f, uint64(5), m.Config.Rootfs.SizeGB)
-	require.Equal(f, uint64(3), m.Config.Rootfs.FsSizeGB)
 
 	// Update with human-readable size
 	f.Fly("machine update -a %s %s --rootfs-size 10gb -y", appName, m.ID)
 	m = f.MachinesList(appName)[0]
 	require.NotNil(f, m.Config.Rootfs)
 	require.Equal(f, uint64(10), m.Config.Rootfs.SizeGB)
-
-	// Run with --rootfs-fs-size only, should default rootfs-size to match
-	f.Fly("machine run -a %s nginx --rootfs-fs-size 4 --region %s", appName, f.PrimaryRegion())
-	ml = f.MachinesList(appName)
-	require.Equal(f, 2, len(ml))
-	m = ml[1]
-	require.NotNil(f, m.Config.Rootfs)
-	require.Equal(f, uint64(4), m.Config.Rootfs.SizeGB)
-	require.Equal(f, uint64(4), m.Config.Rootfs.FsSizeGB)
-
-	// Unset rootfs-fs-size by passing 0
-	f.Fly("machine update -a %s %s --rootfs-fs-size 0 -y", appName, m.ID)
-	m = f.MachinesList(appName)[1]
-	require.NotNil(f, m.Config.Rootfs)
-	require.Equal(f, uint64(0), m.Config.Rootfs.FsSizeGB)
-
-	// Error: rootfs-fs-size > rootfs-size
-	result := f.FlyAllowExitFailure("machine run -a %s nginx --rootfs-size 2 --rootfs-fs-size 5 --region %s", appName, f.PrimaryRegion())
-	require.NotEqual(f, 0, result.ExitCode())
 }
 
 // test --port (add, update, remove services and ports)