Merge pull request #1969 from FabianKramm/master

refactor: improve logging

Author: FabianKramm

cmd/enter.go

@@ -32,6 +32,8 @@ type EnterCmd struct {
 	Pick          bool
 	Wait          bool
 	Reconnect     bool
+	Screen        bool
+	ScreenSession string
 
 	WorkingDirectory string
 
@@ -79,6 +81,8 @@ devspace enter bash --image-selector "${runtime.images.app.image}:${runtime.imag
 	enterCmd.Flags().BoolVar(&cmd.Pick, "pick", true, "Select a pod / container if multiple are found")
 	enterCmd.Flags().BoolVar(&cmd.Wait, "wait", false, "Wait for the pod(s) to start if they are not running")
 	enterCmd.Flags().BoolVar(&cmd.Reconnect, "reconnect", false, "Will reconnect the terminal if an unexpected return code is encountered")
+	enterCmd.Flags().BoolVar(&cmd.Screen, "screen", false, "Use a screen session to connect")
+	enterCmd.Flags().StringVar(&cmd.ScreenSession, "screen-session", "enter", "The screen session to create or connect to")
 
 	return enterCmd
 }
@@ -158,7 +162,7 @@ func (cmd *EnterCmd) Run(f factory.Factory, args []string) error {
 
 	// Start terminal
 	stdout, stderr, stdin := defaultStdStreams(cmd.Stdout, cmd.Stderr, cmd.Stdin)
-	exitCode, err := terminal.StartTerminalFromCMD(ctx, targetselector.NewTargetSelector(selectorOptions), command, cmd.Wait, cmd.Reconnect, stdout, stderr, stdin)
+	exitCode, err := terminal.StartTerminalFromCMD(ctx, targetselector.NewTargetSelector(selectorOptions), command, cmd.Wait, cmd.Reconnect, cmd.Screen, cmd.ScreenSession, stdout, stderr, stdin)
 	if err != nil {
 		return err
 	} else if exitCode != 0 {

pkg/devspace/deploy/deploy.go

@@ -10,6 +10,7 @@ import (
 	helmclient "github.com/loft-sh/devspace/pkg/devspace/helm"
 	"github.com/loft-sh/devspace/pkg/devspace/hook"
 	kubectlclient "github.com/loft-sh/devspace/pkg/devspace/kubectl"
+	"github.com/mgutz/ansi"
 	"github.com/pkg/errors"
 	"io"
 	"sort"
@@ -249,7 +250,7 @@ func (c *controller) deployOne(ctx *devspacecontext.Context, deployConfig *lates
 	}
 
 	if wasDeployed {
-		ctx.Log.Donef("Successfully deployed %s with %s", deployConfig.Name, method)
+		ctx.Log.Donef("Successfully deployed %s with %s", ansi.Color(deployConfig.Name, "white+b"), ansi.Color(method, "white+b"))
 		// Execute after deployment deploy hook
 		err = hook.ExecuteHooks(ctx, map[string]interface{}{
 			"DEPLOY_NAME":   deployConfig.Name,

pkg/devspace/helm/generic/generic.go

@@ -78,7 +78,7 @@ func (c *client) Exec(ctx *devspacecontext.Context, args []string) ([]byte, erro
 
 	// disable log for list, because it prints same command multiple times if we've multiple deployments.
 	if args[0] != "list" {
-		c.log.Infof("Execute '%s %s'", c.helmPath, strings.Join(args, " "))
+		c.log.Debugf("Execute '%s %s'", c.helmPath, strings.Join(args, " "))
 	}
 	result, err := command.Output(ctx.Context, ctx.WorkingDir, c.helmPath, args...)
 	if err != nil {

pkg/devspace/kubectl/client.go

@@ -2,16 +2,15 @@ package kubectl
 
 import (
 	"context"
+	"fmt"
 	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
+	"github.com/loft-sh/devspace/pkg/devspace/kubectl/util"
+	"github.com/loft-sh/devspace/pkg/devspace/upgrade"
 	"io"
 	"net"
 	"net/url"
 	"os"
 	"sort"
-	"time"
-
-	"github.com/loft-sh/devspace/pkg/devspace/kubectl/util"
-	"github.com/loft-sh/devspace/pkg/devspace/upgrade"
 
 	"github.com/loft-sh/devspace/pkg/util/kubeconfig"
 	"github.com/loft-sh/devspace/pkg/util/log"
@@ -176,7 +175,7 @@ func NewClientBySelect(allowPrivate bool, switchContext bool, kubeLoader kubecon
 	}
 }
 
-// Returns the underlying kube client config
+// ClientConfig returns the underlying kube client config
 func (client *client) ClientConfig() clientcmd.ClientConfig {
 	return client.clientConfig
 }
@@ -273,12 +272,25 @@ func CheckKubeContext(client Client, localCache localcache.Cache, noWarning, aut
 		}
 
 		// Warn if using default namespace unless previous deployment was also to default namespace
-		if log.GetLevel() >= logrus.InfoLevel && currentConfigContext.Namespace == metav1.NamespaceDefault &&
-			(lastConfigContext == nil ||
-				lastConfigContext.Namespace != metav1.NamespaceDefault) {
-			log.Warn("Deploying into the 'default' namespace is usually not a good idea as this namespace cannot be deleted\n")
-			log.Info("Will continue in 5 seconds...")
-			time.Sleep(5 * time.Second)
+		if isTerminalIn &&
+			log.GetLevel() >= logrus.InfoLevel &&
+			currentConfigContext.Namespace == metav1.NamespaceDefault &&
+			(lastConfigContext == nil || lastConfigContext.Namespace != metav1.NamespaceDefault) {
+			log.Warn("Deploying into the 'default' namespace is usually not a good idea as this namespace cannot be deleted")
+			log.Warn("Please use 'devspace use namespace my-namespace' to select a different one\n")
+			useDefault, err := log.Question(&survey.QuestionOptions{
+				Question:     "Are you sure you want to use the 'default' namespace?",
+				DefaultValue: "No",
+				Options: []string{
+					"No",
+					"Yes",
+				},
+			})
+			if err != nil {
+				return client, err
+			} else if useDefault == "No" {
+				return nil, fmt.Errorf("please run 'devspace use namespace my-namespace' to select a different namespace before rerunning")
+			}
 		}
 	}
 

pkg/devspace/kubectl/helper/helper.go

@@ -191,6 +191,7 @@ func downloadSyncHelper(ctx context.Context, helperName, syncBinaryFolder, versi
 	if err == nil {
 		// make sure the sha is correct, but skip for latest because that is development
 		if version == "latest" {
+			log.Debugf("Use development devspacehelper found at %s", filepath)
 			return nil
 		}
 
@@ -221,6 +222,7 @@ func downloadSyncHelper(ctx context.Context, helperName, syncBinaryFolder, versi
 
 		// the file is correct we skip downloading
 		if fileHash == strings.Split(string(shaHash), " ")[0] {
+			log.Debugf("Use local devspacehelper found at %s", filepath)
 			return nil
 		}