Merge pull request #2183 from FabianKramm/print-feat

Default alwaysResolve to true

Author: FabianKramm

pkg/devspace/config/loader/variable/resolver.go

@@ -144,7 +144,7 @@ func (r *resolver) findVariablesInclude(haystack interface{}, include []*regexp.
 
 	// add always resolve variables
 	for _, v := range r.vars {
-		if v.AlwaysResolve {
+		if v.AlwaysResolve == nil || *v.AlwaysResolve {
 			varsUsed[v.Name] = true
 		}
 	}

pkg/devspace/config/versions/latest/schema.go

@@ -1494,8 +1494,8 @@ type Variable struct {
 	// system.
 	Commands []VariableCommand `yaml:"commands,omitempty" json:"commands,omitempty" jsonschema_extras:"group=execution" jsonschema_description:"Commands are additional commands that can be used to run a different command on a different operating system."`
 
-	// AlwaysResolve makes sure this variable will always be resolved and not only if it is used somewhere
-	AlwaysResolve bool `yaml:"alwaysResolve,omitempty" json:"alwaysResolve,omitempty" jsonschema_description:"AlwaysResolve makes sure this variable will always be resolved and not only if it is used somewhere."`
+	// AlwaysResolve makes sure this variable will always be resolved and not only if it is used somewhere. Defaults to true.
+	AlwaysResolve *bool `yaml:"alwaysResolve,omitempty" json:"alwaysResolve,omitempty" jsonschema_description:"AlwaysResolve makes sure this variable will always be resolved and not only if it is used somewhere."`
 
 	// Source defines where the variable should be taken from
 	Source VariableSource `yaml:"source,omitempty" json:"source,omitempty" jsonschema_description:"Source defines where the variable should be taken from." jsonschema:"enum=all,enum=env,enum=input,enum=command,enum=none"`

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

@@ -74,7 +74,8 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 	// convert vars
 	if len(c.Vars) > 0 {
 		nextConfig.Vars = map[string]*next.Variable{}
-		for _, v := range c.Vars {
+		for _, variable := range c.Vars {
+			v := variable
 			nextConfig.Vars[v.Name] = &next.Variable{
 				Name:              v.Name,
 				Question:          v.Question,
@@ -83,7 +84,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 				ValidationPattern: v.ValidationPattern,
 				ValidationMessage: v.ValidationMessage,
 				NoCache:           v.NoCache,
-				AlwaysResolve:     v.AlwaysResolve,
+				AlwaysResolve:     &v.AlwaysResolve,
 				Value:             v.Value,
 				Default:           v.Default,
 				Source:            next.VariableSource(v.Source),
@@ -104,7 +105,10 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 	if nextConfig.Vars == nil {
 		nextConfig.Vars = map[string]*next.Variable{}
 	}
-	nextConfig.Vars["DEVSPACE_ENV_FILE"] = &next.Variable{Value: ".env"}
+	nextConfig.Vars["DEVSPACE_ENV_FILE"] = &next.Variable{
+		Value:         ".env",
+		AlwaysResolve: ptr.Bool(false),
+	}
 
 	deployPipeline := ""
 	buildPipeline := ""

pkg/devspace/kubectl/portforward/portforward.go

@@ -326,15 +326,20 @@ func (pf *PortForwarder) getListener(protocol string, hostname string, port *For
 // the background.
 func (pf *PortForwarder) waitForConnection(listener net.Listener, port ForwardedPort) {
 	for {
-		conn, err := listener.Accept()
-		if err != nil {
-			// TODO consider using something like https://github.com/hydrogen18/stoppableListener?
-			if !strings.Contains(strings.ToLower(err.Error()), "use of closed network connection") {
-				pf.raiseError(fmt.Errorf("error accepting connection on port %d: %v", port.Local, err))
-			}
+		select {
+		case <-pf.streamConn.CloseChan():
 			return
+		default:
+			conn, err := listener.Accept()
+			if err != nil {
+				// TODO consider using something like https://github.com/hydrogen18/stoppableListener?
+				if !strings.Contains(strings.ToLower(err.Error()), "use of closed network connection") {
+					pf.raiseError(fmt.Errorf("error accepting connection on port %d: %v", port.Local, err))
+				}
+				return
+			}
+			go pf.handleConnection(conn, port)
 		}
-		go pf.handleConnection(conn, port)
 	}
 }
 

pkg/devspace/pipeline/engine/pipelinehandler/commands/build_images.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/util/stringutil"
 	"strings"
 
 	flags "github.com/jessevdk/go-flags"
@@ -15,7 +16,8 @@ import (
 type BuildImagesOptions struct {
 	build.Options
 
-	All bool `long:"all" description:"Build all images"`
+	All    bool     `long:"all" description:"Build all images"`
+	Except []string `long:"except" description:"If used with --all, will exclude the following images"`
 
 	Set       []string `long:"set" description:"Set configuration"`
 	SetString []string `long:"set-string" description:"Set configuration as string"`
@@ -42,13 +44,21 @@ func BuildImages(ctx devspacecontext.Context, pipeline types.Pipeline, args []st
 	}
 
 	if options.All {
-		images := ctx.Config().Config().Images
-		for image := range images {
+		args = []string{}
+		for image := range ctx.Config().Config().Images {
+			if stringutil.Contains(options.Except, image) {
+				continue
+			}
+
+			args = append(args, image)
 			ctx, err = applySetValues(ctx, "images", image, options.Set, options.SetString, options.From, options.FromFile)
 			if err != nil {
 				return err
 			}
 		}
+		if len(args) == 0 {
+			return nil
+		}
 	} else if len(args) > 0 {
 		for _, image := range args {
 			ctx, err = applySetValues(ctx, "images", image, options.Set, options.SetString, options.From, options.FromFile)

pkg/devspace/pipeline/engine/pipelinehandler/commands/create_deployments.go

@@ -9,6 +9,7 @@ import (
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	"github.com/loft-sh/devspace/pkg/devspace/deploy"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
+	"github.com/loft-sh/devspace/pkg/util/stringutil"
 	"github.com/loft-sh/devspace/pkg/util/strvals"
 	"github.com/loft-sh/devspace/pkg/util/yamlutil"
 	"github.com/pkg/errors"
@@ -26,7 +27,8 @@ type CreateDeploymentsOptions struct {
 	From      []string `long:"from" description:"Reuse an existing configuration"`
 	FromFile  []string `long:"from-file" description:"Reuse an existing configuration from a file"`
 
-	All bool `long:"all" description:"Deploy all deployments"`
+	All    bool     `long:"all" description:"Deploy all deployments"`
+	Except []string `long:"except" description:"If used with --all, will exclude the following deployments"`
 }
 
 const ErrMsg = "Please make sure you have an existing valid kube config. You might want to check one of the following things:\n\n* Make sure you can use 'kubectl get namespaces' locally\n* If you are using Loft, you might want to run 'devspace create space' or 'loft create space'\n"
@@ -49,13 +51,21 @@ func CreateDeployments(ctx devspacecontext.Context, pipeline types.Pipeline, arg
 	}
 
 	if options.All {
-		deployments := ctx.Config().Config().Deployments
-		for deployment := range deployments {
+		args = []string{}
+		for deployment := range ctx.Config().Config().Deployments {
+			if stringutil.Contains(options.Except, deployment) {
+				continue
+			}
+
+			args = append(args, deployment)
 			ctx, err = applySetValues(ctx, "deployments", deployment, options.Set, options.SetString, options.From, options.FromFile)
 			if err != nil {
 				return err
 			}
 		}
+		if len(args) == 0 {
+			return nil
+		}
 	} else if len(args) > 0 {
 		for _, deployment := range args {
 			ctx, err = applySetValues(ctx, "deployments", deployment, options.Set, options.SetString, options.From, options.FromFile)

pkg/devspace/pipeline/engine/pipelinehandler/commands/ensure_pull_secrets.go

@@ -7,6 +7,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/docker"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
 	"github.com/loft-sh/devspace/pkg/devspace/pullsecrets"
+	"github.com/loft-sh/devspace/pkg/util/stringutil"
 	"github.com/pkg/errors"
 	"strings"
 )
@@ -18,7 +19,8 @@ type EnsurePullSecretsOptions struct {
 	From      []string `long:"from" description:"Reuse an existing configuration"`
 	FromFile  []string `long:"from-file" description:"Reuse an existing configuration from a file"`
 
-	All bool `long:"all" description:"Ensure all pull secrets"`
+	All    bool     `long:"all" description:"Ensure all pull secrets"`
+	Except []string `long:"except" description:"If used with --all, will exclude the following pull secrets"`
 }
 
 func EnsurePullSecrets(ctx devspacecontext.Context, pipeline types.Pipeline, args []string) error {
@@ -37,17 +39,25 @@ func EnsurePullSecrets(ctx devspacecontext.Context, pipeline types.Pipeline, arg
 	}
 
 	if options.All {
-		pullSecrets := ctx.Config().Config().PullSecrets
-		if len(pullSecrets) == 0 {
+		if len(ctx.Config().Config().PullSecrets) == 0 {
 			return nil
 		}
 
-		for pullSecret := range pullSecrets {
+		args = []string{}
+		for pullSecret := range ctx.Config().Config().PullSecrets {
+			if stringutil.Contains(options.Except, pullSecret) {
+				continue
+			}
+
+			args = append(args, pullSecret)
 			ctx, err = applySetValues(ctx, "pullSecrets", pullSecret, options.Set, options.SetString, options.From, options.FromFile)
 			if err != nil {
 				return err
 			}
 		}
+		if len(args) == 0 {
+			return nil
+		}
 	} else if len(args) > 0 {
 		for _, pullSecret := range args {
 			ctx, err = applySetValues(ctx, "pullSecrets", pullSecret, options.Set, options.SetString, options.From, options.FromFile)

pkg/devspace/pipeline/engine/pipelinehandler/commands/purge_deployments.go

@@ -6,6 +6,7 @@ import (
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	"github.com/loft-sh/devspace/pkg/devspace/deploy"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
+	"github.com/loft-sh/devspace/pkg/util/stringutil"
 	"github.com/pkg/errors"
 	"strings"
 )
@@ -14,7 +15,8 @@ import (
 type PurgeDeploymentsOptions struct {
 	deploy.PurgeOptions
 
-	All bool `long:"all" description:"Deploy all deployments"`
+	All    bool     `long:"all" description:"Deploy all deployments"`
+	Except []string `long:"except" description:"If used with --all, will exclude the following deployments"`
 
 	Sequential bool `long:"sequential" description:"Sequentially purges the deployments"`
 
@@ -40,6 +42,18 @@ func PurgeDeployments(ctx devspacecontext.Context, pipeline types.Pipeline, args
 
 	if !options.All && len(args) == 0 {
 		return fmt.Errorf("either specify 'purge_deployments --all' or 'purge_deployments deployment1 deployment2'")
+	} else if options.All {
+		args = []string{}
+		for _, d := range ctx.Config().RemoteCache().ListDeployments() {
+			if stringutil.Contains(options.Except, d.Name) {
+				continue
+			}
+
+			args = append(args, d.Name)
+		}
+		if len(args) == 0 {
+			return nil
+		}
 	}
 
 	return deploy.NewController().Purge(ctx, args, &options.PurgeOptions)

pkg/devspace/pipeline/engine/pipelinehandler/commands/run_dependency_pipelines.go

@@ -7,6 +7,7 @@ import (
 	types2 "github.com/loft-sh/devspace/pkg/devspace/dependency/types"
 	"github.com/loft-sh/devspace/pkg/devspace/hook"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
+	"github.com/loft-sh/devspace/pkg/util/stringutil"
 	"github.com/pkg/errors"
 	"strings"
 )
@@ -15,7 +16,8 @@ import (
 type RunDependencyPipelinesOptions struct {
 	types.DependencyOptions
 
-	All bool `long:"all" description:"Deploy all dependencies"`
+	All    bool     `long:"all" description:"Deploy all dependencies"`
+	Except []string `long:"except" description:"If used with --all, will exclude the following dependencies"`
 }
 
 func RunDependencyPipelines(ctx devspacecontext.Context, pipeline types.Pipeline, args []string) error {
@@ -36,7 +38,16 @@ func RunDependencyPipelines(ctx devspacecontext.Context, pipeline types.Pipeline
 	duplicates := map[string]bool{}
 	deployDependencies := []types2.Dependency{}
 	if options.All {
-		deployDependencies = ctx.Dependencies()
+		for _, dependency := range ctx.Dependencies() {
+			if stringutil.Contains(options.Except, dependency.Name()) {
+				continue
+			}
+
+			deployDependencies = append(deployDependencies, dependency)
+		}
+		if len(deployDependencies) == 0 {
+			return nil
+		}
 	} else if len(args) > 0 {
 		for _, arg := range args {
 			if duplicates[arg] {

pkg/devspace/pipeline/engine/pipelinehandler/commands/start_dev.go

@@ -7,6 +7,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/devpod"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/types"
 	logpkg "github.com/loft-sh/devspace/pkg/util/log"
+	"github.com/loft-sh/devspace/pkg/util/stringutil"
 	"github.com/pkg/errors"
 	"strings"
 )
@@ -20,7 +21,8 @@ type StartDevOptions struct {
 	From      []string `long:"from" description:"Reuse an existing configuration"`
 	FromFile  []string `long:"from-file" description:"Reuse an existing configuration from a file"`
 
-	All bool `long:"all" description:"Start all dev configurations"`
+	All    bool     `long:"all" description:"Start all dev configurations"`
+	Except []string `long:"except" description:"If used with --all, will exclude the following dev configs"`
 }
 
 func StartDev(ctx devspacecontext.Context, pipeline types.Pipeline, args []string) error {
@@ -41,12 +43,21 @@ func StartDev(ctx devspacecontext.Context, pipeline types.Pipeline, args []strin
 	}
 
 	if options.All {
+		args = []string{}
 		for devConfig := range ctx.Config().Config().Dev {
+			if stringutil.Contains(options.Except, devConfig) {
+				continue
+			}
+
+			args = append(args, devConfig)
 			ctx, err = applySetValues(ctx, "dev", devConfig, options.Set, options.SetString, options.From, options.FromFile)
 			if err != nil {
 				return err
 			}
 		}
+		if len(args) == 0 {
+			return nil
+		}
 	} else if len(args) > 0 {
 		for _, devConfig := range args {
 			ctx, err = applySetValues(ctx, "dev", devConfig, options.Set, options.SetString, options.From, options.FromFile)