Use DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT instead of request header

3scale-ops · Apr 28, 2023 · 13b01b3 · 13b01b3
1 parent 0d5d982
commit 13b01b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/resource_builders/envoyconfig/resource_test.go b/pkg/resource_builders/envoyconfig/resource_test.go
@@ -115,7 +115,7 @@ func TestNew(t *testing.T) {
                                             authority: '%REQ(:AUTHORITY)%'
                                             bytes_received: '%BYTES_RECEIVED%'
                                             bytes_sent: '%BYTES_SENT%'
-                                            client_ip: '%REQ(X-ENVOY-EXTERNAL-ADDRESS)%'
+                                            client_ip: '%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%'
                                             downstream_tls_cipher: '%DOWNSTREAM_TLS_CIPHER%'
                                             downstream_tls_version: '%DOWNSTREAM_TLS_VERSION%'
                                             duration: '%DURATION%'

diff --git a/pkg/resource_builders/envoyconfig/templates/listeners.go b/pkg/resource_builders/envoyconfig/templates/listeners.go
@@ -186,7 +186,7 @@ func AccessLogConfig_v1(name string, tls bool) []*envoy_config_accesslog_v3.Acce
 											"upstream_cluster":      structpb.NewStringValue("%UPSTREAM_CLUSTER%"),
 											"upstream_service_time": structpb.NewStringValue("%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%"),
 											"user_agent":            structpb.NewStringValue("%REQ(USER-AGENT)%"),
-											"client_ip":             structpb.NewStringValue("%REQ(X-ENVOY-EXTERNAL-ADDRESS)%"),
+											"client_ip":             structpb.NewStringValue("%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%"),
 										}
 										if tls {
 											m["downstream_tls_cipher"] = structpb.NewStringValue("%DOWNSTREAM_TLS_CIPHER%")

diff --git a/pkg/resource_builders/envoyconfig/templates/listeners_test.go b/pkg/resource_builders/envoyconfig/templates/listeners_test.go
@@ -63,7 +63,7 @@ func TestListenerHTTP_v1(t *testing.T) {
                               authority: '%REQ(:AUTHORITY)%'
                               bytes_received: '%BYTES_RECEIVED%'
                               bytes_sent: '%BYTES_SENT%'
-                              client_ip: '%REQ(X-ENVOY-EXTERNAL-ADDRESS)%'
+                              client_ip: '%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%'
                               downstream_tls_cipher: '%DOWNSTREAM_TLS_CIPHER%'
                               downstream_tls_version: '%DOWNSTREAM_TLS_VERSION%'
                               duration: '%DURATION%'
@@ -170,7 +170,7 @@ func TestListenerHTTP_v1(t *testing.T) {
                               authority: '%REQ(:AUTHORITY)%'
                               bytes_received: '%BYTES_RECEIVED%'
                               bytes_sent: '%BYTES_SENT%'
-                              client_ip: '%REQ(X-ENVOY-EXTERNAL-ADDRESS)%'
+                              client_ip: '%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%'
                               duration: '%DURATION%'
                               listener: test
                               method: '%REQ(:METHOD)%'