fix: fix several logger problems

FabianKramm · FabianKramm · commit 5985ae4fb9b1 · 2022-03-02T13:19:12.000+01:00
diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -154,6 +154,10 @@ func (cmd *DeployCmd) runCommand(ctx *devspacecontext.Context, f factory.Factory
 }
 
 func prepare(f factory.Factory, configOptions *loader.ConfigOptions, globalFlags *flags.GlobalFlags, allowFailingKubeClient bool) (*devspacecontext.Context, error) {
+	// start file logging
+	logpkg.StartFileLogging()
+
+	// get the main logger after file logging is started
 	log := f.GetLog()
 
 	// set config root
@@ -168,9 +172,6 @@ func prepare(f factory.Factory, configOptions *loader.ConfigOptions, globalFlags
 		return nil, errors.New(message.ConfigNotFound)
 	}
 
-	// start file logging
-	logpkg.StartFileLogging()
-
 	// create kubectl client
 	client, err := f.NewKubeClientFromContext(globalFlags.KubeContext, globalFlags.Namespace)
 	if err != nil {
@@ -246,8 +247,6 @@ func runPipeline(ctx *devspacecontext.Context, f factory.Factory, options *Pipel
 	dependencies, err := f.NewDependencyManager(ctx, options.ConfigOptions).ResolveAll(ctx, dependency.ResolveOptions{
 		SkipDependencies: options.DependencyOptions.Exclude,
 		Dependencies:     options.Only,
-		Silent:           true,
-		Verbose:          false,
 	})
 	if err != nil {
 		return errors.Wrap(err, "deploy dependencies")
diff --git a/cmd/list/deployments.go b/cmd/list/deployments.go
@@ -96,9 +96,7 @@ func (cmd *deploymentsCmd) RunDeploymentsStatus(f factory.Factory, cobraCmd *cob
 		WithKubeClient(client)
 
 	// Resolve dependencies
-	dependencies, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{
-		Silent: true,
-	})
+	dependencies, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{})
 	if err != nil {
 		return err
 	}
diff --git a/cmd/logs.go b/cmd/logs.go
@@ -150,9 +150,7 @@ func getImageSelector(ctx *devspacecontext.Context, configLoader loader.ConfigLo
 			}
 
 			ctx = ctx.WithConfig(config)
-			dependencies, err = dependency.NewManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{
-				Silent: true,
-			})
+			dependencies, err = dependency.NewManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{})
 			if err != nil {
 				ctx.Log.Warnf("Error resolving dependencies: %v", err)
 			}
diff --git a/cmd/print.go b/cmd/print.go
@@ -96,9 +96,7 @@ func (cmd *PrintCmd) Run(f factory.Factory) error {
 		WithKubeClient(client)
 
 	// resolve dependencies
-	dependencies, err := dependency.NewManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{
-		Silent: true,
-	})
+	dependencies, err := dependency.NewManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{})
 	if err != nil {
 		log.Warnf("Error resolving dependencies: %v", err)
 	}
diff --git a/cmd/reset/pods.go b/cmd/reset/pods.go
@@ -94,10 +94,7 @@ func (cmd *podsCmd) RunResetPods(f factory.Factory, cobraCmd *cobra.Command, arg
 		WithKubeClient(client)
 
 	// Resolve dependencies
-	dependencies, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{
-		Silent:  true,
-		Verbose: false,
-	})
+	dependencies, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{})
 	if err != nil {
 		cmd.log.Warnf("Error resolving dependencies: %v", err)
 	}
diff --git a/cmd/restart.go b/cmd/restart.go
@@ -130,9 +130,7 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {
 	}
 
 	// Resolve dependencies
-	dep, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{
-		Verbose: false,
-	})
+	dep, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{})
 	if err != nil {
 		cmd.log.Warnf("Error resolving dependencies: %v", err)
 	}
diff --git a/cmd/run.go b/cmd/run.go
@@ -181,9 +181,7 @@ func (cmd *RunCmd) RunRun(f factory.Factory, args []string) error {
 		}
 
 		ctx = ctx.WithConfig(config)
-		dependencies, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{
-			Silent: true,
-		})
+		dependencies, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{})
 		if err != nil {
 			return err
 		}
diff --git a/pkg/devspace/dependency/manager.go b/pkg/devspace/dependency/manager.go
@@ -3,7 +3,6 @@ package dependency
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"github.com/loft-sh/devspace/pkg/devspace/build"
 	"github.com/loft-sh/devspace/pkg/devspace/command"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
@@ -41,12 +40,10 @@ func NewManager(ctx *devspacecontext.Context, configOptions *loader.ConfigOption
 type ResolveOptions struct {
 	SkipDependencies []string
 	Dependencies     []string
-	Silent           bool
-	Verbose          bool
 }
 
 func (m *manager) ResolveAll(ctx *devspacecontext.Context, options ResolveOptions) ([]types.Dependency, error) {
-	dependencies, err := m.handleDependencies(ctx, options.SkipDependencies, options.Dependencies, false, options.Silent, options.Verbose, "Resolve", func(ctx *devspacecontext.Context, dependency *Dependency) error {
+	dependencies, err := m.handleDependencies(ctx, options.SkipDependencies, options.Dependencies, "Resolve", func(ctx *devspacecontext.Context, dependency *Dependency) error {
 		return nil
 	})
 	if err != nil {
@@ -81,15 +78,11 @@ type BuildOptions struct {
 	Verbose          bool
 }
 
-func (m *manager) handleDependencies(ctx *devspacecontext.Context, skipDependencies, filterDependencies []string, reverse, silent, verbose bool, actionName string, action func(ctx *devspacecontext.Context, dependency *Dependency) error) ([]types.Dependency, error) {
+func (m *manager) handleDependencies(ctx *devspacecontext.Context, skipDependencies, filterDependencies []string, actionName string, action func(ctx *devspacecontext.Context, dependency *Dependency) error) ([]types.Dependency, error) {
 	if ctx.Config == nil || ctx.Config.Config() == nil || len(ctx.Config.Config().Dependencies) == 0 {
 		return nil, nil
 	}
 
-	if !silent {
-		ctx.Log.Infof("Start resolving dependencies")
-	}
-
 	hooksErr := hook.ExecuteHooks(ctx, nil, "before:"+strings.ToLower(actionName)+"Dependencies")
 	if hooksErr != nil {
 		return nil, hooksErr
@@ -101,14 +94,7 @@ func (m *manager) handleDependencies(ctx *devspacecontext.Context, skipDependenc
 		return nil, errors.Wrap(err, "resolve dependencies")
 	}
 
-	if !silent {
-		ctx.Log.Donef("Resolved dependencies successfully")
-	}
-	if !silent && !verbose {
-		ctx.Log.Infof("To display the complete dependency execution log run with the '--verbose-dependencies' flag")
-	}
-
-	executedDependencies, err := m.executeDependenciesRecursive(ctx, "", dependencies, skipDependencies, filterDependencies, silent, verbose, actionName, action, map[string]bool{})
+	executedDependencies, err := m.executeDependenciesRecursive(ctx, "", dependencies, skipDependencies, filterDependencies, actionName, action, map[string]bool{})
 	if err != nil {
 		hooksErr := hook.ExecuteHooks(ctx, map[string]interface{}{
 			"error": err,
@@ -133,7 +119,6 @@ func (m *manager) executeDependenciesRecursive(
 	base string,
 	dependencies []types.Dependency,
 	skipDependencies, filterDependencies []string,
-	silent, verbose bool,
 	actionName string,
 	action func(ctx *devspacecontext.Context, dependency *Dependency) error,
 	executedDependenciesIDs map[string]bool,
@@ -173,7 +158,7 @@ func (m *manager) executeDependenciesRecursive(
 				return nil, hooksErr
 			}
 
-			_, err := m.executeDependenciesRecursive(dependencyCtx, dependencyName, dependency.Children(), skipDependencies, filterDependencies, silent, verbose, actionName, action, executedDependenciesIDs)
+			_, err := m.executeDependenciesRecursive(dependencyCtx, dependencyName, dependency.Children(), skipDependencies, filterDependencies, actionName, action, executedDependenciesIDs)
 			if err != nil {
 				hooksErr := hook.ExecuteHooks(dependencyCtx, map[string]interface{}{
 					"error": err,
@@ -199,16 +184,8 @@ func (m *manager) executeDependenciesRecursive(
 			continue
 		}
 
-		// execute dependency
-		if !silent && !verbose {
-			ctx.Log.Infof(fmt.Sprintf("%s dependency %s...", actionName, dependencyName))
-		}
-
 		// If not verbose log to a stream
-		if !verbose {
-			dependencyCtx = dependencyCtx.WithLogger(log.NewStreamLogger(buff, logrus.InfoLevel))
-		}
-
+		dependencyCtx = dependencyCtx.WithLogger(log.NewStreamLogger(buff, logrus.InfoLevel))
 		if dependency.Config() != nil {
 			pluginErr := plugin.ExecutePluginHookWithContext(map[string]interface{}{
 				"dependency_name":        dependency.Name(),
@@ -248,9 +225,6 @@ func (m *manager) executeDependenciesRecursive(
 		}
 
 		executedDependencies = append(executedDependencies, dependency)
-		if !silent {
-			ctx.Log.Donef("%s dependency %s completed", actionName, dependencyName)
-		}
 	}
 
 	return executedDependencies, nil
diff --git a/pkg/devspace/devpod/devpod.go b/pkg/devspace/devpod/devpod.go
@@ -232,10 +232,10 @@ func (d *devPod) getTerminalDevContainer(devPodConfig *latest.DevPod) *latest.De
 func (d *devPod) startTerminal(ctx *devspacecontext.Context, devContainer *latest.DevContainer, parent *tomb.Tomb) error {
 	parent.Go(func() error {
 		// make sure the global log is silent
-		before := log.GetInstance().GetLevel()
-		log.GetInstance().SetLevel(logrus.FatalLevel)
+		before := log.GetBaseInstance().GetLevel()
+		log.GetBaseInstance().SetLevel(logrus.PanicLevel)
 		err := terminal.StartTerminal(ctx, devContainer, newTargetSelector(d.selectedPod.Name, d.selectedPod.Namespace, parent), os.Stdout, os.Stderr, os.Stdin, parent)
-		log.GetInstance().SetLevel(before)
+		log.GetBaseInstance().SetLevel(before)
 		if err != nil {
 			return errors.Wrap(err, "error in terminal forwarding")
 		}
diff --git a/pkg/devspace/kubectl/selector/selector.go b/pkg/devspace/kubectl/selector/selector.go
@@ -8,7 +8,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/imageselector"
 
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
-	"github.com/loft-sh/devspace/pkg/util/hash"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -358,7 +357,7 @@ func byImageName(ctx context.Context, client kubectl.Client, namespace string, i
 						}
 					}
 					if pod.Labels != nil && pod.Labels[ReplacedLabel] == "true" && containers[container.Name] {
-						if pod.Annotations != nil && pod.Annotations[ImageSelectorAnnotation] != "" && pod.Annotations[ImageSelectorAnnotation] == hash.String(imageName)[:32] {
+						if pod.Annotations != nil && pod.Annotations[ImageSelectorAnnotation] != "" && pod.Annotations[ImageSelectorAnnotation] == imageName {
 							retPod := pod
 							retContainer := container
 							retPods = append(retPods, &SelectedPodContainer{
diff --git a/pkg/devspace/services/podreplace/builder.go b/pkg/devspace/services/podreplace/builder.go
@@ -12,6 +12,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl/selector"
 	"github.com/loft-sh/devspace/pkg/util/hash"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -48,14 +49,20 @@ func buildReplicaSet(ctx *devspacecontext.Context, name string, target runtime.O
 	case *appsv1.ReplicaSet:
 		replicaSet.Annotations[TargetNameAnnotation] = t.Name
 		replicaSet.Annotations[TargetKindAnnotation] = "ReplicaSet"
+		podTemplate.Labels = t.Spec.Template.Labels
+		podTemplate.Annotations = t.Spec.Template.Annotations
 		podTemplate.Spec = *t.Spec.Template.Spec.DeepCopy()
 	case *appsv1.Deployment:
 		replicaSet.Annotations[TargetNameAnnotation] = t.Name
 		replicaSet.Annotations[TargetKindAnnotation] = "Deployment"
+		podTemplate.Labels = t.Spec.Template.Labels
+		podTemplate.Annotations = t.Spec.Template.Annotations
 		podTemplate.Spec = *t.Spec.Template.Spec.DeepCopy()
 	case *appsv1.StatefulSet:
 		replicaSet.Annotations[TargetNameAnnotation] = t.Name
 		replicaSet.Annotations[TargetKindAnnotation] = "StatefulSet"
+		podTemplate.Labels = t.Spec.Template.Labels
+		podTemplate.Annotations = t.Spec.Template.Annotations
 		podTemplate.Spec = *t.Spec.Template.Spec.DeepCopy()
 		podTemplate.Spec.Hostname = strings.Replace(t.Name+"-0", ".", "-", -1)
 		for _, pvc := range t.Spec.VolumeClaimTemplates {
@@ -81,8 +88,6 @@ func buildReplicaSet(ctx *devspacecontext.Context, name string, target runtime.O
 	containers, err := matchesImageSelector(ctx, podTemplate, devPod)
 	if err != nil {
 		return nil, err
-	} else if len(containers) > 0 {
-		replicaSet.Annotations[selector.MatchedContainerAnnotation] = strings.Join(containers, ";")
 	}
 
 	// replace the image names
@@ -138,20 +143,37 @@ func buildReplicaSet(ctx *devspacecontext.Context, name string, target runtime.O
 	}
 
 	// reset the metadata
+	if podTemplate.Labels == nil {
+		podTemplate.Labels = map[string]string{}
+	}
+	if podTemplate.Annotations == nil {
+		podTemplate.Annotations = map[string]string{}
+	}
 	podTemplate.Labels[selector.ReplacedLabel] = "true"
 	imageSelector, err := hashImageSelector(ctx, devPod)
 	if err != nil {
 		return nil, err
 	} else if imageSelector != "" {
 		podTemplate.Annotations[selector.ImageSelectorAnnotation] = imageSelector
 	}
+	if len(containers) > 0 {
+		replicaSet.Annotations[selector.MatchedContainerAnnotation] = strings.Join(containers, ";")
+		podTemplate.Annotations[selector.MatchedContainerAnnotation] = strings.Join(containers, ";")
+	}
 
 	replicaSet.Spec = appsv1.ReplicaSetSpec{
 		Selector: &metav1.LabelSelector{
 			MatchLabels: podTemplate.ObjectMeta.Labels,
 		},
 		Template: *podTemplate,
 	}
+
+	// make sure labels etc are there
+	if ctx.Log.GetLevel() == logrus.DebugLevel {
+		out, _ := yaml.Marshal(podTemplate)
+		ctx.Log.Debugf("Replaced pod spec: \n%v\n", string(out))
+	}
+
 	return replicaSet, nil
 }
 
@@ -240,7 +262,7 @@ func hashImageSelector(ctx *devspacecontext.Context, replacePod *latest.DevPod)
 			return "", fmt.Errorf("couldn't resolve image selector: %v", replacePod.ImageSelector)
 		}
 
-		return hash.String(imageSelector.Image)[:32], nil
+		return imageSelector.Image, nil
 	}
 
 	return "", nil
@@ -257,7 +279,7 @@ func applyPodPatches(pod *corev1.PodTemplateSpec, devPod *latest.DevPod) (*corev
 	}
 
 	podRaw := map[string]interface{}{}
-	err = yaml.Unmarshal(podBytes, podRaw)
+	err = yaml.Unmarshal(podBytes, &podRaw)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/devspace/services/targetselector/target_selector.go b/pkg/devspace/services/targetselector/target_selector.go
@@ -193,6 +193,8 @@ func (t *targetSelector) WithContainer(container string) TargetSelector {
 }
 
 func (t *targetSelector) SelectSingleContainer(ctx context.Context, client kubectl.Client, log log.Logger) (*selector.SelectedPodContainer, error) {
+	log.Debugf("Start selecting a single container with selector %v", t.options.selector.String())
+
 	if t.options.waitingStrategy != nil {
 		t.options.waitingStrategy = t.options.waitingStrategy.Reset()
 	}
@@ -208,6 +210,8 @@ func (t *targetSelector) SelectSingleContainer(ctx context.Context, client kubec
 }
 
 func (t *targetSelector) SelectSinglePod(ctx context.Context, client kubectl.Client, log log.Logger) (*v1.Pod, error) {
+	log.Debugf("Start selecting a single pod with selector %v", t.options.selector.String())
+
 	if t.options.waitingStrategy != nil {
 		t.options.waitingStrategy = t.options.waitingStrategy.Reset()
 	}
@@ -328,7 +332,12 @@ func (t *targetSelector) selectSinglePod(ctx context.Context, client kubectl.Cli
 	// transform stack
 	pods := selector.PodsFromPodContainer(stack)
 	if options.waitingStrategy != nil {
-		return options.waitingStrategy.SelectPod(ctx, client, options.selector.Namespace, pods, log)
+		namespace := options.selector.Namespace
+		if namespace == "" {
+			namespace = client.Namespace()
+		}
+
+		return options.waitingStrategy.SelectPod(ctx, client, namespace, pods, log)
 	}
 
 	if len(pods) == 0 {
diff --git a/pkg/util/log/log.go b/pkg/util/log/log.go
@@ -1,13 +1,15 @@
 package log
 
 import (
+	"fmt"
 	"github.com/mgutz/ansi"
 	"github.com/sirupsen/logrus"
 	"os"
 	"strings"
 )
 
-var defaultLog Logger = NewStdoutLogger(os.Stdin, stdout, logrus.InfoLevel)
+var baseLog = NewStdoutLogger(os.Stdin, stdout, logrus.InfoLevel)
+var defaultLog = baseLog
 
 //var defaultLog Logger = NewStreamLoggerWithFormat(os.Stdin, logrus.InfoLevel, JsonFormat)
 
@@ -38,9 +40,20 @@ func GetInstance() Logger {
 	return defaultLog
 }
 
-// SetInstance sets the default logger instance
-func SetInstance(logger Logger) {
-	defaultLog = logger
+// GetBaseInstance returns the base stdout logger
+func GetBaseInstance() Logger {
+	return baseLog
+}
+
+func PrintLogInfo(logger Logger) {
+	printLogInfoRecursive("", logger)
+}
+
+func printLogInfoRecursive(prefix string, logger Logger) {
+	fmt.Printf("%s> %#+v\n", prefix, logger)
+	for _, l := range logger.Children() {
+		printLogInfoRecursive(prefix+"  ", l)
+	}
 }
 
 // WriteColored writes a message in color
diff --git a/pkg/util/log/prefix_logger.go b/pkg/util/log/prefix_logger.go
diff --git a/pkg/util/log/union_logger.go b/pkg/util/log/union_logger.go

Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,7 @@ func getImageSelector(ctx *devspacecontext.Context, configLoader loader.ConfigLo`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`ctx = ctx.WithConfig(config)`
`153`		`- dependencies, err = dependency.NewManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{`
`154`		`- Silent: true,`
`155`		`- })`
	`153`	`+ dependencies, err = dependency.NewManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{})`
`156`	`154`	`if err != nil {`
`157`	`155`	`ctx.Log.Warnf("Error resolving dependencies: %v", err)`
`158`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,7 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`// Resolve dependencies`
`133`		`- dep, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{`
`134`		`- Verbose: false,`
`135`		`- })`
	`133`	`+ dep, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{})`
`136`	`134`	`if err != nil {`
`137`	`135`	`cmd.log.Warnf("Error resolving dependencies: %v", err)`
`138`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,9 +181,7 @@ func (cmd *RunCmd) RunRun(f factory.Factory, args []string) error {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`ctx = ctx.WithConfig(config)`
`184`		`- dependencies, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{`
`185`		`- Silent: true,`
`186`		`- })`
	`184`	`+ dependencies, err := f.NewDependencyManager(ctx, configOptions).ResolveAll(ctx, dependency.ResolveOptions{})`
`187`	`185`	`if err != nil {`
`188`	`186`	`return err`
`189`	`187`	`}`