PR feedback

Author: pspieker-stripe

https.go

@@ -38,7 +38,7 @@ var (
 	HTTPMitmConnect               = &ConnectAction{Action: ConnectHTTPMitm, TLSConfig: TLSConfigFromCA(&GoproxyCa)}
 	RejectConnect                 = &ConnectAction{Action: ConnectReject, TLSConfig: TLSConfigFromCA(&GoproxyCa)}
 	httpsRegexp                   = regexp.MustCompile(`^https:\/\/`)
-	PerRequestHTTPSProxyHeaderKey = "X-Https-Proxy"
+	PerRequestHTTPSProxyHeaderKey = "X-Upstream-Https-Proxy"
 )
 
 type ConnectAction struct {
@@ -593,10 +593,6 @@ func httpsProxyAddr(reqURL *url.URL, httpsProxy string) (string, error) {
 	reqSchemeURL.Scheme = "https"
 
 	proxyURL, err := cfg.ProxyFunc()(reqSchemeURL)
-	if err != nil {
-		return "", err
-	}
-
 	if err != nil {
 		return "", err
 	}

proxy_test.go

@@ -774,12 +774,11 @@ func TestOverrideHttpsProxyAddrsFromEnvWithRequest(t *testing.T) {
 		TLSClientConfig: acceptAllCerts,
 		Proxy:           http.ProxyURL(egressProxyUrl),
 		ProxyConnectHeader: map[string][]string{
-			"X-Https-Proxy": {fakeExternalProxyTestStruct.URL},
+			goproxy.PerRequestHTTPSProxyHeaderKey: {fakeExternalProxyTestStruct.URL},
 		},
 	}
 	client := &http.Client{Transport: tr}
 
-	// r := string(getOrFail(finalDestinationUrl, client, t))
 	req, err := http.NewRequest("GET", finalDestinationUrl, nil)
 	if err != nil {
 		t.Fatal("Unable to construct request!")
@@ -804,7 +803,7 @@ func TestOverrideHttpsProxyAddrsFromEnvWithRequest(t *testing.T) {
 	}
 
 	// Ensuring the external proxy was routed through
-	if resBody[len(resBody)-14:] != "-externalproxy" {
+	if !strings.Contains(resBody, "-externalproxy") {
 		t.Error("Expected the request have been passed through the external proxy on the way to the final destination!")
 	}