new fix for issue 314

Author: gentele

pkg/devspace/config/configutil/get.go

@@ -3,7 +3,6 @@ package configutil
 import (
 	"os"
 	"sync"
-	"unsafe"
 
 	"github.com/covexo/devspace/pkg/util/kubeconfig"
 	"github.com/covexo/devspace/pkg/util/log"
@@ -83,9 +82,9 @@ func GetConfig() *v1.Config {
 		//ignore error as overwrite.yaml is optional
 		loadConfig(overwriteConfigRaw, OverwriteConfigPath)
 
-		merge(&config, configRaw, unsafe.Pointer(&config), unsafe.Pointer(configRaw))
-		merge(&overwriteConfig, overwriteConfigRaw, unsafe.Pointer(&overwriteConfig), unsafe.Pointer(overwriteConfigRaw))
-		merge(&config, overwriteConfig, unsafe.Pointer(&config), unsafe.Pointer(overwriteConfig))
+		Merge(&config, configRaw)
+		Merge(&overwriteConfig, overwriteConfigRaw)
+		Merge(&config, overwriteConfig)
 
 		if config.Version == nil || *config.Version != CurrentConfigVersion {
 			log.Fatal("Your config is out of date. Please run `devspace init -r` to update your config")

pkg/devspace/config/configutil/merge.go

@@ -5,16 +5,20 @@ import (
 	"unsafe"
 )
 
+type pointerInterface struct {
+	Type, Data unsafe.Pointer
+}
+
 // Merge deeply merges two objects
+// object MUST be a pointer of a pointer
+// overwriteObject MUST be a pointer
 func Merge(object interface{}, overwriteObject interface{}) {
-	objectPointerUnsafe := unsafe.Pointer(&object)
-	overwriteObjectPointerUnsafe := *(*unsafe.Pointer)(unsafe.Pointer(&overwriteObject))
+	objectPointerUnsafe := (*(*pointerInterface)(unsafe.Pointer(&object))).Data
+	overwriteObjectPointerUnsafe := (*(*pointerInterface)(unsafe.Pointer(&overwriteObject))).Data
 
-	merge(&object, overwriteObject, objectPointerUnsafe, overwriteObjectPointerUnsafe)
+	merge(object, overwriteObject, objectPointerUnsafe, overwriteObjectPointerUnsafe)
 }
 
-// objectPointer MUST be a pointer of a pointer
-// objectPointerUnsafe MUST be an unsafe pointer of a pointer
 func merge(objectPointer interface{}, overwriteObjectPointer interface{}, objectPointerUnsafe unsafe.Pointer, overwriteObjectPointerUnsafe unsafe.Pointer) {
 	overwriteObjectRef := reflect.ValueOf(overwriteObjectPointer)
 
@@ -55,10 +59,10 @@ func merge(objectPointer interface{}, overwriteObjectPointer interface{}, object
 					overwriteValue := getMapValue(overwriteObject, key, genericPointerType)
 					valuePointerRef := objectRef.MapIndex(keyRef)
 
-					if isZero(valuePointerRef) == false && isTrivialDataType(valuePointerRef) {
+					if isZero(valuePointerRef) == false {
 						valuePointer := valuePointerRef.Interface()
 
-						merge(&valuePointer, overwriteValue, unsafe.Pointer(&valuePointer), *(*unsafe.Pointer)(unsafe.Pointer(&overwriteValue)))
+						Merge(&valuePointer, overwriteValue)
 					} else {
 						keyRef := reflect.ValueOf(key)
 						overwriteValueRef := reflect.ValueOf(overwriteValue)
@@ -76,33 +80,17 @@ func merge(objectPointer interface{}, overwriteObjectPointer interface{}, object
 					overwriteValue := overwriteValueRef.Interface()
 					valuePointerRef := objectRef.Field(i)
 
-					if valuePointerRef.IsNil() || isTrivialDataType(valuePointerRef) {
+					if valuePointerRef.IsNil() {
 						valuePointerRef.Set(reflect.ValueOf(overwriteValue))
 					} else {
 						valuePointer := valuePointerRef.Interface()
 
-						merge(&valuePointer, overwriteValue, unsafe.Pointer(&valuePointer), *(*unsafe.Pointer)(unsafe.Pointer(&overwriteValue)))
+						Merge(&valuePointer, overwriteValue)
 					}
 				}
 			}
 		default:
-			panic("Unable to merge trivial data types")
+			*(*unsafe.Pointer)(objectPointerUnsafe) = overwriteObjectPointerUnsafe
 		}
 	}
 }
-
-func isTrivialDataType(value reflect.Value) bool {
-	if value.Type().Kind() == reflect.Ptr {
-		value = value.Elem()
-	}
-
-	switch reflect.TypeOf(value).Kind() {
-	case reflect.Slice:
-		return false
-	case reflect.Map:
-		return false
-	case reflect.Struct:
-		return false
-	}
-	return true
-}