Add GetClient helper to workspace network package

Author: janekbaraniewski

pkg/credentials/server.go

@@ -11,11 +11,9 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"time"
 
 	"github.com/loft-sh/devpod/pkg/agent/tunnel"
 	locald "github.com/loft-sh/devpod/pkg/daemon/local"
-	workspaced "github.com/loft-sh/devpod/pkg/daemon/workspace"
 	network "github.com/loft-sh/devpod/pkg/daemon/workspace/network"
 	devpodlog "github.com/loft-sh/devpod/pkg/log"
 	"github.com/loft-sh/devpod/pkg/ts"
@@ -159,19 +157,9 @@ func handleGitCredentialsOverTSNet(ctx context.Context, writer http.ResponseWrit
 	defer request.Body.Close()
 
 	log.Infof("Received git credentials post data: %s", string(bodyBytes))
-	// Set up HTTP transport that uses our network socket.
-	socketPath := filepath.Join(workspaced.RootDir, network.NetworkProxySocket)
-	transport := &http.Transport{
-		Dial: func(network, addr string) (net.Conn, error) {
-			return net.Dial("unix", socketPath)
-		},
-	}
-
-	client := &http.Client{
-		Transport: transport,
-		Timeout:   30 * time.Second, // TODO: extract this to config
-	}
 
+	// Create a DevPod network client to local credentials server
+	client := network.GetClient()
 	credServerAddress := ts.EnsureURL(clientHost, locald.LocalCredentialsServerPort)
 	targetURL := fmt.Sprintf("http://%s%s", credServerAddress, request.URL.RequestURI())
 
@@ -183,7 +171,7 @@ func handleGitCredentialsOverTSNet(ctx context.Context, writer http.ResponseWrit
 	}
 	newReq.Header = request.Header.Clone()
 
-	log.Infof("Forwarding request to %s via socket %s", targetURL, socketPath)
+	log.Infof("Forwarding request to %s", targetURL)
 
 	// Execute the request.
 	resp, err := client.Do(newReq)

pkg/daemon/workspace/network/client.go

@@ -0,0 +1,26 @@
+package network
+
+import (
+	"net"
+	"net/http"
+	"path/filepath"
+	"time"
+)
+
+// GetClient returns a new HTTP client that uses a DevPod network socket for communication.
+func GetClient() *http.Client {
+	// Set up HTTP transport that uses our network socket.
+	socketPath := filepath.Join(RootDir, NetworkProxySocket)
+	transport := &http.Transport{
+		Dial: func(network, addr string) (net.Conn, error) {
+			return net.Dial("unix", socketPath)
+		},
+	}
+
+	client := &http.Client{
+		Transport: transport,
+		Timeout:   30 * time.Second, // TODO: extract this to config
+	}
+
+	return client
+}

pkg/daemon/workspace/network/port_forward.go

@@ -18,6 +18,7 @@ const (
 
 	RunnerProxySocket  string = "runner-proxy.sock"
 	NetworkProxySocket string = "devpod-net.sock"
+	RootDir            string = "/var/devpod"
 
 	netMapCooldown = 30 * time.Second
 )