From 31839eee7de6d424f83eb7b6a119e9b29744bed1 Mon Sep 17 00:00:00 2001 From: Derek Argueta Date: Fri, 5 Apr 2019 14:11:01 -0700 Subject: [PATCH 1/2] convert to v2 Signed-off-by: Derek Argueta --- .../common/router/router_upstream_log_test.cc | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/test/common/router/router_upstream_log_test.cc b/test/common/router/router_upstream_log_test.cc index e9e849a38c2cd..451e1fa3306da 100644 --- a/test/common/router/router_upstream_log_test.cc +++ b/test/common/router/router_upstream_log_test.cc @@ -34,17 +34,18 @@ namespace { absl::optional testUpstreamLog() { // Custom format without timestamps or durations. - const std::string json_string = R"EOF( - { - "path": "/dev/null", - "format": "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL% %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %REQ(:AUTHORITY)% %UPSTREAM_HOST% %RESP(X-UPSTREAM-HEADER)% %TRAILER(X-TRAILER)%\n" - } + const std::string yaml = R"EOF( +name: envoy.file_access_log +typed_config: + "@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog + format: "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL% %RESPONSE_CODE% + %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %REQ(:AUTHORITY)% %UPSTREAM_HOST% + %RESP(X-UPSTREAM-HEADER)% %TRAILER(X-TRAILER)%\n" + path: "/dev/null" )EOF"; - auto json_object_ptr = Json::Factory::loadFromString(json_string); - envoy::config::filter::accesslog::v2::AccessLog upstream_log; - Envoy::Config::FilterJson::translateAccessLog(*json_object_ptr, upstream_log); + MessageUtil::loadFromYaml(yaml, upstream_log); return absl::optional(upstream_log); } @@ -256,17 +257,17 @@ TEST_F(RouterUpstreamLogTest, LogHeaders) { // Test timestamps and durations are emitted. TEST_F(RouterUpstreamLogTest, LogTimestampsAndDurations) { - const std::string json_string = R"EOF( - { - "path": "/dev/null", - "format": "[%START_TIME%] %REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL% %DURATION% %RESPONSE_DURATION% %REQUEST_DURATION%" - } + const std::string yaml = R"EOF( +name: envoy.file_access_log +typed_config: + "@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog + format: "[%START_TIME%] %REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL% + %DURATION% %RESPONSE_DURATION% %REQUEST_DURATION%" + path: "/dev/null" )EOF"; - auto json_object_ptr = Json::Factory::loadFromString(json_string); - envoy::config::filter::accesslog::v2::AccessLog upstream_log; - Envoy::Config::FilterJson::translateAccessLog(*json_object_ptr, upstream_log); + MessageUtil::loadFromYaml(yaml, upstream_log); init(absl::optional(upstream_log)); run(200, {{"x-envoy-original-path", "/foo"}}, {}, {}); From 073b6c138cedb071a62b01286da7c34d80a796a2 Mon Sep 17 00:00:00 2001 From: Derek Argueta Date: Fri, 5 Apr 2019 17:27:28 -0700 Subject: [PATCH 2/2] remove filter_json dependency Signed-off-by: Derek Argueta --- test/common/router/BUILD | 1 - test/common/router/router_upstream_log_test.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/test/common/router/BUILD b/test/common/router/BUILD index 08811d0e06653..de2a36450bfa3 100644 --- a/test/common/router/BUILD +++ b/test/common/router/BUILD @@ -179,7 +179,6 @@ envoy_cc_test( external_deps = ["abseil_optional"], deps = [ "//source/common/buffer:buffer_lib", - "//source/common/config:filter_json_lib", "//source/common/network:utility_lib", "//source/common/router:router_lib", "//source/common/upstream:upstream_includes", diff --git a/test/common/router/router_upstream_log_test.cc b/test/common/router/router_upstream_log_test.cc index 451e1fa3306da..0e41d0442996f 100644 --- a/test/common/router/router_upstream_log_test.cc +++ b/test/common/router/router_upstream_log_test.cc @@ -1,7 +1,6 @@ #include #include -#include "common/config/filter_json.h" #include "common/network/utility.h" #include "common/router/router.h" #include "common/upstream/upstream_impl.h"