home: imp code

internal/home/upgrade.go

@@ -1568,17 +1568,10 @@ func moveField[T any](fromObj, newConf yobj, key, newKey string) (err error) {
 
 	if newVal == nil {
 		newConf[newKey] = nil
-
-		return nil
-	}
-
-	v, ok := newVal.(T)
-	if !ok {
-		return fmt.Errorf("invalid type of %s: %T", key, newVal)
+	} else {
+		newConf[newKey] = *newVal
 	}
 
-	newConf[newKey] = v
-
 	return nil
 }
 
@@ -1590,7 +1583,7 @@ func moveFieldValue[T any](fromObj, newConf yobj, key string) (err error) {
 
 // fieldValue returns the value of type T for key in confObj object.  Returns
 // nil for fields with nil values.
-func fieldValue[T any](confObj yobj, key string) (ok bool, field any, err error) {
+func fieldValue[T any](confObj yobj, key string) (ok bool, field *T, err error) {
 	fieldVal, ok := confObj[key]
 	if !ok {
 		return false, new(T), nil
@@ -1605,7 +1598,7 @@ func fieldValue[T any](confObj yobj, key string) (ok bool, field any, err error)
 		return false, nil, fmt.Errorf("unexpected type of %s: %T", key, fieldVal)
 	}
 
-	return true, f, nil
+	return true, &f, nil
 }
 
 // coalesceError returns the first non-nil error.  It is named after function