Fix failing tests

docker-compose.yml

@@ -15,6 +15,7 @@ services:
       --filter.zones=api.ipify.org
       --exclude.hostnames=ipify.org
     ports:
+    - "8000:8000"
     - "8443:8443"
 
   machine:

e2e/proxy_test.go

@@ -109,7 +109,7 @@ func getForwarderIP() (string, error) {
 }
 
 func checkIP(apiURL string) (string, error) {
-	cmd, args := execInTestMachineCmd("curl", "-s", apiURL)
+	cmd, args := execInTestMachineCmd("curl", "--silent", "--fail", "--max-time", "5", apiURL)
 	return sh.Output(cmd, args...)
 }
 

metrics/service.go

@@ -1,9 +1,27 @@
+/*
+ * Copyright (C) 2024 The "MysteriumNetwork/openvpn-forwarder" Authors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package metrics
 
 import (
+	"time"
+
 	"github.com/mysteriumnetwork/openvpn-forwarder/proxy"
 	"github.com/prometheus/client_golang/prometheus"
-	"time"
 )
 
 var _ proxy.Listener = (*Service)(nil)

proxy/context.go

@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2024 The "MysteriumNetwork/openvpn-forwarder" Authors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package proxy
 
 import (

proxy/dialer_http_connect_test.go

@@ -33,7 +33,7 @@ func Test_dialerHTTPConnect_DialCreatesValidRequest(t *testing.T) {
 	server.run()
 	defer server.stop()
 
-	dialer := &dialerHTTPConnect{forwardDialer: DialerDirect, forwardAddress: ":6969"}
+	dialer := &dialerHTTPConnect{forwardDialer: DialerDirect, forwardURL: &url.URL{Host: ":6969"}}
 	conn, err := dialer.Dial("tcp", "domain.com:80")
 	assert.NotNil(t, conn)
 	assert.NoError(t, err)

proxy/server_test.go

@@ -36,11 +36,11 @@ func Test_Server_ServeHTTP(t *testing.T) {
 	upstreamAddr := upstreamServer.run()
 	defer upstreamServer.stop()
 
-	upstreamDialer := NewDialerHTTPConnect(DialerDirect, upstreamAddr, "", "", "")
+	upstreamDialer := NewDialerHTTPConnect(DialerDirect, &url.URL{Host: upstreamAddr}, "", "", "")
 
 	req, _ := http.NewRequest("GET", "http://domain.com", nil)
 
-	proxyServer := NewServer(nil, []net.IP{net.ParseIP("::1")}, upstreamDialer, &url.URL{}, &stickyMapperStub{}, &noopTracer{}, nil)
+	proxyServer := NewServer(nil, []net.IP{net.ParseIP("::1")}, upstreamDialer, &stickyMapperStub{}, &noopTracer{}, nil, nil)
 	proxyAddr := listenAndServe(proxyServer)
 
 	proxyURL, _ := url.Parse("http://" + proxyAddr)
@@ -63,11 +63,11 @@ func Test_Server_AuthHeaderAdded(t *testing.T) {
 	upstreamAddr := upstreamServer.run()
 	defer upstreamServer.stop()
 
-	upstreamDialer := NewDialerHTTPConnect(DialerDirect, upstreamAddr, "uuuu", "1234", "")
+	upstreamDialer := NewDialerHTTPConnect(DialerDirect, &url.URL{Host: upstreamAddr}, "uuuu", "1234", "")
 
 	req, _ := http.NewRequest("GET", "http://domain.com", nil)
 
-	proxyServer := NewServer(nil, []net.IP{net.ParseIP("::1")}, upstreamDialer, &url.URL{}, &stickyMapperStub{}, &noopTracer{}, nil)
+	proxyServer := NewServer(nil, []net.IP{net.ParseIP("::1")}, upstreamDialer, &stickyMapperStub{}, &noopTracer{}, nil, nil)
 	proxyAddr := listenAndServe(proxyServer)
 
 	proxyURL, _ := url.Parse("http://" + proxyAddr)