Utility that upgrades HeaderValueOption from v2 to v3.

Signed-off-by: Jakub Sobon <mumak@google.com>

source/server/BUILD

@@ -37,6 +37,8 @@ envoy_cc_library(
         "@envoy//source/common/protobuf:message_validator_lib_with_external_headers",
         "@envoy//source/common/protobuf:utility_lib_with_external_headers",
         "@envoy//source/common/singleton:const_singleton_with_external_headers",
+        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
+        "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
     ],
 )
 

source/server/configuration.cc

@@ -2,6 +2,9 @@
 
 #include <string>
 
+#include "envoy/api/v2/core/base.pb.h"
+#include "envoy/config/core/v3/base.pb.h"
+
 #include "external/envoy/source/common/protobuf/message_validator_impl.h"
 #include "external/envoy/source/common/protobuf/utility.h"
 
@@ -40,6 +43,20 @@ void applyConfigToResponseHeaders(Envoy::Http::ResponseHeaderMap& response_heade
   }
 }
 
+envoy::config::core::v3::HeaderValueOption upgradeDeprecatedEnvoyV2HeaderValueOptionToV3(
+    const envoy::api::v2::core::HeaderValueOption& v2_header_value_option) {
+  envoy::config::core::v3::HeaderValueOption v3_header_value_option;
+  if (v2_header_value_option.has_append()) {
+    *v3_header_value_option.mutable_append() = v2_header_value_option.append();
+  }
+  if (v2_header_value_option.has_header()) {
+    envoy::config::core::v3::HeaderValue* v3_header = v3_header_value_option.mutable_header();
+    v3_header->set_key(v2_header_value_option.header().key());
+    v3_header->set_value(v2_header_value_option.header().value());
+  }
+  return v3_header_value_option;
+}
+
 } // namespace Configuration
 } // namespace Server
 } // namespace Nighthawk

source/server/configuration.h

@@ -2,6 +2,8 @@
 
 #include <string>
 
+#include "envoy/api/v2/core/base.pb.h"
+#include "envoy/config/core/v3/base.pb.h"
 #include "envoy/http/header_map.h"
 
 #include "api/server/response_options.pb.h"
@@ -31,6 +33,14 @@ bool mergeJsonConfig(absl::string_view json, nighthawk::server::ResponseOptions&
 void applyConfigToResponseHeaders(Envoy::Http::ResponseHeaderMap& response_headers,
                                   const nighthawk::server::ResponseOptions& response_options);
 
+/**
+ * Upgrades Envoy's HeaderValueOption from the deprecated v2 API version to v3.
+ *
+ * @param v2_header_value_option The HeaderValueOption to be upgraded.
+ */
+envoy::config::core::v3::HeaderValueOption upgradeDeprecatedEnvoyV2HeaderValueOptionToV3(
+    const envoy::api::v2::core::HeaderValueOption& v2_header_value_option);
+
 } // namespace Configuration
 } // namespace Server
 } // namespace Nighthawk

test/server/BUILD

@@ -65,3 +65,14 @@ envoy_cc_test(
         "@envoy//test/test_common:simulated_time_system_lib",
     ],
 )
+
+envoy_cc_test(
+    name = "configuration_test",
+    srcs = ["configuration_test.cc"],
+    repository = "@envoy",
+    deps = [
+        "//source/server:configuration_lib",
+        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
+        "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
+    ],
+)

test/server/configuration_test.cc

@@ -0,0 +1,66 @@
+#include "envoy/api/v2/core/base.pb.h"
+#include "envoy/config/core/v3/base.pb.h"
+
+#include "server/configuration.h"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace Nighthawk {
+namespace Server {
+namespace Configuration {
+namespace {
+
+using ::testing::HasSubstr;
+
+TEST(UpgradeDeprecatedEnvoyV2HeaderValueOptionToV3Test, UpgradesEmptyHeaderValue) {
+  envoy::api::v2::core::HeaderValueOption v2_header_value_option;
+  envoy::config::core::v3::HeaderValueOption v3_header_value_option =
+      upgradeDeprecatedEnvoyV2HeaderValueOptionToV3(v2_header_value_option);
+
+  EXPECT_FALSE(v3_header_value_option.has_append());
+  EXPECT_FALSE(v3_header_value_option.has_header());
+}
+
+TEST(UpgradeDeprecatedEnvoyV2HeaderValueOptionToV3Test, UpgradesHeaderValueWithHeaderAndAppendSet) {
+  envoy::api::v2::core::HeaderValueOption v2_header_value_option;
+  v2_header_value_option.mutable_append()->set_value(true);
+  v2_header_value_option.mutable_header()->set_key("key");
+  v2_header_value_option.mutable_header()->set_value("value");
+
+  envoy::config::core::v3::HeaderValueOption v3_header_value_option =
+      upgradeDeprecatedEnvoyV2HeaderValueOptionToV3(v2_header_value_option);
+
+  EXPECT_TRUE(v3_header_value_option.append().value());
+  EXPECT_EQ(v3_header_value_option.header().key(), "key");
+  EXPECT_EQ(v3_header_value_option.header().value(), "value");
+}
+
+TEST(UpgradeDeprecatedEnvoyV2HeaderValueOptionToV3Test, UpgradesHeaderValueWithHeaderOnly) {
+  envoy::api::v2::core::HeaderValueOption v2_header_value_option;
+  v2_header_value_option.mutable_header()->set_key("key");
+  v2_header_value_option.mutable_header()->set_value("value");
+
+  envoy::config::core::v3::HeaderValueOption v3_header_value_option =
+      upgradeDeprecatedEnvoyV2HeaderValueOptionToV3(v2_header_value_option);
+
+  EXPECT_FALSE(v3_header_value_option.has_append());
+  EXPECT_EQ(v3_header_value_option.header().key(), "key");
+  EXPECT_EQ(v3_header_value_option.header().value(), "value");
+}
+
+TEST(UpgradeDeprecatedEnvoyV2HeaderValueOptionToV3Test, UpgradesHeaderValueWithAppendOnly) {
+  envoy::api::v2::core::HeaderValueOption v2_header_value_option;
+  v2_header_value_option.mutable_append()->set_value(true);
+
+  envoy::config::core::v3::HeaderValueOption v3_header_value_option =
+      upgradeDeprecatedEnvoyV2HeaderValueOptionToV3(v2_header_value_option);
+
+  EXPECT_TRUE(v3_header_value_option.append().value());
+  EXPECT_FALSE(v3_header_value_option.has_header());
+}
+
+} // namespace
+} // namespace Configuration
+} // namespace Server
+} // namespace Nighthawk