http-filter-example: use passthrough filter lib (envoyproxy#128)

Signed-off-by: Lizan Zhou <[email protected]>
billowqiu · Aug 17, 2020 · a994541 · a994541
1 parent 121862c
commit a994541
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/.devcontainer b/.devcontainer
@@ -0,0 +1 @@
+envoy/.devcontainer
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 bazel-*
+clang.bazelrc
+user.bazelrc
diff --git a/http-filter-example/BUILD b/http-filter-example/BUILD
@@ -1,14 +1,13 @@
-package(default_visibility = ["//visibility:public"])
-
 load(
     "@envoy//bazel:envoy_build_system.bzl",
     "envoy_cc_binary",
     "envoy_cc_library",
     "envoy_cc_test",
 )
-
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 
+package(default_visibility = ["//visibility:public"])
+
 envoy_cc_binary(
     name = "envoy",
     repository = "@envoy",
@@ -27,7 +26,7 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         ":pkg_cc_proto",
-        "@envoy//source/exe:envoy_common_lib",
+        "@envoy//source/extensions/filters/http/common:pass_through_filter_lib",
     ],
 )
 

diff --git a/http-filter-example/http_filter.cc b/http-filter-example/http_filter.cc
@@ -37,10 +37,6 @@ FilterDataStatus HttpSampleDecoderFilter::decodeData(Buffer::Instance&, bool) {
   return FilterDataStatus::Continue;
 }
 
-FilterTrailersStatus HttpSampleDecoderFilter::decodeTrailers(RequestTrailerMap&) {
-  return FilterTrailersStatus::Continue;
-}
-
 void HttpSampleDecoderFilter::setDecoderFilterCallbacks(StreamDecoderFilterCallbacks& callbacks) {
   decoder_callbacks_ = &callbacks;
 }

diff --git a/http-filter-example/http_filter.h b/http-filter-example/http_filter.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "envoy/server/filter_config.h"
+#include "extensions/filters/http/common/pass_through_filter.h"
 
 #include "http-filter-example/http_filter.pb.h"
 
@@ -21,9 +21,9 @@ class HttpSampleDecoderFilterConfig {
   const std::string val_;
 };
 
-typedef std::shared_ptr<HttpSampleDecoderFilterConfig> HttpSampleDecoderFilterConfigSharedPtr;
+using HttpSampleDecoderFilterConfigSharedPtr = std::shared_ptr<HttpSampleDecoderFilterConfig>;
 
-class HttpSampleDecoderFilter : public StreamDecoderFilter {
+class HttpSampleDecoderFilter : public PassThroughDecoderFilter {
 public:
   HttpSampleDecoderFilter(HttpSampleDecoderFilterConfigSharedPtr);
   ~HttpSampleDecoderFilter();
@@ -34,7 +34,6 @@ class HttpSampleDecoderFilter : public StreamDecoderFilter {
   // Http::StreamDecoderFilter
   FilterHeadersStatus decodeHeaders(RequestHeaderMap&, bool) override;
   FilterDataStatus decodeData(Buffer::Instance&, bool) override;
-  FilterTrailersStatus decodeTrailers(RequestTrailerMap&) override;
   void setDecoderFilterCallbacks(StreamDecoderFilterCallbacks&) override;
 
 private:

diff --git a/http-filter-example/http_filter_config.cc b/http-filter-example/http_filter_config.cc
@@ -1,6 +1,7 @@
 #include <string>
 
 #include "envoy/registry/registry.h"
+#include "envoy/server/filter_config.h"
 
 #include "http-filter-example/http_filter.pb.h"
 #include "http-filter-example/http_filter.pb.validate.h"