chore: review comments

Author: achettyiitr

httputil/client.go

@@ -3,6 +3,11 @@ package httputil
 import (
 	"io"
 	"net/http"
+	"strings"
+)
+
+const (
+	headerXForwardedFor = "X-Forwarded-For"
 )
 
 // CloseResponse closes the response's body. But reads at least some of the body so if it's
@@ -15,3 +20,13 @@ func CloseResponse(resp *http.Response) {
 		resp.Body.Close()
 	}
 }
+
+func GetRequestIP(req *http.Request) string {
+	addresses := strings.Split(req.Header.Get(headerXForwardedFor), ",")
+	if addresses[0] == "" {
+		splits := strings.Split(req.RemoteAddr, ":")
+		return strings.Join(splits[:len(splits)-1], ":") // When there is no load-balancer
+	}
+
+	return strings.ReplaceAll(addresses[0], " ", "")
+}

ip/ip_test.go renamed to httputil/client_test.go

@@ -1,15 +1,15 @@
-package ip_test
+package httputil_test
 
 import (
 	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	kitip "github.com/rudderlabs/rudder-go-kit/ip"
+	"github.com/rudderlabs/rudder-go-kit/httputil"
 )
 
-func TestIPFromReq(t *testing.T) {
+func TestGetRequestIP(t *testing.T) {
 	testCases := []struct {
 		name           string
 		headerValue    string
@@ -42,7 +42,7 @@ func TestIPFromReq(t *testing.T) {
 				Header:     http.Header{"X-Forwarded-For": {testCase.headerValue}},
 				RemoteAddr: testCase.remoteAddr,
 			}
-			require.Equal(t, testCase.expectedResult, kitip.FromReq(req))
+			require.Equal(t, testCase.expectedResult, httputil.GetRequestIP(req))
 		})
 	}
 }