fix: return error when a field is both in DevPod and DevContainer

Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>

Author: 89luca89

pkg/devspace/config/versions/validate.go

@@ -2,7 +2,9 @@ package versions
 
 import (
 	"fmt"
+	"reflect"
 	"strings"
+	"unicode"
 
 	jsonyaml "github.com/ghodss/yaml"
 	"github.com/pkg/errors"
@@ -365,13 +367,13 @@ func validateDev(config *latest.Config) error {
 			return errors.Errorf("dev.%s: image selector and label selector cannot be used together", devPodName)
 		}
 
-		err := validateDevContainer(fmt.Sprintf("dev.%s", devPodName), &devPod.DevContainer, false)
+		err := validateDevContainer(fmt.Sprintf("dev.%s", devPodName), &devPod.DevContainer, devPod, false)
 		if err != nil {
 			return err
 		}
 		if len(devPod.Containers) > 0 {
 			for i, c := range devPod.Containers {
-				err := validateDevContainer(fmt.Sprintf("dev.%s.containers[%s]", devPodName, i), c, true)
+				err := validateDevContainer(fmt.Sprintf("dev.%s.containers[%s]", devPodName, i), c, devPod, true)
 				if err != nil {
 					return err
 				}
@@ -382,14 +384,21 @@ func validateDev(config *latest.Config) error {
 	return nil
 }
 
-func validateDevContainer(path string, devContainer *latest.DevContainer, nameRequired bool) error {
+func validateDevContainer(path string, devContainer *latest.DevContainer, devPod *latest.DevPod, nameRequired bool) error {
 	if nameRequired && devContainer.Container == "" {
 		return errors.Errorf("%s.container is required", path)
 	}
 
 	if !ValidContainerArch(devContainer.Arch) {
 		return errors.Errorf("%s.arch is not valid '%s'", path, devContainer.Arch)
 	}
+
+	// check if there are values from devContainers that are overwriting values from devPod
+	err := validatePodContainerDuplicates(path, devContainer, devPod)
+	if err != nil {
+		return err
+	}
+
 	for index, sync := range devContainer.Sync {
 		// Validate initial sync strategy
 		if !ValidInitialSyncStrategy(sync.InitialSync) {
@@ -431,3 +440,36 @@ func validateDevContainer(path string, devContainer *latest.DevContainer, nameRe
 
 	return nil
 }
+
+func validatePodContainerDuplicates(path string, devContainer *latest.DevContainer, devPod *latest.DevPod) error {
+	if devContainer.Container == "" {
+		return nil
+	}
+
+	// Extract list of fields from DevContainer struct
+	fields := reflect.VisibleFields(reflect.TypeOf(struct{ latest.DevContainer }{}))
+
+	// Make possible to retrieve fields from struct programmatically
+	devContainerField := reflect.ValueOf(*devContainer)
+	devPodField := reflect.ValueOf(*devPod)
+
+	// iterate trough fields, if a devContainer field is set in devPod,
+	// then report error about overwriting
+	for _, field := range fields {
+		// skip the DevContainer field, check then if a field is valid and set
+		if field.Name != "DevContainer" && field.Name != "Container" &&
+			devPodField.FieldByName(field.Name).IsValid() && !devPodField.FieldByName(field.Name).IsZero() &&
+			!reflect.DeepEqual(devPodField.FieldByName(field.Name).Interface(), devContainerField.FieldByName(field.Name).Interface()) {
+
+			// get DevPod path
+			fieldName := string(unicode.ToLower(rune(field.Name[0]))) + field.Name[1:]
+			pathFields := strings.Split(path, ".")
+			pathFields = pathFields[:len(pathFields)-1]
+			sourcepath := strings.Join(pathFields, ".")
+
+			return errors.Errorf("%s.%s will be overwritten by %s, please specify %s.%s instead", sourcepath, fieldName, path, path, fieldName)
+		}
+	}
+
+	return nil
+}

pkg/devspace/config/versions/validate_test.go

@@ -140,4 +140,36 @@ func TestValidateDev(t *testing.T) {
 
 	err = validateDev(config)
 	assert.Error(t, err, "dev.test: image selector and label selector are nil")
+
+	// test devpod overwritten by devcontainer
+	config = &latest.Config{
+		Dev: map[string]*latest.DevPod{
+			"somename": {
+				Name: "somename",
+				LabelSelector: map[string]string{
+					"app": "MeApp",
+				},
+				DevContainer: latest.DevContainer{
+					ReversePorts: []*latest.PortMapping{
+						{
+							Port: fmt.Sprintf("%v:%v", 8080, 8080),
+						},
+					},
+				},
+				Containers: map[string]*latest.DevContainer{
+					"test": {
+						Container: "test",
+						ReversePorts: []*latest.PortMapping{
+							{
+								Port: fmt.Sprintf("%v:%v", 8081, 8081),
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	err = validateDev(config)
+	assert.Error(t, err, "dev.somename.reversePorts will be overwritten by dev.somename.containers[test], please specify dev.somename.containers[test].reversePorts instead")
 }

pkg/util/progressreader/progressreader.go

@@ -34,7 +34,7 @@ func (r *ProgressReader) Read(p []byte) (int, error) {
 		if r.transferStep.IsZero() || time.Now().Second() >= (r.transferStep.Second()+3) {
 			r.transferStep = time.Now()
 
-			r.Ctx.Log().Info("Uploaded " + toHumanReadable(r.total) + " " + r.Rate()+ "\r")
+			r.Ctx.Log().Info("Uploaded " + toHumanReadable(r.total) + " " + r.Rate() + "\r")
 		}
 	}
 
@@ -51,7 +51,7 @@ func (r *ProgressReader) Rate() string {
 	if end.IsZero() {
 		end = time.Now()
 	}
-	return toHumanReadable(int64((float64(r.total)/(end.Sub(r.transferStart).Seconds())))) + "/s"
+	return toHumanReadable(int64((float64(r.total) / (end.Sub(r.transferStart).Seconds())))) + "/s"
 }
 
 // convert bytes input to a human readable format (Gb,Mb,Kb,b)