http: use a method to get local address

And limit its export to testing.

common/http/root.go

@@ -36,9 +36,7 @@ type Component struct {
 		durations *reporter.HistogramVec
 		sizes     *reporter.HistogramVec
 	}
-
-	// Local address used by the HTTP server. Only valid after Start().
-	Address net.Addr
+	address net.Addr
 
 	// GinRouter is the router exposed for /api
 	GinRouter *gin.Engine
@@ -142,7 +140,7 @@ func (c *Component) Start() error {
 	if err != nil {
 		return fmt.Errorf("unable to listen to %v: %w", c.config.Listen, err)
 	}
-	c.Address = listener.Addr()
+	c.address = listener.Addr()
 
 	// Start serving requests
 	c.t.Go(func() error {

common/http/root_test.go

@@ -25,7 +25,7 @@ func TestHandler(t *testing.T) {
 		}))
 
 	// Check the HTTP server is running and answering metrics
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL:         "/test",
 			ContentType: "text/plain; charset=utf-8",
@@ -61,7 +61,7 @@ func TestGinRouter(t *testing.T) {
 		})
 	})
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL:         "/api/v0/test",
 			ContentType: "application/json; charset=utf-8",
@@ -81,7 +81,7 @@ func TestGinRouterPanic(t *testing.T) {
 		panic("heeeelp")
 	})
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL:         "/api/v0/test",
 			StatusCode:  500,

common/http/tests.go

@@ -6,6 +6,7 @@
 package http
 
 import (
+	"net"
 	"testing"
 
 	"akvorado/common/daemon"
@@ -26,3 +27,8 @@ func NewMock(t *testing.T, r *reporter.Reporter) *Component {
 	helpers.StartStop(t, c)
 	return c
 }
+
+// LocalAddr returns the address the HTTP server is listening to.
+func (c *Component) LocalAddr() net.Addr {
+	return c.address
+}

console/assets_test.go

@@ -23,7 +23,7 @@ func TestServeAssets(t *testing.T) {
 			conf.ServeLiveFS = live
 			_, h, _, _ := NewMock(t, conf)
 
-			helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+			helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 				{
 					URL:         "/",
 					ContentType: "text/html; charset=utf-8",

console/authentication/handlers_test.go

@@ -28,7 +28,7 @@ func TestUserHandler(t *testing.T) {
 	endpoint.GET("/avatar", c.UserAvatarHandlerFunc)
 
 	t.Run("default user configured", func(t *testing.T) {
-		helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+		helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 			{
 				Description: "user info, no user logged in",
 				URL:         "/api/v0/console/user/info",
@@ -106,7 +106,7 @@ func TestUserHandler(t *testing.T) {
 
 	t.Run("no default user", func(t *testing.T) {
 		c.config.DefaultUser.Login = ""
-		helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+		helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 			{
 				Description: "user info, no user logged in",
 				URL:         "/api/v0/console/user/info",

console/config_test.go

@@ -15,7 +15,7 @@ func TestConfigHandler(t *testing.T) {
 	config := DefaultConfiguration()
 	config.Version = "1.2.3"
 	_, h, _, _ := NewMock(t, config)
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL: "/api/v0/console/configuration",
 			JSONOutput: gin.H{

console/docs_test.go

@@ -31,7 +31,7 @@ func TestServeDocs(t *testing.T) {
 				_, h, _, _ := NewMock(t, conf)
 
 				resp, err := netHTTP.Get(fmt.Sprintf("http://%s/api/v0/console/docs/%s",
-					h.Address, tc.Path))
+					h.LocalAddr(), tc.Path))
 				if err != nil {
 					t.Fatalf("GET /api/v0/console/docs/%s:\n%+v", tc.Path, err)
 				}

console/filter_test.go

@@ -91,7 +91,7 @@ UNION DISTINCT
 		}).
 		Return(nil)
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL:       "/api/v0/console/filter/validate",
 			JSONInput: gin.H{"filter": `InIfName = "Gi0/0/0/1"`},

console/graph_test.go

@@ -559,7 +559,7 @@ func TestGraphHandler(t *testing.T) {
 		SetArg(1, expectedSQL).
 		Return(nil)
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			Description: "single direction",
 			URL:         "/api/v0/console/graph",

console/sankey_test.go

@@ -169,7 +169,7 @@ func TestSankeyHandler(t *testing.T) {
 		SetArg(1, expectedSQL).
 		Return(nil)
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL: "/api/v0/console/sankey",
 			JSONInput: gin.H{

console/widgets_test.go

@@ -77,7 +77,7 @@ func TestWidgetLastFlow(t *testing.T) {
 			return nil
 		})
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL: "/api/v0/console/widget/flow-last",
 			JSONOutput: gin.H{
@@ -105,7 +105,7 @@ func TestFlowRate(t *testing.T) {
 			`SELECT COUNT(*)/300 AS rate FROM flows WHERE TimeReceived > date_sub(minute, 5, now())`).
 		Return(mockRow)
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL: "/api/v0/console/widget/flow-rate",
 			JSONOutput: gin.H{
@@ -132,7 +132,7 @@ func TestWidgetExporters(t *testing.T) {
 		SetArg(1, expected).
 		Return(nil)
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL: "/api/v0/console/widget/exporters",
 			JSONOutput: gin.H{
@@ -180,7 +180,7 @@ func TestWidgetTop(t *testing.T) {
 			}),
 	)
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL: "/api/v0/console/widget/top/src-port",
 			JSONOutput: gin.H{
@@ -245,7 +245,7 @@ ORDER BY Time WITH FILL
 		SetArg(1, expected).
 		Return(nil)
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL: "/api/v0/console/widget/graph?points=100",
 			JSONOutput: gin.H{

inlet/core/root_test.go

@@ -204,7 +204,7 @@ func TestCore(t *testing.T) {
 	t.Run("http flows", func(t *testing.T) {
 		c.httpFlowFlushDelay = 20 * time.Millisecond
 
-		resp, err := netHTTP.Get(fmt.Sprintf("http://%s/api/v0/inlet/flows", c.d.HTTP.Address))
+		resp, err := netHTTP.Get(fmt.Sprintf("http://%s/api/v0/inlet/flows", c.d.HTTP.LocalAddr()))
 		if err != nil {
 			t.Fatalf("GET /api/v0/inlet/flows:\n%+v", err)
 		}
@@ -277,7 +277,7 @@ func TestCore(t *testing.T) {
 	// Test HTTP flow clients with a limit
 	time.Sleep(10 * time.Millisecond)
 	t.Run("http flows with limit", func(t *testing.T) {
-		resp, err := netHTTP.Get(fmt.Sprintf("http://%s/api/v0/inlet/flows?limit=4", c.d.HTTP.Address))
+		resp, err := netHTTP.Get(fmt.Sprintf("http://%s/api/v0/inlet/flows?limit=4", c.d.HTTP.LocalAddr()))
 		if err != nil {
 			t.Fatalf("GET /api/v0/inlet/flows:\n%+v", err)
 		}

inlet/flow/schemas_test.go

@@ -37,5 +37,5 @@ func TestHTTPEndpoints(t *testing.T) {
 		},
 	}
 
-	helpers.TestHTTPEndpoints(t, c.d.HTTP.Address, cases)
+	helpers.TestHTTPEndpoints(t, c.d.HTTP.LocalAddr(), cases)
 }

orchestrator/clickhouse/http_test.go

@@ -62,7 +62,7 @@ func TestHTTPEndpoints(t *testing.T) {
 		},
 	}
 
-	helpers.TestHTTPEndpoints(t, c.d.HTTP.Address, cases)
+	helpers.TestHTTPEndpoints(t, c.d.HTTP.LocalAddr(), cases)
 }
 
 func TestAdditionalASNs(t *testing.T) {
@@ -91,5 +91,5 @@ func TestAdditionalASNs(t *testing.T) {
 		},
 	}
 
-	helpers.TestHTTPEndpoints(t, c.d.HTTP.Address, cases)
+	helpers.TestHTTPEndpoints(t, c.d.HTTP.LocalAddr(), cases)
 }

orchestrator/clickhouse/migrations.go

@@ -168,7 +168,7 @@ func (c *Component) getHTTPBaseURL(address string) (string, error) {
 	localAddr := conn.LocalAddr().(*net.UDPAddr)
 
 	// Combine with HTTP port
-	_, port, err := net.SplitHostPort(c.d.HTTP.Address.String())
+	_, port, err := net.SplitHostPort(c.d.HTTP.LocalAddr().String())
 	if err != nil {
 		return "", fmt.Errorf("cannot get HTTP port: %w", err)
 	}

orchestrator/clickhouse/migrations_test.go

@@ -138,7 +138,7 @@ func TestGetHTTPBaseURL(t *testing.T) {
 	}
 	expectedURL := &url.URL{
 		Scheme: "http",
-		Host:   http.Address.String(),
+		Host:   http.LocalAddr().String(),
 	}
 	parsedURL.Host = parsedURL.Host[strings.LastIndex(parsedURL.Host, ":"):]
 	expectedURL.Host = expectedURL.Host[strings.LastIndex(expectedURL.Host, ":"):]

orchestrator/http_test.go

@@ -29,7 +29,7 @@ func TestConfigurationEndpoint(t *testing.T) {
 		"bye":   "Goodbye pal!",
 	})
 
-	helpers.TestHTTPEndpoints(t, h.Address, helpers.HTTPEndpointCases{
+	helpers.TestHTTPEndpoints(t, h.LocalAddr(), helpers.HTTPEndpointCases{
 		{
 			URL:         "/api/v0/orchestrator/configuration/inlet",
 			ContentType: "application/x-yaml; charset=utf-8",