tests: fix logger

Author: FabianKramm

cmd/deploy.go

@@ -309,12 +309,15 @@ func runPipeline(ctx *devspacecontext.Context, f factory.Factory, forceLeader bo
 	}
 	ctx.Log.Debugf("Marked project excluded: %v", ctx.Config.Config().Name)
 
+	// get a writer
+	writer := ctx.Log.Writer(ctx.Log.GetLevel())
+	defer writer.Close()
+
 	// start pipeline
-	err = pipe.Run(ctx.WithLogger(ctx.Log.WithoutPrefix()))
+	err = pipe.Run(ctx.WithLogger(logpkg.NewStreamLoggerWithFormat(writer, ctx.Log.GetLevel(), logpkg.TimeFormat)))
 	if err != nil {
 		return err
 	}
-
 	ctx.Log.Debugf("Wait for dev to finish")
 
 	// wait for dev

cmd/root.go

@@ -297,13 +297,15 @@ func parseConfig(f factory.Factory) (*RawConfig, error) {
 	timeoutCtx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 
-	r := &RawConfig{}
+	r := &RawConfig{
+		resolved: map[string]string{},
+	}
 	_, err = configLoader.LoadWithParser(timeoutCtx, nil, nil, r, &loader.ConfigOptions{Dry: true}, log.Discard)
-	if err != nil {
-		return nil, err
+	if r.Resolver != nil {
+		return r, nil
 	}
 
-	return r, nil
+	return nil, err
 }
 
 type RawConfig struct {

e2e/tests/imports/imports.go

@@ -29,7 +29,7 @@ var _ = DevSpaceDescribe("imports", func() {
 		framework.ExpectNoError(err)
 	})
 
-	ginkgo.FIt("should import correctly", func() {
+	ginkgo.It("should import correctly", func() {
 		tempDir, err := framework.CopyToTempDir("tests/imports/testdata/local")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)

examples/pipelines/devspace.yaml

@@ -2,10 +2,12 @@ version: v2beta1
 name: pipelines
 
 vars:
-  HELLO: ${LOFT_CLUSTER}
+  HELLO: test
+  DEVSPACE_LOG_TIMESTAMPS: true
 
 pipelines:
   dev:
     steps:
       - run: |-
+          create_deployments test --set helm.values.containers[0].image=ubuntu
           echo "${HELLO} ${DEVSPACE_NAMESPACE}"

pkg/devspace/build/builder/docker/docker.go

@@ -170,7 +170,7 @@ func (b *Builder) BuildImage(ctx *devspacecontext.Context, contextPath, dockerfi
 	}
 
 	// Check if we skip push
-	if !b.skipPush || !b.helper.ImageConf.SkipPush {
+	if !b.skipPush && !b.helper.ImageConf.SkipPush {
 		for _, tag := range buildOptions.Tags {
 			err = b.pushImage(writer, tag)
 			if err != nil {

pkg/devspace/pipeline/engine/pipelinehandler/handler.go

@@ -56,7 +56,7 @@ func (e *execHandler) handlePipelineCommands(ctx context.Context, command string
 	if e.stdout != nil && e.stdout == hc.Stdout {
 		devCtx = devCtx.WithLogger(e.ctx.Log)
 	} else {
-		devCtx = devCtx.WithLogger(log.NewStreamLogger(hc.Stdout, logrus.InfoLevel).WithoutPrefix())
+		devCtx = devCtx.WithLogger(log.NewStreamLoggerWithFormat(hc.Stdout, logrus.InfoLevel, log.RawFormat))
 	}
 
 	switch command {

pkg/util/log/discard_logger.go

@@ -57,10 +57,6 @@ func (d *DiscardLogger) Fatalf(format string, args ...interface{}) {
 	os.Exit(1)
 }
 
-func (d *DiscardLogger) WithoutPrefix() Logger {
-	return d
-}
-
 // Done implements logger interface
 func (d *DiscardLogger) Done(args ...interface{}) {}
 

pkg/util/log/file_logger.go

@@ -31,7 +31,7 @@ type fileLogger struct {
 }
 
 func GetDevPodFileLogger(devPodName string) Logger {
-	return GetFileLogger("devpod-" + devPodName)
+	return GetFileLogger("devpod-" + strings.TrimSpace(devPodName))
 }
 
 // GetFileLogger returns a logger instance for the specified filename
@@ -312,10 +312,6 @@ func (f *fileLogger) Question(params *survey.QuestionOptions) (string, error) {
 	return "", errors.New("questions in file logger not supported")
 }
 
-func (f *fileLogger) WithoutPrefix() Logger {
-	return f
-}
-
 // WithLevel implements logger interface
 func (f *fileLogger) WithLevel(level logrus.Level) Logger {
 	f.m.Lock()

pkg/util/log/logger.go

@@ -52,10 +52,6 @@ type Logger interface {
 	// WithLevel creates a new logger with the given level
 	WithLevel(level logrus.Level) Logger
 
-	// WithoutPrefix returns a new logger of the same type
-	// but disables the current loggers prefixes.
-	WithoutPrefix() Logger
-
 	// Children can be used to gather child loggers of the current logger
 	Children() []Logger
 }

pkg/util/log/prefix_logger.go

@@ -60,10 +60,6 @@ type prefixLogger struct {
 	m sync.Mutex
 }
 
-func (s *prefixLogger) WithoutPrefix() Logger {
-	return s.base
-}
-
 func (s *prefixLogger) Children() []Logger {
 	return []Logger{s.base}
 }