From 2230f93bfb875cb730f5e8bd0a59f8fe05a0cd03 Mon Sep 17 00:00:00 2001 From: Alex Ababii Date: Fri, 4 Sep 2026 14:50:35 +0200 Subject: [PATCH] upd test --- .../proxy/pkg/middleware/clientip_chain_test.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/services/proxy/pkg/middleware/clientip_chain_test.go b/services/proxy/pkg/middleware/clientip_chain_test.go index 1ac562ebd9..778023cfe7 100644 --- a/services/proxy/pkg/middleware/clientip_chain_test.go +++ b/services/proxy/pkg/middleware/clientip_chain_test.go @@ -1,7 +1,6 @@ package middleware_test import ( - "fmt" "net/http" "net/http/httptest" "testing" @@ -17,10 +16,6 @@ import ( // value when the header is present. This mirrors the alice chain configured in // services/proxy/pkg/command/server.go. func TestClientIPChain(t *testing.T) { - handler := chimiddleware.ClientIPFromRemoteAddr(chimiddleware.ClientIPFromXFF()(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - _, _ = fmt.Fprint(w, chimiddleware.GetClientIP(r.Context())) - }))) - tests := []struct { name string remoteAddr string @@ -54,16 +49,20 @@ func TestClientIPChain(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - rec := httptest.NewRecorder() + var got string + handler := chimiddleware.ClientIPFromRemoteAddr(chimiddleware.ClientIPFromXFF()(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + got = chimiddleware.GetClientIP(r.Context()) + }))) + req := httptest.NewRequest(http.MethodGet, "/", nil) req.RemoteAddr = tt.remoteAddr for _, f := range tt.forwarded { req.Header.Add("X-Forwarded-For", f) } - handler.ServeHTTP(rec, req) + handler.ServeHTTP(httptest.NewRecorder(), req) - assert.Equal(t, rec.Body.String(), tt.expected) + assert.Equal(t, got, tt.expected) }) } }