fix merge issue

Quinn-With-Two-Ns · Quinn-With-Two-Ns · commit 28f521e6254a · 2024-06-10T10:13:34.000-07:00
diff --git a/cmd/run.go b/cmd/run.go
@@ -273,7 +273,7 @@ func (r *Runner) Run(ctx context.Context, patterns []string) error {
 		if err != nil {
 			return fmt.Errorf("could not start http proxy server: %w", err)
 		}
-		r.config.HTTPProxyURL = "https://" + httpProxyServer.Address
+		r.config.HTTPProxyURL = "http://" + httpProxyServer.Address
 		r.log.Info("Started HTTP CONNECT proxy server", "address", httpProxyServer.Address)
 		defer httpProxyServer.Close()
 	}

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ func (r *Runner) Run(ctx context.Context, patterns []string) error {`
`273`	`273`	`if err != nil {`
`274`	`274`	`return fmt.Errorf("could not start http proxy server: %w", err)`
`275`	`275`	`}`
`276`		`- r.config.HTTPProxyURL = "https://" + httpProxyServer.Address`
	`276`	`+ r.config.HTTPProxyURL = "http://" + httpProxyServer.Address`
`277`	`277`	`r.log.Info("Started HTTP CONNECT proxy server", "address", httpProxyServer.Address)`
`278`	`278`	`defer httpProxyServer.Close()`
`279`	`279`	`}`