prevent equivalent disk_size values from causing cluster replacement

Author: scott-the-programmer

minikube/generator/schema_builder.go

@@ -60,8 +60,15 @@ var schemaOverrides map[string]SchemaOverride = map[string]SchemaOverride{
 		Default:          "4g",
 		Description:      "Amount of RAM to allocate to Kubernetes (format: <number>[<unit>(case-insensitive)], where unit = b, k, kb, m, mb, g or gb)",
 		Type:             String,
-		StateFunc:        "state_utils.MemoryConverter()",
-		ValidateDiagFunc: "state_utils.MemoryValidator()",
+		StateFunc:        "state_utils.ResourceSizeConverter()",
+		ValidateDiagFunc: "state_utils.ResourceSizeValidator()",
+	},
+	"disk_size": {
+		Default:     "20000mb",
+		Description: "Disk size allocated to the minikube VM (format: <number>[<unit>(case-insensitive)], where unit = b, k, kb, m, mb, g or gb)",
+		Type:        String,
+		//StateFunc:        "state_utils.ResourceSizeConverter()",
+		//ValidateDiagFunc: "state_utils.ResourceSizeValidator()",
 	},
 	"cpus": {
 		Default:     "2",

minikube/generator/schema_builder_test.go

@@ -366,8 +366,8 @@ func TestOverride(t *testing.T) {
 			ForceNew:			true,
 			
 			Default:	"4g",
-			StateFunc:	state_utils.MemoryConverter(),
-			ValidateDiagFunc:	state_utils.MemoryValidator(),
+			StateFunc:	state_utils.ResourceSizeConverter(),
+			ValidateDiagFunc:	state_utils.ResourceSizeValidator(),
 		},
 	
 	}

minikube/resource_cluster_test.go

@@ -571,6 +571,8 @@ func testUnitClusterConfig_Update(driver string, clusterName string) string {
 			"ingress",
 			"storage-provisioner",
 		]
+
+		disk_size = "20g"
 	}
 	`, driver, clusterName)
 }

minikube/schema_cluster.go

@@ -252,12 +252,14 @@ var (
 
 		"disk_size": {
 			Type:					schema.TypeString,
-			Description:	"Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g).",
+			Description:	"Disk size allocated to the minikube VM (format: <number>[<unit>(case-insensitive)], where unit = b, k, kb, m, mb, g or gb)",
 
 			Optional:			true,
 			ForceNew:			true,
 
 			Default:	"20000mb",
+			StateFunc:	state_utils.ResourceSizeConverter(),
+			ValidateDiagFunc:	state_utils.ResourceSizeValidator(),
 		},
 
 		"dns_domain": {
@@ -672,8 +674,8 @@ var (
 			ForceNew:			true,
 
 			Default:	"4g",
-			StateFunc:	state_utils.MemoryConverter(),
-			ValidateDiagFunc:	state_utils.MemoryValidator(),
+			StateFunc:	state_utils.ResourceSizeConverter(),
+			ValidateDiagFunc:	state_utils.ResourceSizeValidator(),
 		},
 
 		"mount": {

minikube/state_utils/memory.go

@@ -0,0 +1,43 @@
+package state_utils
+
+import (
+	"errors"
+	"strconv"
+
+	"github.com/hashicorp/go-cty/cty"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	pkgutil "k8s.io/minikube/pkg/util"
+)
+
+func ResourceSizeConverter() schema.SchemaStateFunc {
+	return func(val interface{}) string {
+		size, ok := val.(string)
+		if !ok {
+			panic(errors.New("resource size is not a string"))
+		}
+		sizeMb, err := pkgutil.CalculateSizeInMB(size)
+		if err != nil {
+			panic(errors.New("invalid resource size value"))
+		}
+
+		return strconv.Itoa(sizeMb) + "mb"
+	}
+}
+
+func ResourceSizeValidator() schema.SchemaValidateDiagFunc {
+	return schema.SchemaValidateDiagFunc(func(val interface{}, path cty.Path) diag.Diagnostics {
+		size, ok := val.(string)
+		if !ok {
+			diag := diag.FromErr(errors.New("resource size is not a string"))
+			return diag
+		}
+		_, err := pkgutil.CalculateSizeInMB(size)
+		if err != nil {
+			diag := diag.FromErr(errors.New("invalid resource size value"))
+			return diag
+		}
+		return nil
+	})
+}

minikube/state_utils/resource_size.go

@@ -7,15 +7,15 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestMemoryConverter(t *testing.T) {
-	converter := MemoryConverter()
+func TestResourceSizeConverter(t *testing.T) {
+	converter := ResourceSizeConverter()
 
-	t.Run("ValidMemoryFlagG", func(t *testing.T) {
+	t.Run("ValidSizeFlagG", func(t *testing.T) {
 		result := converter("2G")
 		assert.Equal(t, "2048mb", result)
 	})
 
-	t.Run("ValidMemoryFlagGb", func(t *testing.T) {
+	t.Run("ValidSizeFlagGb", func(t *testing.T) {
 		result := converter("2Gb")
 		assert.Equal(t, "2048mb", result)
 	})
@@ -26,37 +26,36 @@ func TestMemoryConverter(t *testing.T) {
 		assert.Equal(t, resultm, resultg)
 	})
 
-	t.Run("InvalidMemoryFlag", func(t *testing.T) {
-		assert.PanicsWithError(t, "memory flag is not a string", func() {
+	t.Run("InvalidSizeFlag", func(t *testing.T) {
+		assert.PanicsWithError(t, "resource size is not a string", func() {
 			converter(123)
 		})
 	})
 
-	t.Run("InvalidMemoryValue", func(t *testing.T) {
-		assert.PanicsWithError(t, "invalid memory value", func() {
+	t.Run("InvalidSizeValue", func(t *testing.T) {
+		assert.PanicsWithError(t, "invalid resource size value", func() {
 			converter("invalid")
 		})
 	})
 }
 
-func TestMemoryValidator(t *testing.T) {
-	validator := MemoryValidator()
+func TestResourceSizeValidator(t *testing.T) {
+	validator := ResourceSizeValidator()
 
-	t.Run("ValidMemoryFlag", func(t *testing.T) {
+	t.Run("ValidSizeFlag", func(t *testing.T) {
 		diags := validator("2G", nil)
 		assert.Empty(t, diags)
 	})
 
-	t.Run("InvalidMemoryFlag", func(t *testing.T) {
+	t.Run("InvalidSizeFlag", func(t *testing.T) {
 		diags := validator(123, nil)
 		require.Len(t, diags, 1)
-		assert.Equal(t, diags[0].Summary, "memory flag is not a string")
+		assert.Equal(t, diags[0].Summary, "resource size is not a string")
 	})
 
-	t.Run("InvalidMemoryValue", func(t *testing.T) {
+	t.Run("InvalidSizeValue", func(t *testing.T) {
 		diags := validator("invalid", nil)
 		require.Len(t, diags, 1)
 		assert.True(t, diags.HasError())
 	})
-
 }