Transform cleanup (#21)

* transformation cleanup
* formatfix
* more cleanup

Author: yuval-k

WORKSPACE

@@ -1,17 +1,21 @@
-workspace(name="envoy_gloo")
+workspace(name = "envoy_gloo")
 
 load("//bazel:repositories.bzl", "envoy_gloo_dependencies")
 
 envoy_gloo_dependencies()
 
 load("@envoy//bazel:api_binding.bzl", "envoy_api_binding")
+
 envoy_api_binding()
 
 load("@envoy//bazel:api_repositories.bzl", "envoy_api_dependencies")
+
 envoy_api_dependencies()
 
 load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
+
 envoy_dependencies()
 
 load("@envoy//bazel:dependency_imports.bzl", "envoy_dependency_imports")
+
 envoy_dependency_imports()

api/envoy/config/filter/http/aws_lambda/v2/aws_lambda.proto

@@ -2,6 +2,9 @@ syntax = "proto3";
 
 package envoy.config.filter.http.aws_lambda.v2;
 
+option java_package = "io.envoyproxy.envoy.config.filter.http.aws_lambda.v2";
+option java_outer_classname = "AwsLambdaProto";
+option java_multiple_files = true;
 import "google/protobuf/wrappers.proto";
 import "validate/validate.proto";
 

api/envoy/config/filter/http/nats/streaming/v2/nats_streaming.proto

@@ -2,6 +2,9 @@ syntax = "proto3";
 
 package envoy.config.filter.http.nats.streaming.v2;
 
+option java_package = "io.envoyproxy.envoy.config.filter.http.nats.streaming.v2";
+option java_outer_classname = "NatsStreamingProto";
+option java_multiple_files = true;
 import "google/protobuf/duration.proto";
 import "validate/validate.proto";
 

api/envoy/config/filter/http/nats/streaming/v2/payload.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 package pb;
 
+option java_package = "io.envoyproxy.pb";
+option java_outer_classname = "PayloadProto";
+option java_multiple_files = true;
 message Payload {
   map<string, string> headers = 1;
   bytes body = 2;

api/envoy/config/filter/http/transformation/v2/transformation_filter.proto

@@ -2,6 +2,9 @@ syntax = "proto3";
 
 package envoy.api.v2.filter.http;
 
+option java_package = "io.envoyproxy.envoy.api.v2.filter.http";
+option java_outer_classname = "TransformationFilterProto";
+option java_multiple_files = true;
 option go_package = "transformation";
 
 message RouteTransformations {

api/envoy/config/filter/network/consul_connect/v2/authorize.proto

@@ -2,6 +2,9 @@ syntax = "proto3";
 
 package agent.connect.authorize.v1;
 
+option java_package = "io.envoyproxy.agent.connect.authorize.v1";
+option java_outer_classname = "AuthorizeProto";
+option java_multiple_files = true;
 import "google/protobuf/duration.proto";
 
 // [#protodoc-title: Authorize]

api/envoy/config/filter/network/consul_connect/v2/consul_connect.proto

@@ -2,6 +2,9 @@ syntax = "proto3";
 
 package envoy.config.filter.network.consul_connect.v2;
 
+option java_package = "io.envoyproxy.envoy.config.filter.network.consul_connect.v2";
+option java_outer_classname = "ConsulConnectProto";
+option java_multiple_files = true;
 import "google/protobuf/duration.proto";
 
 import "validate/validate.proto";

bazel/envoy_test.bzl

@@ -1,17 +1,15 @@
-
 # Copied from @envoy/bazel/envoy_test.bzl and uses public visibility for tests
 # So we can target them to use our coverage.
 
 load(
     "@envoy//bazel:envoy_build_system.bzl",
     "envoy_cc_test_library",
 )
-
 load(
     "@envoy//bazel:envoy_internal.bzl",
     "envoy_copts",
-    "envoy_select_force_libcpp",
     "envoy_linkstatic",
+    "envoy_select_force_libcpp",
     "tcmalloc_external_dep",
 )
 
@@ -32,7 +30,7 @@ def _envoy_test_linkopts():
         # TODO(mattklein123): It's not great that we universally link against the following libs.
         # In particular, -latomic and -lrt are not needed on all platforms. Make this more granular.
         "//conditions:default": ["-pthread", "-lrt", "-ldl"],
-    }) + envoy_select_force_libcpp(["-lc++fs"], ["-lstdc++fs", "-latomic"])
+    }) + envoy_select_force_libcpp([], ["-lstdc++fs", "-latomic"])
 
 # Envoy C++ test targets should be specified with this function.
 def envoy_gloo_cc_test(

bazel/external/BUILD

@@ -0,0 +1 @@
+licenses(["notice"])  # Apache 2

bazel/external/inja.BUILD

@@ -1,6 +1,8 @@
+licenses(["notice"])  # Apache 2
+
 cc_library(
     name = "inja-lib",
     hdrs = ["single_include/inja/inja.hpp"],
-    visibility = ["//visibility:public"],
     strip_include_prefix = "single_include/",
+    visibility = ["//visibility:public"],
 )

bazel/external/json.BUILD

@@ -1,6 +1,8 @@
+licenses(["notice"])  # Apache 2
+
 cc_library(
     name = "json-lib",
     hdrs = ["single_include/nlohmann/json.hpp"],
-    visibility = ["//visibility:public"],
     strip_include_prefix = "single_include/",
+    visibility = ["//visibility:public"],
 )

source/extensions/filters/http/aws_lambda/aws_authenticator.cc

@@ -120,8 +120,7 @@ std::string AwsAuthenticator::getBodyHexSha() {
 void AwsAuthenticator::fetchUrl() {
   const Http::HeaderString &canonical_url = request_headers_->Path()->value();
   url_base_ = canonical_url.getStringView();
-  query_string_ =
-      Http::Utility::findQueryStringStart(canonical_url);
+  query_string_ = Http::Utility::findQueryStringStart(canonical_url);
   if (query_string_.length() != 0) {
     url_base_.remove_suffix(query_string_.length());
     // remove the question mark
@@ -267,7 +266,7 @@ void AwsAuthenticator::Sha256::update(const std::string &data) {
   update(data.c_str(), data.size());
 }
 
-void AwsAuthenticator::Sha256::update(const absl::string_view& data) {
+void AwsAuthenticator::Sha256::update(const absl::string_view &data) {
   update(data.data(), data.size());
 }
 

source/extensions/filters/http/aws_lambda/aws_authenticator.h

@@ -77,7 +77,7 @@ class AwsAuthenticator {
     Sha256();
     void update(const Buffer::Instance &data);
     void update(const std::string &data);
-    void update(const absl::string_view& data);
+    void update(const absl::string_view &data);
 
     void update(char c);
     void update(const uint8_t *bytes, size_t size);

source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc

@@ -24,8 +24,7 @@ namespace HttpFilters {
 namespace AwsLambda {
 
 struct RcDetailsValues {
-  // The jwt_authn filter rejected the request
-  const std::string FunctionNotFound = "aws_lambda_function_not_fou8nd";
+  const std::string FunctionNotFound = "aws_lambda_function_not_found";
 };
 typedef ConstSingleton<RcDetailsValues> RcDetails;
 
@@ -78,13 +77,13 @@ AWSLambdaFilter::decodeHeaders(Http::HeaderMap &headers, bool end_stream) {
   route_ = decoder_callbacks_->route();
   // great! this is an aws cluster. get the function information:
   function_on_route_ =
-      Http::SoloFilterUtility::resolvePerFilterConfig<AWSLambdaRouteConfig>(
+      Http::Utility::resolveMostSpecificPerFilterConfig<AWSLambdaRouteConfig>(
           SoloHttpFilterNames::get().AwsLambda, route_);
 
   if (!function_on_route_) {
-    decoder_callbacks_->sendLocalReply(Http::Code::NotFound,
-                                       "no function present for AWS upstream",
-                                       nullptr, absl::nullopt, RcDetails::get().FunctionNotFound);
+    decoder_callbacks_->sendLocalReply(
+        Http::Code::NotFound, "no function present for AWS upstream", nullptr,
+        absl::nullopt, RcDetails::get().FunctionNotFound);
     return Http::FilterHeadersStatus::StopIteration;
   }
 

source/extensions/filters/http/nats/streaming/nats_streaming_filter.cc

@@ -11,6 +11,7 @@
 #include "common/common/macros.h"
 #include "common/common/utility.h"
 #include "common/grpc/common.h"
+#include "common/http/utility.h"
 #include "common/http/solo_filter_utility.h"
 
 #include "extensions/filters/http/solo_well_known_names.h"
@@ -59,11 +60,8 @@ NatsStreamingFilter::decodeHeaders(Envoy::Http::HeaderMap &headers,
   auto mutable_headers = payload_.mutable_headers();
   headers.iterate(
       [](const Envoy::Http::HeaderEntry &e, void *ctx) {
-        Envoy::Protobuf::Map<std::string,
-                             std::string> *mutable_headers =
-            static_cast<Envoy::Protobuf::Map<std::string,
-                                             std::string> *>(
-                ctx);
+        Envoy::Protobuf::Map<std::string, std::string> *mutable_headers =
+            static_cast<Envoy::Protobuf::Map<std::string, std::string> *>(ctx);
         (*mutable_headers)[std::string(e.key().getStringView())] =
             std::string(e.value().getStringView());
         return Envoy::Http::HeaderMap::Iterate::Continue;
@@ -89,9 +87,9 @@ NatsStreamingFilter::decodeData(Envoy::Buffer::Instance &data,
   if ((decoder_buffer_limit_.has_value()) &&
       ((body_.length() + data.length()) > decoder_buffer_limit_.value())) {
 
-    decoder_callbacks_->sendLocalReply(Http::Code::PayloadTooLarge,
-                                       "nats streaming paylaod too large",
-                                       nullptr, absl::nullopt, RcDetails::get().PayloadTooLarge);
+    decoder_callbacks_->sendLocalReply(
+        Http::Code::PayloadTooLarge, "nats streaming paylaod too large",
+        nullptr, absl::nullopt, RcDetails::get().PayloadTooLarge);
     return Http::FilterDataStatus::StopIterationNoBuffer;
   }
 
@@ -138,7 +136,7 @@ void NatsStreamingFilter::retrieveRouteSpecificFilterConfig() {
   // remains valid for the current request.
   route_ = decoder_callbacks_->route();
 
-  const auto *route_local = Http::SoloFilterUtility::resolvePerFilterConfig<
+  const auto *route_local = Http::Utility::resolveMostSpecificPerFilterConfig<
       const NatsStreamingRouteSpecificFilterConfig>(name, route_);
 
   if (route_local != nullptr) {
@@ -178,7 +176,8 @@ void NatsStreamingFilter::onCompletion(Http::Code response_code,
   in_flight_request_ = nullptr;
 
   decoder_callbacks_->sendLocalReply(response_code, body_text, nullptr,
-                                     absl::nullopt, RcDetails::get().Completion);
+                                     absl::nullopt,
+                                     RcDetails::get().Completion);
 }
 
 void NatsStreamingFilter::onCompletion(Http::Code response_code,

source/extensions/filters/http/transformation/BUILD

@@ -14,11 +14,17 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_library")
 
 envoy_cc_library(
     name = "transformation_filter_config",
+    srcs = [
+        "transformation_filter_config.cc",
+    ],
     hdrs = [
         "transformation_filter_config.h",
     ],
     repository = "@envoy",
     deps = [
+        ":body_header_transformer_lib",
+        ":inja_transformer_lib",
+        ":transformer_lib",
         "//api/envoy/config/filter/http/transformation/v2:transformation_filter_proto_cc",
         "@envoy//include/envoy/router:router_interface",
     ],
@@ -34,7 +40,6 @@ envoy_cc_library(
     ],
     repository = "@envoy",
     deps = [
-        ":body_header_transformer_lib",
         ":transformation_filter_config",
         ":transformer_lib",
         "//source/common/http:solo_filter_utility_lib",
@@ -55,22 +60,24 @@ envoy_cc_library(
     ],
     repository = "@envoy",
     deps = [
+        ":transformer_lib",
         "@envoy//include/envoy/buffer:buffer_interface",
         "@envoy//source/common/http:header_map_lib",
         "@json//:json-lib",
     ],
 )
 
 envoy_cc_library(
-    name = "transformer_lib",
+    name = "inja_transformer_lib",
     srcs = [
-        "transformer.cc",
+        "inja_transformer.cc",
     ],
     hdrs = [
-        "transformer.h",
+        "inja_transformer.h",
     ],
     repository = "@envoy",
     deps = [
+        ":transformer_lib",
         "//api/envoy/config/filter/http/transformation/v2:transformation_filter_proto_cc",
         "@envoy//include/envoy/buffer:buffer_interface",
         "@envoy//include/envoy/http:header_map_interface",
@@ -81,6 +88,18 @@ envoy_cc_library(
     ],
 )
 
+envoy_cc_library(
+    name = "transformer_lib",
+    hdrs = [
+        "transformer.h",
+    ],
+    repository = "@envoy",
+    deps = [
+        "@envoy//include/envoy/buffer:buffer_interface",
+        "@envoy//include/envoy/http:header_map_interface",
+    ],
+)
+
 envoy_cc_library(
     name = "transformation_filter_config_lib",
     srcs = ["transformation_filter_config_factory.cc"],

source/extensions/filters/http/transformation/body_header_transformer.cc

@@ -2,6 +2,8 @@
 
 #include "common/http/headers.h"
 
+#include "nlohmann/json.hpp"
+
 // For convenience
 using json = nlohmann::json;
 
@@ -11,7 +13,7 @@ namespace HttpFilters {
 namespace Transformation {
 
 void BodyHeaderTransformer::transform(Http::HeaderMap &header_map,
-                                      Buffer::Instance &body) {
+                                      Buffer::Instance &body) const {
   json json_body;
   if (body.length() > 0) {
     json_body["body"] = body.toString();
@@ -23,7 +25,8 @@ void BodyHeaderTransformer::transform(Http::HeaderMap &header_map,
          void *context) -> Http::HeaderMap::Iterate {
         json *headers_ptr = static_cast<json *>(context);
         json &headers = *headers_ptr;
-        headers[std::string(header.key().getStringView())] = std::string(header.value().getStringView());
+        headers[std::string(header.key().getStringView())] =
+            std::string(header.value().getStringView());
         return Http::HeaderMap::Iterate::Continue;
       },
       &headers);

source/extensions/filters/http/transformation/body_header_transformer.h

@@ -2,19 +2,16 @@
 
 #include <map>
 
-#include "envoy/buffer/buffer.h"
-#include "envoy/http/header_map.h"
-
-#include "nlohmann/json.hpp"
+#include "extensions/filters/http/transformation/transformer.h"
 
 namespace Envoy {
 namespace Extensions {
 namespace HttpFilters {
 namespace Transformation {
 
-class BodyHeaderTransformer {
+class BodyHeaderTransformer : public Transformer {
 public:
-  void transform(Http::HeaderMap &map, Buffer::Instance &body);
+  void transform(Http::HeaderMap &map, Buffer::Instance &body) const override;
 };
 
 } // namespace Transformation