Merge pull request #1820 from FabianKramm/master

fix: fixed component chart values validation

Author: FabianKramm

e2e/tests/deploy/testdata/helm/devspace.yaml

@@ -8,4 +8,5 @@ deployments:
       componentChart: true
       values:
         containers:
-          - image: ${IMAGE}
+          - image: ${IMAGE}
+            env: $(cat env.yaml)

e2e/tests/deploy/testdata/helm/env.yaml

@@ -0,0 +1,4 @@
+- name: TEST
+  value: value
+- name: TEST2
+  value: value2

pkg/devspace/config/loader/validate.go

@@ -3,14 +3,11 @@ package loader
 import (
 	"fmt"
 	"github.com/loft-sh/devspace/pkg/devspace/imageselector"
-	"path/filepath"
 	"strings"
 
 	jsonyaml "github.com/ghodss/yaml"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
-	"github.com/loft-sh/devspace/pkg/devspace/deploy/deployer/helm/merge"
 	"github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/devspace/pkg/util/yamlutil"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 	k8sv1 "k8s.io/api/core/v1"
@@ -249,39 +246,22 @@ func validateDeployments(config *latest.Config) error {
 		if deployConfig.Kubectl != nil && deployConfig.Kubectl.Manifests == nil {
 			return errors.Errorf("deployments[%d].kubectl.manifests is required", index)
 		}
-		if deployConfig.Helm != nil && deployConfig.Helm.ComponentChart != nil && *deployConfig.Helm.ComponentChart {
-			// Load override values from path
-			overwriteValues := map[interface{}]interface{}{}
-			if deployConfig.Helm.ValuesFiles != nil {
-				for _, overridePath := range deployConfig.Helm.ValuesFiles {
-					overwriteValuesPath, err := filepath.Abs(overridePath)
-					if err != nil {
-						return errors.Errorf("deployments[%d].helm.valuesFiles: Error retrieving absolute path from %s: %v", index, overridePath, err)
-					}
-
-					overwriteValuesFromPath := map[interface{}]interface{}{}
-					err = yamlutil.ReadYamlFromFile(overwriteValuesPath, overwriteValuesFromPath)
-					if err == nil {
-						merge.Values(overwriteValues).MergeInto(overwriteValuesFromPath)
-					}
-				}
-			}
+	}
 
-			// Load override values from data and merge them
-			if deployConfig.Helm.Values != nil {
-				merge.Values(overwriteValues).MergeInto(deployConfig.Helm.Values)
-			}
+	return nil
+}
 
-			bytes, err := yaml.Marshal(overwriteValues)
-			if err != nil {
-				return errors.Errorf("deployments[%d].helm: Error marshaling overwrite values: %v", index, err)
-			}
+func ValidateComponentConfig(deployConfig *latest.DeploymentConfig, overwriteValues map[interface{}]interface{}) error {
+	if deployConfig.Helm != nil && deployConfig.Helm.ComponentChart != nil && *deployConfig.Helm.ComponentChart {
+		bytes, err := yaml.Marshal(overwriteValues)
+		if err != nil {
+			return errors.Errorf("deployments[%s].helm: Error marshaling overwrite values: %v", deployConfig.Name, err)
+		}
 
-			componentValues := &latest.ComponentConfig{}
-			err = yaml.UnmarshalStrict(bytes, componentValues)
-			if err != nil {
-				return errors.Errorf("deployments[%d].helm.componentChart: component values are incorrect: %v", index, err)
-			}
+		componentValues := &latest.ComponentConfig{}
+		err = yaml.UnmarshalStrict(bytes, componentValues)
+		if err != nil {
+			return errors.Errorf("deployments[%s].helm.componentChart: component values are incorrect: %v", deployConfig.Name, err)
 		}
 	}
 

pkg/devspace/deploy/deployer/helm/deploy.go

@@ -2,6 +2,7 @@ package helm
 
 import (
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/legacy"
 	runtimevar "github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
 	"io"
@@ -223,5 +224,11 @@ func (d *DeployConfig) getDeploymentValues(builtImages map[string]string) (bool,
 		merge.Values(overwriteValues).MergeInto(d.DeploymentConfig.Helm.Values)
 	}
 
+	// Validate deployment values
+	err = loader.ValidateComponentConfig(d.DeploymentConfig, overwriteValues)
+	if err != nil {
+		return false, nil, err
+	}
+
 	return shouldRedeploy, overwriteValues, nil
 }