orchestrator: renamed session proxy to sandbox proxy

Author: sitole

packages/orchestrator/cmd/mock-sandbox/mock.go

@@ -108,7 +108,7 @@ func mockSandbox(
 	buildId,
 	sandboxId string,
 	dns *dns.DNS,
-	proxy *proxy.SessionProxy,
+	proxy *proxy.SandboxProxy,
 	keepAlive time.Duration,
 	networkPool *network.Pool,
 	templateCache *template.Cache,

packages/orchestrator/cmd/mock-snapshot/mock.go

@@ -116,7 +116,7 @@ func mockSnapshot(
 	buildId,
 	sandboxId string,
 	dns *dns.DNS,
-	proxy *proxy.SessionProxy,
+	proxy *proxy.SandboxProxy,
 	keepAlive time.Duration,
 	networkPool *network.Pool,
 	templateCache *template.Cache,

packages/orchestrator/internal/proxy/proxy.go

@@ -23,29 +23,29 @@ var browserIdentityKeywords = []string{
 	"mozilla", "chrome", "safari", "firefox", "edge", "opera", "msie",
 }
 
-type SessionProxy struct {
+type SandboxProxy struct {
 	sandboxes *smap.Map[string]
 	server    *http.Server
 }
 
-func New(port uint) *SessionProxy {
+func New(port uint) *SandboxProxy {
 	server := &http.Server{Addr: fmt.Sprintf(":%d", port)}
 
-	return &SessionProxy{
+	return &SandboxProxy{
 		server:    server,
 		sandboxes: smap.New[string](),
 	}
 }
 
-func (p *SessionProxy) AddSandbox(sandboxID, ip string) {
+func (p *SandboxProxy) AddSandbox(sandboxID, ip string) {
 	p.sandboxes.Insert(sandboxID, ip)
 }
 
-func (p *SessionProxy) RemoveSandbox(sandboxID string) {
+func (p *SandboxProxy) RemoveSandbox(sandboxID string) {
 	p.sandboxes.Remove(sandboxID)
 }
 
-func (p *SessionProxy) Start() error {
+func (p *SandboxProxy) Start() error {
 	// similar values to our old the nginx configuration
 	serverTransport := &http.Transport{
 		Proxy:                 http.ProxyFromEnvironment,
@@ -61,14 +61,14 @@ func (p *SessionProxy) Start() error {
 	return p.server.ListenAndServe()
 }
 
-func (p *SessionProxy) Shutdown(ctx context.Context) {
+func (p *SandboxProxy) Shutdown(ctx context.Context) {
 	err := p.server.Shutdown(ctx)
 	if err != nil {
 		zap.L().Error("failed to shutdown proxy server", zap.Error(err))
 	}
 }
 
-func (p *SessionProxy) proxyHandler(transport *http.Transport) func(w http.ResponseWriter, r *http.Request) {
+func (p *SandboxProxy) proxyHandler(transport *http.Transport) func(w http.ResponseWriter, r *http.Request) {
 	activeConnections, err := meters.GetUpDownCounter(meters.ActiveConnectionsCounterMeterName)
 	if err != nil {
 		zap.L().Error("failed to create active connections counter", zap.Error(err))
@@ -146,7 +146,7 @@ func (p *SessionProxy) proxyHandler(transport *http.Transport) func(w http.Respo
 	}
 }
 
-func (p *SessionProxy) buildHtmlClosedPortError(sandboxId string, host string, port uint64) []byte {
+func (p *SandboxProxy) buildHtmlClosedPortError(sandboxId string, host string, port uint64) []byte {
 	replacements := map[string]string{
 		"{{sandbox_id}}":   sandboxId,
 		"{{sandbox_port}}": strconv.FormatUint(port, 10),
@@ -161,7 +161,7 @@ func (p *SessionProxy) buildHtmlClosedPortError(sandboxId string, host string, p
 	return []byte(adjustedErrTemplate)
 }
 
-func (p *SessionProxy) buildJsonClosedPortError(sandboxId string, port uint64) []byte {
+func (p *SandboxProxy) buildJsonClosedPortError(sandboxId string, port uint64) []byte {
 	response := map[string]interface{}{
 		"error":      "The sandbox is running but port is not open",
 		"sandbox_id": sandboxId,
@@ -172,7 +172,7 @@ func (p *SessionProxy) buildJsonClosedPortError(sandboxId string, port uint64) [
 	return responseBytes
 }
 
-func (p *SessionProxy) isBrowser(userAgent string) bool {
+func (p *SandboxProxy) isBrowser(userAgent string) bool {
 	userAgent = strings.ToLower(userAgent)
 	for _, keyword := range browserIdentityKeywords {
 		if strings.Contains(userAgent, keyword) {

packages/orchestrator/internal/sandbox/sandbox_linux.go

@@ -87,7 +87,7 @@ func NewSandbox(
 	ctx context.Context,
 	tracer trace.Tracer,
 	dns *dns.DNS,
-	proxy *proxy.SessionProxy,
+	proxy *proxy.SandboxProxy,
 	networkPool *network.Pool,
 	templateCache *template.Cache,
 	config *orchestrator.SandboxConfig,

packages/orchestrator/internal/sandbox/sandbox_other.go

@@ -69,13 +69,13 @@ func (s *Sandbox) LoggerMetadata() sbxlogger.SandboxMetadata {
 // Run cleanup functions for the already initialized resources if there is any error or after you are done with the started sandbox.
 func NewSandbox(
 
-// YOU ARE IN SANDBOX_OTHER.GO
-// YOU PROBABLY WANT TO BE IN SANDBOX_LINUX.GO
+	// YOU ARE IN SANDBOX_OTHER.GO
+	// YOU PROBABLY WANT TO BE IN SANDBOX_LINUX.GO
 
 	ctx context.Context,
 	tracer trace.Tracer,
 	dns *dns.DNS,
-	proxy *proxy.SessionProxy,
+	proxy *proxy.SandboxProxy,
 	networkPool *network.Pool,
 	templateCache *template.Cache,
 	config *orchestrator.SandboxConfig,

packages/orchestrator/internal/server/main.go

@@ -39,7 +39,7 @@ type server struct {
 	orchestrator.UnimplementedSandboxServiceServer
 	sandboxes       *smap.Map[*sandbox.Sandbox]
 	dns             *dns.DNS
-	proxy           *proxy.SessionProxy
+	proxy           *proxy.SandboxProxy
 	tracer          trace.Tracer
 	networkPool     *network.Pool
 	templateCache   *template.Cache
@@ -56,7 +56,7 @@ type Service struct {
 	server   *server
 	grpc     *grpc.Server
 	dns      *dns.DNS
-	proxy    *proxy.SessionProxy
+	proxy    *proxy.SandboxProxy
 	port     uint16
 	shutdown struct {
 		once sync.Once
@@ -71,7 +71,7 @@ type Service struct {
 	useClickhouseMetrics string
 }
 
-func New(ctx context.Context, port uint, clientID string, proxy *proxy.SessionProxy) (*Service, error) {
+func New(ctx context.Context, port uint, clientID string, proxy *proxy.SandboxProxy) (*Service, error) {
 	if port > math.MaxUint16 {
 		return nil, fmt.Errorf("%d is larger than maximum possible port %d", port, math.MaxInt16)
 	}