Merge pull request #1216 from balajiv113/validation

support for validating unknown fields

Author: AkihiroSuda

pkg/limayaml/defaults.go

@@ -121,22 +121,28 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 			}
 		}
 	}
+	var overrideCPUType bool
 	for k, v := range d.CPUType {
 		if len(v) > 0 {
+			overrideCPUType = true
 			cpuType[k] = v
 		}
 	}
 	for k, v := range y.CPUType {
 		if len(v) > 0 {
+			overrideCPUType = true
 			cpuType[k] = v
 		}
 	}
 	for k, v := range o.CPUType {
 		if len(v) > 0 {
+			overrideCPUType = true
 			cpuType[k] = v
 		}
 	}
-	y.CPUType = cpuType
+	if *y.VMType == QEMU || overrideCPUType {
+		y.CPUType = cpuType
+	}
 
 	if y.CPUs == nil {
 		y.CPUs = d.CPUs
@@ -176,7 +182,7 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 	if o.Video.Display != nil {
 		y.Video.Display = o.Video.Display
 	}
-	if y.Video.Display == nil || *y.Video.Display == "" {
+	if (y.Video.Display == nil || *y.Video.Display == "") && *y.VMType == QEMU {
 		y.Video.Display = pointer.String("none")
 	}
 

pkg/reflectutil/reflectutil.go

@@ -0,0 +1,61 @@
+// This file has been adapted from https://github.com/containerd/nerdctl/blob/v1.0.0/pkg/reflectutil/reflectutil.go
+/*
+   Copyright The containerd Authors.
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package reflectutil
+
+import (
+	"fmt"
+	"reflect"
+)
+
+func UnknownNonEmptyFields(structOrStructPtr interface{}, knownNames ...string) []string {
+	var unknown []string
+	knownNamesMap := make(map[string]struct{}, len(knownNames))
+	for _, name := range knownNames {
+		knownNamesMap[name] = struct{}{}
+	}
+	origVal := reflect.ValueOf(structOrStructPtr)
+	var val reflect.Value
+	switch kind := origVal.Kind(); kind {
+	case reflect.Ptr:
+		val = origVal.Elem()
+	case reflect.Struct:
+		val = origVal
+	default:
+		panic(fmt.Errorf("expected Ptr or Struct, got %+v", kind))
+	}
+	for i := 0; i < val.NumField(); i++ {
+		iField := val.Field(i)
+		if isEmpty(iField) {
+			continue
+		}
+		iName := val.Type().Field(i).Name
+		if _, ok := knownNamesMap[iName]; !ok {
+			unknown = append(unknown, iName)
+		}
+	}
+	return unknown
+}
+
+func isEmpty(v reflect.Value) bool {
+	// NOTE: IsZero returns false for zero-length map and slice
+	if v.IsZero() {
+		return true
+	}
+	switch v.Kind() {
+	case reflect.Map, reflect.Slice:
+		return v.Len() == 0
+	}
+	return false
+}

pkg/vz/vz_driver_darwin.go

@@ -9,6 +9,8 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/lima-vm/lima/pkg/reflectutil"
+
 	"github.com/Code-Hex/vz/v3"
 
 	"github.com/lima-vm/lima/pkg/store/filenames"
@@ -37,6 +39,57 @@ func (l *LimaVzDriver) Validate() error {
 	if *l.Yaml.Firmware.LegacyBIOS {
 		return fmt.Errorf("`firmware.legacyBIOS` configuration is not supported for VZ driver")
 	}
+	if unknown := reflectutil.UnknownNonEmptyFields(l.Yaml, "VMType",
+		"Arch",
+		"Images",
+		"CPUs",
+		"Memory",
+		"Disk",
+		"Mounts",
+		"MountType",
+		"SSH",
+		"Firmware",
+		"Provision",
+		"Containerd",
+		"Probes",
+		"PortForwards",
+		"Message",
+		"Networks",
+		"Env",
+		"DNS",
+		"HostResolver",
+		"PropagateProxyEnv",
+		"CACertificates",
+		"Rosetta",
+	); len(unknown) > 0 {
+		logrus.Warnf("Ignoring: vmType %s: %+v", *l.Yaml.VMType, unknown)
+	}
+
+	for i, image := range l.Yaml.Images {
+		if unknown := reflectutil.UnknownNonEmptyFields(image, "File"); len(unknown) > 0 {
+			logrus.Warnf("Ignoring: vmType %s: images[%d]: %+v", *l.Yaml.VMType, i, unknown)
+		}
+	}
+
+	for i, mount := range l.Yaml.Mounts {
+		if unknown := reflectutil.UnknownNonEmptyFields(mount, "Location",
+			"MountPoint",
+			"Writable",
+			"SSHFS",
+			"NineP",
+		); len(unknown) > 0 {
+			logrus.Warnf("Ignoring: vmType %s: mounts[%d]: %+v", *l.Yaml.VMType, i, unknown)
+		}
+	}
+
+	for i, network := range l.Yaml.Networks {
+		if unknown := reflectutil.UnknownNonEmptyFields(network, "VZNAT",
+			"MACAddress",
+			"Interface",
+		); len(unknown) > 0 {
+			logrus.Warnf("Ignoring: vmType %s: networks[%d]: %+v", *l.Yaml.VMType, i, unknown)
+		}
+	}
 	return nil
 }