[ws-daemon] Improve error when content init fails

Author: Christian Weichel

components/content-service/pkg/git/git.go

@@ -132,16 +132,16 @@ func (s *Status) ToAPI() *csapi.GitStatus {
 	}
 }
 
-// ErrGitOpFailed is returned by GitWithOutput if the operation fails
+// GitOpFailedError is returned by GitWithOutput if the operation fails
 // e.g. returns with a non-zero exit code.
-type ErrGitOpFailed struct {
+type GitOpFailedError struct {
 	Subcommand string
 	Args       []string
 	ExecErr    error
 	Output     string
 }
 
-func (e ErrGitOpFailed) Error() string {
+func (e GitOpFailedError) Error() string {
 	return fmt.Sprintf("git %s %s failed (%v): %v", e.Subcommand, strings.Join(e.Args, " "), e.ExecErr, e.Output)
 }
 
@@ -186,7 +186,7 @@ func (c *Client) GitWithOutput(ctx context.Context, subcommand string, args ...s
 
 	res, err := cmd.CombinedOutput()
 	if err != nil {
-		return nil, ErrGitOpFailed{
+		return nil, GitOpFailedError{
 			Args:       args,
 			ExecErr:    err,
 			Output:     string(res),

components/content-service/pkg/initializer/prebuild.go

@@ -87,7 +87,7 @@ func (p *PrebuildInitializer) Run(ctx context.Context, mappings []archive.IDMapp
 	if git.IsWorkingCopy(p.Git.Location) {
 		out, err := p.Git.GitWithOutput(ctx, "stash", "push", "-u")
 		if err != nil {
-			var giterr git.ErrGitOpFailed
+			var giterr git.GitOpFailedError
 			if errors.As(err, &giterr) && strings.Contains(giterr.Output, "You do not have the initial commit yet") {
 				// git stash push returns a non-zero exit code if the repository does not have a single commit.
 				// In this case that's not an error though, hence we don't want to fail here.

components/ws-daemon/pkg/content/initializer.go

@@ -15,13 +15,15 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"syscall"
 
 	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/tracing"
 	csapi "github.com/gitpod-io/gitpod/content-service/api"
 	"github.com/gitpod-io/gitpod/content-service/pkg/archive"
 	wsinit "github.com/gitpod-io/gitpod/content-service/pkg/initializer"
 	"github.com/gitpod-io/gitpod/content-service/pkg/storage"
+	"github.com/sirupsen/logrus"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/opencontainers/runtime-spec/specs-go"
@@ -233,6 +235,13 @@ func RunInitializer(ctx context.Context, destination string, initializer *csapi.
 	cmd.Stdin = os.Stdin
 	err = cmd.Run()
 	if err != nil {
+		if exiterr, ok := err.(*exec.ExitError); ok {
+			// The program has exited with an exit code != 0. If it's 42, it was deliberate.
+			if status, ok := exiterr.Sys().(syscall.WaitStatus); ok && status.ExitStatus() == 42 {
+				return fmt.Errorf("content initializer failed")
+			}
+		}
+
 		return err
 	}
 
@@ -251,6 +260,7 @@ func RunInitializerChild() (err error) {
 	if err != nil {
 		return err
 	}
+	log.Log = logrus.WithFields(initmsg.OWI)
 
 	defer func() {
 		if err != nil {