chore: merge main and impl tunnel

coder · deansheather · Mar 22, 2023 · Mar 7, 2023 · Mar 9, 2023 · Mar 9, 2023
commit 85edde2069f22a2dc9e631a60e0fb7c74267fbf2
diff --git a/cli/server.go b/cli/server.go
@@ -535,19 +535,27 @@ flags, and YAML configuration. The precedence is as follows:
 
 			// If the access URL is empty, we attempt to run a reverse-proxy
 			// tunnel to make the initial setup really simple.
-			var tunnel *tunnelsdk.Tunnel
-			if cfg.AccessURL.Value == "" {
+			var (
+				tunnel     *tunnelsdk.Tunnel
+				tunnelDone <-chan struct{} = make(chan struct{}, 1)
+			)
+			if cfg.AccessURL.String() == "" {
 				cmd.Printf("Opening tunnel so workspaces can connect to your deployment. For production scenarios, specify an external access URL\n")
 				tunnel, err = devtunnel.New(ctx, logger.Named("devtunnel"))
 				if err != nil {
 					return xerrors.Errorf("create tunnel: %w", err)
 				}
 				defer tunnel.Close()
-				cfg.AccessURL.Value = tunnel.URL.String()
+				tunnelDone = tunnel.Wait()
+				cfg.AccessURL = clibase.URL(*tunnel.URL)
 
-				if cfg.WildcardAccessURL.Value == "" {
+				if cfg.WildcardAccessURL.String() == "" {
 					// Suffixed wildcard access URL.
-					cfg.WildcardAccessURL.Value = fmt.Sprintf("*--%s", tunnel.URL.Hostname())
+					u, err := url.Parse(fmt.Sprintf("*--%s", tunnel.URL.Hostname()))
+					if err != nil {
+						return xerrors.Errorf("parse wildcard url: %w", err)
+					}
+					cfg.WildcardAccessURL = clibase.URL(*u)
 				}
 			}
 
@@ -1051,7 +1059,7 @@ flags, and YAML configuration. The precedence is as follows:
 				_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Bold.Render(
 					"Interrupt caught, gracefully exiting. Use ctrl+\\ to force quit",
 				))
-			case <-tunnel.Wait():
+			case <-tunnelDone:
 				exitErr = xerrors.New("dev tunnel closed unexpectedly")
 			case exitErr = <-errCh:
 			}

diff --git a/coderd/devtunnel/tunnel.go b/coderd/devtunnel/tunnel.go
@@ -39,6 +39,9 @@ func NewWithConfig(ctx context.Context, logger slog.Logger, cfg Config) (*tunnel
 	}
 
 	c := tunnelsdk.New(u)
+	if cfg.HTTPClient != nil {
+		c.HTTPClient = cfg.HTTPClient
+	}
 	return c.LaunchTunnel(ctx, tunnelsdk.TunnelConfig{
 		Log:        logger,
 		Version:    cfg.Version,
@@ -146,9 +149,14 @@ func GenerateConfig() (Config, error) {
 	spin.Suffix = " Finding the closest tunnel region..."
 	spin.Start()
 
-	node, err := FindClosestNode()
+	nodes, err := Nodes()
+	if err != nil {
+		return Config{}, xerrors.Errorf("get nodes: %w", err)
+	}
+	node, err := FindClosestNode(nodes)
 	if err != nil {
-		// If we fail to find the closest node, default to US East.
+		// If we fail to find the closest node, default to a random node from
+		// the first region.
 		region := Regions[0]
 		n, _ := cryptorand.Intn(len(region.Nodes))
 		node = region.Nodes[n]