update json (#20)

* update json
* inja
* include prefix
* inj
* injase
* inja
* doci
* no consul
* dont run coverage

Author: yuval-k

bazel/external/inja.BUILD

@@ -1,6 +1,6 @@
 cc_library(
     name = "inja-lib",
-    hdrs = ["src/inja.hpp"],
+    hdrs = ["single_include/inja/inja.hpp"],
     visibility = ["//visibility:public"],
-    strip_include_prefix = "src/",
+    strip_include_prefix = "single_include/",
 )

bazel/external/json.BUILD

@@ -2,5 +2,5 @@ cc_library(
     name = "json-lib",
     hdrs = ["single_include/nlohmann/json.hpp"],
     visibility = ["//visibility:public"],
-    strip_include_prefix = "single_include/nlohmann/",
+    strip_include_prefix = "single_include/",
 )

bazel/repository_locations.bzl

@@ -4,11 +4,11 @@ REPOSITORY_LOCATIONS = dict(
         remote = "https://github.com/envoyproxy/envoy",
     ),
     inja = dict(
-        commit = "74ad4281edd4ceca658888602af74bf2050107f0",
+        commit = "4c0ee3a46c0bbb279b0849e5a659e52684a37a98",
         remote = "https://github.com/pantor/inja",
     ),
     json = dict(
-        commit = "d2dd27dc3b8472dbaa7d66f83619b3ebcd9185fe",  # v3.1.2
+        commit = "53c3eefa2cf790a7130fed3e13a3be35c2f2ace2",  # v3.7.0
         remote = "https://github.com/nlohmann/json",
     ),
 )

ci/do_ci.sh

@@ -108,6 +108,8 @@ case "$1" in
     ;;
 "test")
      bazel test ${BAZEL_BUILD_OPTIONS} -c opt //test/extensions/...
+     bazel test ${BAZEL_BUILD_OPTIONS} -c opt //test/integration/...
+     bazel test ${BAZEL_BUILD_OPTIONS} -c opt //test/common/...
 #    bazel build ${BAZEL_BUILD_OPTIONS} -c opt //test/...
 #    bazel test ${BAZEL_BUILD_OPTIONS} -c opt //test/...
     ;;

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

@@ -5,7 +5,7 @@
 #include "envoy/buffer/buffer.h"
 #include "envoy/http/header_map.h"
 
-#include "json.hpp"
+#include "nlohmann/json.hpp"
 
 namespace Envoy {
 namespace Extensions {

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

@@ -68,15 +68,17 @@ TransformerInstance::TransformerInstance(
     const std::map<std::string, std::string> &extractions, const json &context)
     : header_map_(header_map), extractions_(extractions), context_(context) {
   env_.add_callback(
-      "header", 1,
-      std::bind(&TransformerInstance::header_callback, this, _1, _2));
+      "header", 1, [this](Arguments args) {
+        return header_callback(args);
+      });
   env_.add_callback(
-      "extraction", 1,
-      std::bind(&TransformerInstance::extracted_callback, this, _1, _2));
+      "extraction", 1, [this](Arguments args) {
+        return extracted_callback(args);
+      });
 }
 
-json TransformerInstance::header_callback(Parsed::Arguments args, json data) {
-  std::string headername = env_.get_argument<std::string>(args, 0, data);
+json TransformerInstance::header_callback(Arguments args) {  
+  std::string headername = args.at(0)->get<std::string>();
   const Http::HeaderEntry *header_entry =
       getHeader(header_map_, std::move(headername));
   if (!header_entry) {
@@ -85,9 +87,8 @@ json TransformerInstance::header_callback(Parsed::Arguments args, json data) {
   return std::string(header_entry->value().getStringView());
 }
 
-json TransformerInstance::extracted_callback(Parsed::Arguments args,
-                                             json data) {
-  std::string name = env_.get_argument<std::string>(args, 0, data);
+json TransformerInstance::extracted_callback(Arguments args) {
+  std::string name = args.at(0)->get<std::string>();
   const auto value_it = extractions_.find(name);
   if (value_it != extractions_.end()) {
     return value_it->second;

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

@@ -6,8 +6,8 @@
 #include "envoy/http/header_map.h"
 
 // clang-format off
-#include "json.hpp"
-#include "inja.hpp"
+#include "nlohmann/json.hpp"
+#include "inja/inja.hpp"
 // clang-format on
 
 #include "api/envoy/config/filter/http/transformation/v2/transformation_filter.pb.validate.h"
@@ -31,11 +31,9 @@ class TransformerInstance {
                       const nlohmann::json &context);
   // header_value(name)
   // extracted_value(name, index)
-  nlohmann::json header_callback(inja::Parsed::Arguments args,
-                                 nlohmann::json data);
+  nlohmann::json header_callback(inja::Arguments args);
 
-  nlohmann::json extracted_callback(inja::Parsed::Arguments args,
-                                    nlohmann::json data);
+  nlohmann::json extracted_callback(inja::Arguments args);
 
   std::string render(const std::string &input);
 

test/coverage/BUILD

@@ -42,7 +42,6 @@ envoy_gloo_cc_test(
         "//test/extensions/filters/http/transformation:body_header_transformer_test_lib_internal_only",
         "//test/extensions/filters/http/transformation:transformation_filter_test_lib_internal_only",
         "//test/extensions/filters/http/transformation:transformer_test_lib_internal_only",
-        "//test/extensions/filters/network/consul_connect:consul_connect_test_lib_internal_only",
         "//test/integration:aws_lambda_filter_integration_test_lib_internal_only",
         "//test/integration:transformation_filter_integration_test_lib_internal_only",
     ],