Merge pull request #2035 from FabianKramm/master

refactor: fix init problem & move validation

Author: FabianKramm

cmd/init.go

@@ -49,9 +49,6 @@ const devspaceFolderGitignore = "\n\n# Ignore DevSpace cache and log folder\n.de
 
 const (
 	// Dockerfile not found options
-	UseExistingDockerfileOption       = "Use the Dockerfile in ./Dockerfile"
-	CreateDockerfileOption            = "Create a Dockerfile for this project"
-	EnterDockerfileOption             = "Enter path to a different Dockerfile"
 	DeployOptionHelm                  = "helm"
 	DeployOptionKubectl               = "kubectl"
 	DeployOptionKustomize             = "kustomize"
@@ -162,9 +159,8 @@ func (cmd *InitCmd) Run(f factory.Factory) error {
 	} else {
 		err = cmd.initDevspace(f, configLoader)
 	}
-
 	if err != nil {
-		panic(err)
+		return err
 	}
 
 	cmd.log.WriteString(logrus.InfoLevel, "\n")
@@ -437,7 +433,7 @@ func (cmd *InitCmd) initDevspace(f factory.Factory, configLoader loader.ConfigLo
 
 		config.Commands["migrate-db"] = &latest.CommandConfig{
 			Command: `echo 'This is a cross-platform, shared command that can be used to codify any kind of dev task.'
-	echo 'Anyone using this project can invoke it via "devspace run migrate-db"'`,
+echo 'Anyone using this project can invoke it via "devspace run migrate-db"'`,
 		}
 	}
 
@@ -456,8 +452,7 @@ start_dev ` + imageName + `                     # 3. Start dev mode "` + imageNa
 	config.Pipelines["deploy"] = &latest.Pipeline{
 		Run: `run_dependency_pipelines --all                    # 1. Deploy any projects this project needs (see "dependencies")
 build_images --all -t $(git describe --always)    # 2. Build, tag (git commit hash) and push all images (see "images")
-create_deployments --all \                        # 3. Deploy Helm charts and manifests specfied as "deployments"
-  --set updateImageTags=true                      #    + make sure to update all image tags to the one from step 2`,
+create_deployments --all                          # 3. Deploy Helm charts and manifests specfied as "deployments"`,
 	}
 
 	// Save config
@@ -739,7 +734,8 @@ func (cmd *InitCmd) render(f factory.Factory, config *latest.Config) (string, er
 	}
 	err = renderCmd.RunDefault(f)
 	if err != nil {
-		return "", err
+		f.GetLog().Debugf("error rendering chart: %v", err)
+		return "", nil
 	}
 
 	return writer.String(), nil

cmd/print.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/loft-sh/devspace/pkg/devspace/config"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency/types"
@@ -27,8 +28,9 @@ import (
 type PrintCmd struct {
 	*flags.GlobalFlags
 
-	Out      io.Writer
-	SkipInfo bool
+	Out        io.Writer
+	StripNames bool
+	SkipInfo   bool
 
 	Dependency string
 }
@@ -37,6 +39,7 @@ type PrintCmd struct {
 func NewPrintCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra.Command {
 	cmd := &PrintCmd{
 		GlobalFlags: globalFlags,
+		StripNames:  true,
 		Out:         os.Stdout,
 	}
 
@@ -117,7 +120,7 @@ func (cmd *PrintCmd) Run(f factory.Factory) error {
 		ctx = ctx.AsDependency(dep)
 	}
 
-	bsConfig, err := yaml.Marshal(ctx.Config().Config())
+	bsConfig, err := marshalConfig(ctx.Config().Config(), cmd.StripNames)
 	if err != nil {
 		return err
 	}
@@ -141,6 +144,41 @@ func (cmd *PrintCmd) Run(f factory.Factory) error {
 	return nil
 }
 
+func marshalConfig(config *latest.Config, stripNames bool) ([]byte, error) {
+	// remove the auto generated names
+	if stripNames {
+		for k := range config.Images {
+			config.Images[k].Name = ""
+		}
+		for k := range config.Deployments {
+			config.Deployments[k].Name = ""
+		}
+		for k := range config.Dependencies {
+			config.Dependencies[k].Name = ""
+		}
+		for k := range config.Pipelines {
+			config.Pipelines[k].Name = ""
+		}
+		for k := range config.Dev {
+			config.Dev[k].Name = ""
+			for c := range config.Dev[k].Containers {
+				config.Dev[k].Containers[c].Container = ""
+			}
+		}
+		for k := range config.Vars {
+			config.Vars[k].Name = ""
+		}
+		for k := range config.PullSecrets {
+			config.PullSecrets[k].Name = ""
+		}
+		for k := range config.Commands {
+			config.Commands[k].Name = ""
+		}
+	}
+
+	return yaml.Marshal(config)
+}
+
 func printExtraInfo(config config.Config, dependencies []types.Dependency, log logger.Logger) error {
 	log.WriteString(logrus.InfoLevel, "\n-------------------\n\nVars:\n")
 

cmd/run_pipeline.go

@@ -64,7 +64,7 @@ type RunPipelineCmd struct {
 	// used for testing to allow interruption
 	Ctx          context.Context
 	RenderWriter io.Writer
-	log          log.Logger
+	Log          log.Logger
 }
 
 func (cmd *RunPipelineCmd) AddPipelineFlags(f factory.Factory, command *cobra.Command, pipeline *latest.Pipeline) {
@@ -227,16 +227,16 @@ func (cmd *RunPipelineCmd) Run(cobraCmd *cobra.Command, args []string, f factory
 		cmd.Pipeline = args[0]
 	}
 
-	if cmd.log == nil {
-		cmd.log = f.GetLog()
+	if cmd.Log == nil {
+		cmd.Log = f.GetLog()
 	}
 	if cmd.Silent {
-		cmd.log.SetLevel(logrus.FatalLevel)
+		cmd.Log.SetLevel(logrus.FatalLevel)
 	}
 
 	// Print upgrade message if new version available
 	if !cmd.Render {
-		upgrade.PrintUpgradeMessage(cmd.log)
+		upgrade.PrintUpgradeMessage(cmd.Log)
 	} else if cmd.RenderWriter == nil {
 		cmd.RenderWriter = os.Stdout
 	}
@@ -256,7 +256,7 @@ func (cmd *RunPipelineCmd) Run(cobraCmd *cobra.Command, args []string, f factory
 		cmd.Ctx = values.WithFlags(cmd.Ctx, cobraCmd.Flags())
 	}
 	options := cmd.BuildOptions(cmd.ToConfigOptions())
-	ctx, err := initialize(cmd.Ctx, f, false, options, cmd.log)
+	ctx, err := initialize(cmd.Ctx, f, false, options, cmd.Log)
 	if err != nil {
 		return err
 	}

cmd/sync.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	runtimevar "github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
 	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/devspace/services/sync"
@@ -335,7 +336,7 @@ func (cmd *SyncCmd) applyFlagsToSyncConfig(syncConfig *latest.SyncConfig, option
 	}
 
 	if cmd.InitialSync != "" {
-		if !loader.ValidInitialSyncStrategy(latest.InitialSyncStrategy(cmd.InitialSync)) {
+		if !versions.ValidInitialSyncStrategy(latest.InitialSyncStrategy(cmd.InitialSync)) {
 			return options, errors.Errorf("--initial-sync is not valid '%s'", cmd.InitialSync)
 		}
 

e2e/tests/init/init.go

@@ -3,6 +3,8 @@ package init
 import (
 	"bytes"
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/util/log"
+	"github.com/sirupsen/logrus"
 	"os"
 	"path/filepath"
 	"strings"
@@ -125,19 +127,15 @@ var _ = DevSpaceDescribe("init", func() {
 		framework.ExpectNoError(err)
 		defer framework.ExpectDeleteNamespace(kubeClient, ns)
 
-		done := make(chan error)
-		go func() {
-			devCmd := &cmd.RunPipelineCmd{
-				GlobalFlags: &flags.GlobalFlags{
-					NoWarn:    true,
-					Namespace: ns,
-				},
-				Pipeline: "dev",
-			}
-			done <- devCmd.RunDefault(f)
-		}()
-
-		err = <-done
+		devCmd := &cmd.RunPipelineCmd{
+			GlobalFlags: &flags.GlobalFlags{
+				NoWarn:    true,
+				Namespace: ns,
+			},
+			Pipeline: "dev",
+			Log:      log.GetInstance().WithLevel(logrus.DebugLevel),
+		}
+		err = devCmd.RunDefault(f)
 		framework.ExpectNoError(err)
 	})
 

pkg/devspace/config/loader/imports.go

@@ -55,11 +55,6 @@ func ResolveImports(ctx context.Context, resolver variable.Resolver, basePath st
 		return nil, err
 	}
 
-	err = Validate(imports)
-	if err != nil {
-		return nil, err
-	}
-
 	mergedMap := map[string]interface{}{}
 	err = util.Convert(rawData, mergedMap)
 	if err != nil {

pkg/devspace/config/loader/loader.go

@@ -364,12 +364,6 @@ func reloadVariables(resolver variable.Resolver, rawConfig map[string]interface{
 		return err
 	}
 
-	// validate variables
-	err = validateVars(loadedVars)
-	if err != nil {
-		return err
-	}
-
 	// update the used vars in the resolver
 	resolver.UpdateVars(loadedVars)
 	return nil

pkg/devspace/config/loader/parser.go

@@ -8,7 +8,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/yamlutil"
-	"github.com/pkg/errors"
 	"gopkg.in/yaml.v3"
 )
 
@@ -114,26 +113,23 @@ func fillVariablesAndParse(ctx context.Context, resolver variable.Resolver, prep
 		return nil, nil, err
 	}
 
-	latestConfig, err := Convert(preparedConfigInterface.(map[string]interface{}), log)
+	latestConfig, err := versions.Parse(preparedConfigInterface.(map[string]interface{}), log)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	return latestConfig, preparedConfigInterface.(map[string]interface{}), nil
 }
 
-func Convert(preparedConfig map[string]interface{}, log log.Logger) (*latest.Config, error) {
-	// Now convert the whole config to latest
-	latestConfig, err := versions.Parse(preparedConfig, log)
-	if err != nil {
-		return nil, errors.Wrap(err, "convert config")
-	}
-
-	// now we validate the config
-	err = Validate(latestConfig)
-	if err != nil {
-		return nil, err
+func EachDevContainer(devPod *latest.DevPod, each func(devContainer *latest.DevContainer) bool) {
+	if len(devPod.Containers) > 0 {
+		for _, devContainer := range devPod.Containers {
+			cont := each(devContainer)
+			if !cont {
+				break
+			}
+		}
+	} else {
+		_ = each(&devPod.DevContainer)
 	}
-
-	return latestConfig, nil
 }

pkg/devspace/config/loader/variable/legacy/replace.go

@@ -2,6 +2,7 @@ package legacy
 
 import (
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/util/dockerfile"
 	"regexp"
 	"strings"
 
@@ -98,7 +99,7 @@ func resolveImage(value string, config config2.Config, dependencies []types.Depe
 	}
 
 	// strip docker image name
-	image, originalTag, err := imageselector.GetStrippedDockerImageName(resolvedImage)
+	image, originalTag, err := dockerfile.GetStrippedDockerImageName(resolvedImage)
 	if err != nil {
 		return false, false, "", nil
 	}

pkg/devspace/config/versions/adjust.go

@@ -0,0 +1,73 @@
+package versions
+
+import (
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
+	"github.com/loft-sh/devspace/pkg/util/dockerfile"
+	"github.com/pkg/errors"
+)
+
+func adjustConfig(config *latest.Config) error {
+	for name, v := range config.Vars {
+		v.Name = name
+	}
+	for name, command := range config.Commands {
+		command.Name = name
+	}
+	for name, pullSecret := range config.PullSecrets {
+		pullSecret.Name = name
+	}
+	for name, devPod := range config.Dev {
+		devPod.Name = name
+		for c, v := range devPod.Containers {
+			v.Container = c
+		}
+	}
+	for name, pipeline := range config.Pipelines {
+		pipeline.Name = name
+	}
+	for name, dep := range config.Dependencies {
+		dep.Name = name
+	}
+	if config.Images != nil {
+		newObjs := map[string]*latest.Image{}
+		for k, v := range config.Images {
+			if v != nil {
+				v.Name = k
+				image, tag, err := dockerfile.GetStrippedDockerImageName(v.Image)
+				if err != nil {
+					return errors.Errorf("error parsing images.%s.image: '%s': %v", k, v.Image, err)
+				}
+				if tag != "" {
+					v.Image = image
+					oldTags := v.Tags
+					v.Tags = []string{}
+					v.Tags = append(v.Tags, tag)
+					v.Tags = append(v.Tags, oldTags...)
+				}
+
+				newObjs[k] = v
+			}
+		}
+		config.Images = newObjs
+	}
+	if config.Deployments != nil {
+		newObjs := map[string]*latest.DeploymentConfig{}
+		for k, v := range config.Deployments {
+			if v != nil {
+				v.Name = k
+				newObjs[k] = v
+			}
+		}
+		config.Deployments = newObjs
+	}
+	if config.Hooks != nil {
+		newObjs := []*latest.HookConfig{}
+		for _, v := range config.Hooks {
+			if v != nil {
+				newObjs = append(newObjs, v)
+			}
+		}
+		config.Hooks = newObjs
+	}
+	return nil
+}