rename function

Signed-off-by: Songpon Srisawai <[email protected]>

Author: songponssw

cmd/limactl/edit.go

@@ -118,15 +118,10 @@ func editAction(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	if err := limayaml.Validate(y, true); err != nil {
-		rejectedYAML := "lima.REJECTED.yaml"
-		if writeErr := os.WriteFile(rejectedYAML, yBytes, 0o644); writeErr != nil {
-			return fmt.Errorf("the YAML is invalid, attempted to save the buffer as %q but failed: %w: %w", rejectedYAML, writeErr, err)
-		}
-		// TODO: may need to support editing the rejected YAML
-		return fmt.Errorf("the YAML is invalid, saved the buffer as %q: %w", rejectedYAML, err)
+		return saveRejectedYAML(yBytes, err)
 	}
 
-	if err := limayaml.ValidateYAMLAgainstLatest(yBytes, yContent); err != nil {
+	if err := limayaml.ValidateYAMLAgainstLatestConfig(yBytes, yContent); err != nil {
 		return saveRejectedYAML(yBytes, err)
 	}
 
@@ -177,6 +172,7 @@ func editBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra
 	return bashCompleteInstanceNames(cmd)
 }
 
+// saveRejectedYAML writes the rejected config and returns an error.
 func saveRejectedYAML(y []byte, origErr error) error {
 	rejectedYAML := "lima.REJECTED.yaml"
 	if writeErr := os.WriteFile(rejectedYAML, y, 0o644); writeErr != nil {

pkg/limayaml/validate.go

@@ -596,8 +596,8 @@ func warnExperimental(y *LimaYAML) {
 	}
 }
 
-// ValidateYAMLAgainstLatest validates the values between the latest YAML and the updated(New) YAML.
-func ValidateYAMLAgainstLatest(yNew, yLatest []byte) error {
+// ValidateYAMLAgainstLatestConfig validates the values between the latest YAML and the updated(New) YAML.
+func ValidateYAMLAgainstLatestConfig(yNew, yLatest []byte) error {
 	var l, n LimaYAML
 	var err error
 	if err = Unmarshal(yLatest, &l, "Unmarshal latest YAML bytes"); err != nil {
@@ -607,12 +607,17 @@ func ValidateYAMLAgainstLatest(yNew, yLatest []byte) error {
 		return err
 	}
 
-	// Skip validation if both fields are unset.
-	if n.Disk == nil && l.Disk == nil {
-		return nil
+	// Disk value must be provided, as it is required when creating an instance.
+	nDisk, err := units.RAMInBytes(*n.Disk)
+	if err != nil {
+		return err
+	}
+	lDisk, err := units.RAMInBytes(*l.Disk)
+	if err != nil {
+		return err
 	}
-	nDisk, _ := units.RAMInBytes(*n.Disk)
-	lDisk, _ := units.RAMInBytes(*l.Disk)
+
+	// Reject shrinking disk
 	if nDisk < lDisk {
 		return fmt.Errorf("field `disk`: shrinking the disk (%v --> %v) is not supported", *l.Disk, *n.Disk)
 	}