fix: several fixes in config loading

Author: FabianKramm

pkg/devspace/config/loader/loader.go

@@ -129,28 +129,26 @@ func (l *configLoader) LoadWithParser(ctx context.Context, localCache localcache
 		return nil, pluginErr
 	}
 
+	// load the raw data
 	data, err := l.LoadRaw()
 	if err != nil {
 		return nil, err
 	}
 
+	// make sure name is in config
 	name := options.OverrideName
 	if name == "" {
-		nameInterface, ok := data["name"]
+		var ok bool
+		name, ok = data["name"].(string)
 		if !ok {
-			name = "devspace"
-		} else {
-			name, ok = nameInterface.(string)
-			if !ok || name == "" {
-				return nil, fmt.Errorf("name property is not a string")
-			}
+			return nil, fmt.Errorf("name is missing in " + filepath.Base(l.absConfigPath))
 		}
 	}
 
 	// create remote cache
 	var remoteCache remotecache.Cache
 	if client != nil {
-		remoteCache, err = remotecache.NewCacheLoader(name).Load(context.TODO(), client)
+		remoteCache, err = remotecache.NewCacheLoader(name).Load(ctx, client)
 		if err != nil {
 			return nil, fmt.Errorf("error trying to load remote cache from current context and namespace: %v", err)
 		}
@@ -596,7 +594,6 @@ func GetLastProfile(profiles []string) string {
 
 // configExistsInPath checks whether a devspace configuration exists at a certain path
 func configExistsInPath(path string) bool {
-	// check devspace.yaml
 	_, err := os.Stat(path)
 	return err == nil // false, no config file found
 }
@@ -621,6 +618,18 @@ func (l *configLoader) LoadRaw() (map[string]interface{}, error) {
 		return nil, err
 	}
 
+	name, ok := rawMap["name"].(string)
+	if !ok || name == "" {
+		directoryName := filepath.Base(filepath.Dir(l.absConfigPath))
+		if directoryName != "" && len(directoryName) > 2 {
+			name = directoryName
+		} else {
+			name = "devspace"
+		}
+
+		rawMap["name"] = name
+	}
+
 	return rawMap, nil
 }
 
@@ -637,11 +646,11 @@ func (l *configLoader) SetDevSpaceRoot(log log.Logger) (bool, error) {
 			return configExists, nil
 		}
 
-		err := os.Chdir(filepath.Dir(ConfigPath(l.absConfigPath)))
+		err := os.Chdir(filepath.Dir(l.absConfigPath))
 		if err != nil {
 			return false, err
 		}
-		l.absConfigPath = filepath.Base(ConfigPath(l.absConfigPath))
+
 		return true, nil
 	}
 

pkg/devspace/config/versions/v1beta11/upgrade.go

@@ -8,8 +8,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/util/encoding"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"k8s.io/apimachinery/pkg/labels"
-	"os"
-	"path/filepath"
 	"strings"
 )
 
@@ -28,17 +26,6 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 		return nil, err
 	}
 
-	// just guess a name here
-	if nextConfig.Name == "" {
-		// try to get current folder name
-		wd, _ := os.Getwd()
-		if wd != "" && filepath.Base(wd) != "" && len(filepath.Base(wd)) > 2 {
-			nextConfig.Name = filepath.Base(wd)
-		} else {
-			nextConfig.Name = "devspace"
-		}
-	}
-
 	// use a pretty simple pipeline which was used by devspace before
 	deployPipeline := `run_dependencies_pipelines --all
 build_images --all`

pkg/devspace/dependency/resolver.go

@@ -272,16 +272,9 @@ func GetDependencyConfigName(configPath string, config *latest.DependencyConfig)
 		return "", errors.Wrapf(err, "load dependency config %s", configPath)
 	}
 
-	name, ok := rawConfig["name"]
+	nameString, ok := rawConfig["name"].(string)
 	if !ok {
-		// no name present, we will just call it by the dependency path
-		return filepath.Base(configPath), nil
-	}
-
-	nameString, ok := name.(string)
-	if !ok {
-		// no name present, we will just call it by the dependency path
-		return filepath.Base(configPath), nil
+		return "", fmt.Errorf("devspace.yaml name is missing")
 	}
 
 	return nameString, nil

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

@@ -162,7 +162,7 @@ func (d *DeployConfig) internalDeploy(ctx *devspacecontext.Context, overwriteVal
 	// Deploy chart
 	appRelease, err := d.Helm.InstallChart(ctx, releaseName, releaseNamespace, overwriteValues, d.DeploymentConfig.Helm)
 	if err != nil {
-		return nil, errors.Errorf("Unable to deploy helm chart: %v", err)
+		return nil, errors.Errorf("unable to deploy helm chart: %v", err)
 	}
 
 	// Print revision

pkg/devspace/helm/generic/generic.go

@@ -90,10 +90,10 @@ func (c *client) Exec(ctx *devspacecontext.Context, args []string, helmConfig *l
 	result, err := command.Output(ctx.Context, ctx.WorkingDir, c.helmPath, args...)
 	if err != nil {
 		if exitError, ok := err.(*exec.ExitError); ok {
-			return nil, fmt.Errorf("error during '%s %s': %s%s => %v", c.helmPath, strings.Join(args, " "), string(result), string(exitError.Stderr), err)
+			return nil, fmt.Errorf("error during '%s %s':\n %s%s => %v", c.helmPath, strings.Join(args, " "), string(result), string(exitError.Stderr), err)
 		}
 
-		return nil, fmt.Errorf("error during '%s %s': %s => %v", c.helmPath, strings.Join(args, " "), string(result), err)
+		return nil, fmt.Errorf("error during '%s %s':\n %s => %v %s", c.helmPath, strings.Join(args, " "), string(result), err)
 	}
 
 	return result, nil

pkg/devspace/helm/v3/client.go

@@ -119,13 +119,11 @@ func (c *client) InstallChart(ctx *devspacecontext.Context, releaseName string,
 	}
 	args = append(args, helmConfig.UpgradeArgs...)
 	output, err := c.genericHelm.Exec(ctx, args, helmConfig)
-
 	if helmConfig.DisplayOutput {
 		writer := ctx.Log.Writer(logrus.InfoLevel)
 		_, _ = writer.Write(output)
 		_ = writer.Close()
 	}
-
 	if err != nil {
 		return nil, err
 	}

pkg/util/command/command.go

@@ -144,8 +144,7 @@ func CombinedOutputWithEnv(ctx context.Context, dir string, extraEnvVars map[str
 
 func Output(ctx context.Context, dir string, cmd string, args ...string) ([]byte, error) {
 	stdout := &bytes.Buffer{}
-	stderr := &bytes.Buffer{}
-	err := CommandWithEnv(ctx, dir, stdout, stderr, nil, nil, cmd, args...)
+	err := CommandWithEnv(ctx, dir, stdout, nil, nil, nil, cmd, args...)
 	return stdout.Bytes(), err
 }