chore: sync some commits (keploy#1687)

Signed-off-by: gouravkrosx <gouravgreatkr@gmail.com>

pkg/core/app/app.go

@@ -444,6 +444,8 @@ func (a *App) run(ctx context.Context) models.AppError {
 	username := os.Getenv("SUDO_USER")
 	cmd := exec.CommandContext(ctx, "sh", "-c", a.cmd)
 	if username != "" {
+		// print all environment variables
+		a.logger.Debug("env inherited from the cmd", zap.Any("env", os.Environ()))
 		// Run the command as the user who invoked sudo to preserve the user environment variables and PATH
 		cmd = exec.CommandContext(ctx, "sudo", "-E", "-u", os.Getenv("SUDO_USER"), "env", "PATH="+os.Getenv("PATH"), "sh", "-c", a.cmd)
 	}
@@ -460,9 +462,6 @@ func (a *App) run(ctx context.Context) models.AppError {
 		Setpgid: true,
 	}
 
-	// Explicitly set the environment for cmd
-	cmd.Env = os.Environ()
-
 	// Set the output of the command
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

pkg/core/hooks/conn/factory.go

@@ -129,10 +129,11 @@ func capture(_ context.Context, logger *zap.Logger, t chan *models.TestCase, req
 			Timestamp: reqTimeTest,
 		},
 		HTTPResp: models.HTTPResp{
-			StatusCode: resp.StatusCode,
-			Header:     pkg.ToYamlHTTPHeader(resp.Header),
-			Body:       string(respBody),
-			Timestamp:  resTimeTest,
+			StatusCode:    resp.StatusCode,
+			Header:        pkg.ToYamlHTTPHeader(resp.Header),
+			Body:          string(respBody),
+			Timestamp:     resTimeTest,
+			StatusMessage: http.StatusText(resp.StatusCode),
 		},
 		Noise: map[string][]string{},
 		// Mocks: mocks,

pkg/core/proxy/proxy.go

@@ -406,10 +406,15 @@ func (p *Proxy) handleConnection(ctx context.Context, srcConn net.Conn) error {
 		}
 
 		addr := fmt.Sprintf("%v:%v", dstURL, destInfo.Port)
-		dstConn, err = tls.Dial("tcp", addr, cfg)
-		if err != nil {
-			utils.LogError(logger, err, "failed to dial the conn to destination server", zap.Any("proxy port", p.Port), zap.Any("server address", dstAddr))
-			return err
+		if rule.Mode != models.MODE_TEST {
+			dialer := &net.Dialer{
+				Timeout: 1 * time.Second,
+			}
+			dstConn, err = tls.DialWithDialer(dialer, "tcp", addr, cfg)
+			if err != nil {
+				utils.LogError(logger, err, "failed to dial the conn to destination server", zap.Any("proxy port", p.Port), zap.Any("server address", dstAddr))
+				return err
+			}
 		}
 
 		dstCfg.TLSCfg = cfg

pkg/service/replay/replay.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
@@ -411,8 +412,8 @@ func (r *replayer) RunTestSet(ctx context.Context, testSetID string, testRunID s
 					Binary:        testCase.HTTPResp.Binary,
 					Timestamp:     testCase.HTTPResp.Timestamp,
 				},
-				TestCasePath: r.config.Path,
-				MockPath:     r.config.Path,
+				TestCasePath: filepath.Join(r.config.Path, testSetID),
+				MockPath:     filepath.Join(r.config.Path, testSetID, "mocks.yaml"),
 				Noise:        testCase.Noise,
 				Result:       *testResult,
 			}

utils/utils.go

@@ -364,7 +364,7 @@ type TestFlags struct {
 func getAlias(ctx context.Context, logger *zap.Logger) (string, error) {
 	// Get the name of the operating system.
 	osName := runtime.GOOS
-	//TODO: configure the hardcoded port mapping
+	//TODO: configure the hardcoded port mapping & check if (/.keploy-config:/root/.keploy-config) can be removed from all the aliases
 	switch osName {
 	case "linux":
 		alias := "sudo docker run --pull always --name keploy-v2 -e BINARY_TO_DOCKER=true -p 16789:16789 --privileged --pid=host -it -v " + os.Getenv("PWD") + ":" + os.Getenv("PWD") + " -w " + os.Getenv("PWD") + " -v /sys/fs/cgroup:/sys/fs/cgroup -v /sys/kernel/debug:/sys/kernel/debug -v /sys/fs/bpf:/sys/fs/bpf -v /var/run/docker.sock:/var/run/docker.sock -v " + os.Getenv("HOME") + "/.keploy-config:/root/.keploy-config -v " + os.Getenv("HOME") + "/.keploy:/root/.keploy --rm ghcr.io/keploy/keploy "