Use CombinedLogger in workspace credentials server, fix git ts handler response type

Author: janekbaraniewski

pkg/credentials/server.go

@@ -16,49 +16,58 @@ import (
 	"github.com/loft-sh/devpod/pkg/agent/tunnel"
 	locald "github.com/loft-sh/devpod/pkg/daemon/platform"
 	workspaced "github.com/loft-sh/devpod/pkg/daemon/workspace"
+	devpodlog "github.com/loft-sh/devpod/pkg/log"
 	"github.com/loft-sh/devpod/pkg/ts"
 	"github.com/loft-sh/log"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
-const DefaultPort = "12049"
-const CredentialsServerPortEnv = "DEVPOD_CREDENTIALS_SERVER_PORT"
+const (
+	DefaultPort              = "12049"
+	CredentialsServerPortEnv = "DEVPOD_CREDENTIALS_SERVER_PORT"
+	CredentialsServerLogFile = "devpod-credentials-server.log"
+)
 
 // RunCredentialsServer starts a credentials server inside the DevPod workspace.
 func RunCredentialsServer(
 	ctx context.Context,
 	port int,
 	client tunnel.TunnelClient,
 	clientHost string,
-	log log.Logger,
+	logger log.Logger,
 ) error {
+	logPath := filepath.Join("/tmp", CredentialsServerLogFile)
+	fileLogger := log.NewFileLogger(logPath, logrus.DebugLevel)
+	combinedLogger := devpodlog.NewCombinedLogger(logrus.DebugLevel, logger, fileLogger)
+
 	var handler http.Handler = http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-		log.Debugf("Incoming client connection at %s", request.URL.Path)
+		combinedLogger.Debugf("Incoming client connection at %s", request.URL.Path)
 		if request.URL.Path == "/git-credentials" {
-			err := handleGitCredentialsRequest(ctx, writer, request, client, clientHost, log)
+			err := handleGitCredentialsRequest(ctx, writer, request, client, clientHost, combinedLogger)
 			if err != nil {
 				http.Error(writer, err.Error(), http.StatusInternalServerError)
 				return
 			}
 		} else if request.URL.Path == "/docker-credentials" {
-			err := handleDockerCredentialsRequest(ctx, writer, request, client, log)
+			err := handleDockerCredentialsRequest(ctx, writer, request, client, combinedLogger)
 			if err != nil {
 				http.Error(writer, err.Error(), http.StatusInternalServerError)
 				return
 			}
 		} else if request.URL.Path == "/git-ssh-signature" {
-			err := handleGitSSHSignatureRequest(ctx, writer, request, client, log)
+			err := handleGitSSHSignatureRequest(ctx, writer, request, client, combinedLogger)
 			if err != nil {
 				http.Error(writer, err.Error(), http.StatusInternalServerError)
 				return
 			}
 		} else if request.URL.Path == "/loft-platform-credentials" {
-			err := handleLoftPlatformCredentialsRequest(ctx, writer, request, client, log)
+			err := handleLoftPlatformCredentialsRequest(ctx, writer, request, client, combinedLogger)
 			if err != nil {
 				http.Error(writer, err.Error(), http.StatusInternalServerError)
 			}
 		} else if request.URL.Path == "/gpg-public-keys" {
-			err := handleGPGPublicKeysRequest(ctx, writer, request, client, log)
+			err := handleGPGPublicKeysRequest(ctx, writer, request, client, combinedLogger)
 			if err != nil {
 				http.Error(writer, err.Error(), http.StatusInternalServerError)
 			}
@@ -70,7 +79,7 @@ func RunCredentialsServer(
 
 	errChan := make(chan error, 1)
 	go func() {
-		log.Debugf("Credentials server started on port %d...", port)
+		combinedLogger.Debugf("Credentials server started on port %d...", port)
 
 		// always returns error. ErrServerClosed on graceful close
 		if err := srv.ListenAndServe(); err != http.ErrServerClosed {
@@ -192,7 +201,8 @@ func handleGitCredentialsOverTSNet(ctx context.Context, writer http.ResponseWrit
 	log.Infof("Response: %s", string(respBody))
 
 	// Write the response back to the original response.
-	writer.WriteHeader(resp.StatusCode)
+	writer.Header().Set("Content-Type", "application/json")
+	writer.WriteHeader(http.StatusOK)
 	if _, err := writer.Write(respBody); err != nil {
 		log.Errorf("Error writing response to client: %v", err)
 		return errors.Wrap(err, "write response")