Add DOWNSTREAM_LOCAL_ADDRESS_WITHOUT_PORT

Add DOWNSTREAM_LOCAL_ADDRESS_WITHOUT_PORT to header_formatter and access_log_formatter. Signed-off-by: Mandar U Jog <[email protected]>
envoyproxy · Jan 31, 2018 · 16e7335 · 16e7335
1 parent 4ac478c
commit 16e7335
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/source/common/access_log/access_log_formatter.cc b/source/common/access_log/access_log_formatter.cc
@@ -235,6 +235,11 @@ RequestInfoFormatter::RequestInfoFormatter(const std::string& field_name) {
     field_extractor_ = [](const RequestInfo::RequestInfo& request_info) {
       return request_info.downstreamLocalAddress()->asString();
     };
+  } else if (field_name == "DOWNSTREAM_LOCAL_ADDRESS_WITHOUT_PORT") {
+    field_extractor_ = [](const Envoy::RequestInfo::RequestInfo& request_info) {
+      return RequestInfo::Utility::formatDownstreamAddressNoPort(
+          *request_info.downstreamLocalAddress());
+    };
   } else if (field_name == "DOWNSTREAM_REMOTE_ADDRESS") {
     field_extractor_ = [](const RequestInfo::RequestInfo& request_info) {
       return request_info.downstreamRemoteAddress()->asString();

diff --git a/source/common/router/header_formatter.cc b/source/common/router/header_formatter.cc
@@ -126,8 +126,7 @@ RequestInfoHeaderFormatter::RequestInfoHeaderFormatter(absl::string_view field_n
       return RequestInfo::Utility::formatDownstreamAddressNoPort(
           *request_info.downstreamRemoteAddress());
     };
-  } else if (field_name == "ORIGINAL_DST" ||
-             field_name == "DOWNSTREAM_LOCAL_ADDRESS_WITHOUT_PORT") {
+  } else if (field_name == "DOWNSTREAM_LOCAL_ADDRESS_WITHOUT_PORT") {
     field_extractor_ = [](const Envoy::RequestInfo::RequestInfo& request_info) {
       return RequestInfo::Utility::formatDownstreamAddressNoPort(
           *request_info.downstreamLocalAddress());

diff --git a/test/common/access_log/access_log_formatter_test.cc b/test/common/access_log/access_log_formatter_test.cc
@@ -157,6 +157,11 @@ TEST(AccessLogFormatterTest, requestInfoFormatter) {
     EXPECT_EQ("127.0.0.2:0", upstream_format.format(header, header, request_info));
   }
 
+  {
+    RequestInfoFormatter upstream_format("DOWNSTREAM_LOCAL_ADDRESS_WITHOUT_PORT");
+    EXPECT_EQ("127.0.0.2", upstream_format.format(header, header, request_info));
+  }
+
   {
     RequestInfoFormatter upstream_format("DOWNSTREAM_ADDRESS");
     EXPECT_EQ("127.0.0.1", upstream_format.format(header, header, request_info));

diff --git a/test/common/router/header_formatter_test.cc b/test/common/router/header_formatter_test.cc
@@ -64,10 +64,6 @@ TEST_F(RequestInfoHeaderFormatterTest, TestFormatWithDownstreamRemoteAddressVari
   testFormatting("DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT", "127.0.0.1");
 }
 
-TEST_F(RequestInfoHeaderFormatterTest, TestFormatWithOriginalDstVariable) {
-  testFormatting("ORIGINAL_DST", "127.0.0.2");
-}
-
 TEST_F(RequestInfoHeaderFormatterTest, TestFormatWithDownstreamLocalAddressVariable) {
   testFormatting("DOWNSTREAM_LOCAL_ADDRESS_WITHOUT_PORT", "127.0.0.2");
 }
@@ -261,7 +257,6 @@ TEST(HeaderParserTest, TestParseInternal) {
       {"%%%PROTOCOL%%%", {"%HTTP/1.1%"}, {}},
       {"%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%", {"127.0.0.1"}, {}},
       {"%DOWNSTREAM_LOCAL_ADDRESS_WITHOUT_PORT%", {"127.0.0.2"}, {}},
-      {"%ORIGINAL_DST%", {"127.0.0.2"}, {}},
       {"%UPSTREAM_METADATA([\"ns\", \"key\"])%", {"value"}, {}},
       {"[%UPSTREAM_METADATA([\"ns\", \"key\"])%", {"[value"}, {}},
       {"%UPSTREAM_METADATA([\"ns\", \"key\"])%]", {"value]"}, {}},