Fix hypeman TLS endpoints and Start cleanup rollback

Author: cursoragent

server/e2e/backend_hypeman.go

@@ -257,22 +257,36 @@ func (c *hypemanBackend) Start(ctx context.Context, cfg ContainerConfig) error {
 	}
 	c.instanceID = inst.ID
 
+	cleanupOnError := func(startErr error) error {
+		cleanupCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+		defer cancel()
+		if err := c.client.Instances.Delete(cleanupCtx, c.instanceID); err != nil {
+			return fmt.Errorf("%w (cleanup failed for instance %s: %v)", startErr, c.instanceID, err)
+		}
+		c.instanceID = ""
+		c.ip = ""
+		return startErr
+	}
+
 	// Wait for the guest program to start. The SDK caps the server-side wait at
 	// a few minutes; loop until our context deadline if needed.
 	if err := c.waitForRunning(ctx); err != nil {
-		return err
+		return cleanupOnError(err)
 	}
 
 	if c.useIngress {
 		// Ensure the wildcard ingress rules exist; endpoints derive from the
 		// instance name + domain, so no instance IP is needed.
-		return c.ensureIngress(ctx)
+		if err := c.ensureIngress(ctx); err != nil {
+			return cleanupOnError(err)
+		}
+		return nil
 	}
 
 	// Raw-IP fallback: reach the instance directly on its private network IP.
 	ip, err := c.resolveIP(ctx)
 	if err != nil {
-		return err
+		return cleanupOnError(err)
 	}
 	c.ip = ip
 	return nil

server/e2e/container.go

@@ -2,6 +2,7 @@ package e2e
 
 import (
 	"context"
+	"net/url"
 	"strings"
 	"testing"
 
@@ -68,12 +69,30 @@ func (c *TestContainer) ChromeDriverURL() string {
 // derived from ChromeDriverURL (without scheme). Useful for substring assertions
 // on proxy-rewritten URLs.
 func (c *TestContainer) ChromeDriverAddr() string {
-	return strings.TrimPrefix(c.backend.ChromeDriverURL(), "http://")
+	u, err := url.Parse(c.backend.ChromeDriverURL())
+	if err == nil && u.Host != "" {
+		return u.Host
+	}
+
+	addr := strings.TrimPrefix(c.backend.ChromeDriverURL(), "http://")
+	return strings.TrimPrefix(addr, "https://")
 }
 
 // ChromeDriverWSURL returns the WebSocket URL (ws://host:port/path) for the
 // instance's ChromeDriver proxy. path should include a leading slash.
 func (c *TestContainer) ChromeDriverWSURL(path string) string {
+	u, err := url.Parse(c.backend.ChromeDriverURL())
+	if err == nil && u.Host != "" {
+		if u.Scheme == "https" {
+			u.Scheme = "wss"
+		} else {
+			u.Scheme = "ws"
+		}
+		u.Path = path
+		u.RawQuery = ""
+		u.Fragment = ""
+		return u.String()
+	}
 	return "ws://" + c.ChromeDriverAddr() + path
 }
 

server/e2e/e2e_cdp_reconnect_test.go

@@ -456,8 +456,20 @@ func touchContainerFile(ctx context.Context, client *instanceoapi.ClientWithResp
 }
 
 func fetchBrowserWebSocketURL(ctx context.Context, c *TestContainer) (string, error) {
-	versionURL := fmt.Sprintf("http://%s/json/version", c.CDPAddr())
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, versionURL, nil)
+	versionURL, err := url.Parse(c.CDPURL())
+	if err != nil {
+		return "", err
+	}
+	if versionURL.Scheme == "wss" {
+		versionURL.Scheme = "https"
+	} else {
+		versionURL.Scheme = "http"
+	}
+	versionURL.Path = "/json/version"
+	versionURL.RawQuery = ""
+	versionURL.Fragment = ""
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, versionURL.String(), nil)
 	if err != nil {
 		return "", err
 	}