From ca81738dc44fe0ac7d0a9248317e72c62a727cf8 Mon Sep 17 00:00:00 2001 From: "data-plane-api(Azure Pipelines)" Date: Wed, 21 Jul 2021 03:27:28 +0000 Subject: [PATCH] v2: removing v2 http filter protos (#17368) Risk Level: Low Testing: n/a Docs Changes: n/a Release Notes: n/a Signed-off-by: Alyssa Wilk Mirrored from https://github.com/envoyproxy/envoy @ aaac62b81dc4ef263763e7f86c363d4ddf75f8c3 --- BUILD | 5 --- .../filters/http/compressor/v3/BUILD | 1 - .../filters/http/ext_authz/v3/BUILD | 1 - envoy/extensions/filters/http/gzip/v3/BUILD | 1 - .../filters/http/health_check/v3/BUILD | 1 - .../filters/http/ip_tagging/v3/BUILD | 1 - test/validate/BUILD | 31 ++++++++++--------- test/validate/pgv_test.cc | 29 ++++++++--------- 8 files changed, 31 insertions(+), 39 deletions(-) diff --git a/BUILD b/BUILD index 4b11cc14..a70eae79 100644 --- a/BUILD +++ b/BUILD @@ -22,11 +22,6 @@ proto_library( "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", "//envoy/config/filter/accesslog/v2:pkg", "//envoy/config/filter/fault/v2:pkg", - "//envoy/config/filter/http/compressor/v2:pkg", - "//envoy/config/filter/http/ext_authz/v2:pkg", - "//envoy/config/filter/http/gzip/v2:pkg", - "//envoy/config/filter/http/health_check/v2:pkg", - "//envoy/config/filter/http/ip_tagging/v2:pkg", "//envoy/config/filter/network/http_connection_manager/v2:pkg", "//envoy/config/filter/network/redis_proxy/v2:pkg", "//envoy/config/filter/network/tcp_proxy/v2:pkg", diff --git a/envoy/extensions/filters/http/compressor/v3/BUILD b/envoy/extensions/filters/http/compressor/v3/BUILD index cf5fc2a6..a1775bbe 100644 --- a/envoy/extensions/filters/http/compressor/v3/BUILD +++ b/envoy/extensions/filters/http/compressor/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( deps = [ "//envoy/annotations:pkg", "//envoy/config/core/v3:pkg", - "//envoy/config/filter/http/compressor/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/extensions/filters/http/ext_authz/v3/BUILD b/envoy/extensions/filters/http/ext_authz/v3/BUILD index 9d4abbe8..bc2a58d2 100644 --- a/envoy/extensions/filters/http/ext_authz/v3/BUILD +++ b/envoy/extensions/filters/http/ext_authz/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/filter/http/ext_authz/v2:pkg", "//envoy/type/matcher/v3:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", diff --git a/envoy/extensions/filters/http/gzip/v3/BUILD b/envoy/extensions/filters/http/gzip/v3/BUILD index 419af66f..bfe5d198 100644 --- a/envoy/extensions/filters/http/gzip/v3/BUILD +++ b/envoy/extensions/filters/http/gzip/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/config/filter/http/gzip/v2:pkg", "//envoy/extensions/filters/http/compressor/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/extensions/filters/http/health_check/v3/BUILD b/envoy/extensions/filters/http/health_check/v3/BUILD index 977b8f1e..c6ef7406 100644 --- a/envoy/extensions/filters/http/health_check/v3/BUILD +++ b/envoy/extensions/filters/http/health_check/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/config/filter/http/health_check/v2:pkg", "//envoy/config/route/v3:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", diff --git a/envoy/extensions/filters/http/ip_tagging/v3/BUILD b/envoy/extensions/filters/http/ip_tagging/v3/BUILD index 843190b9..1c1a6f6b 100644 --- a/envoy/extensions/filters/http/ip_tagging/v3/BUILD +++ b/envoy/extensions/filters/http/ip_tagging/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/filter/http/ip_tagging/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/test/validate/BUILD b/test/validate/BUILD index c9a7ba70..be7374cf 100644 --- a/test/validate/BUILD +++ b/test/validate/BUILD @@ -12,20 +12,21 @@ api_cc_test( "@envoy_api//envoy/api/v2/route:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto", "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/buffer/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/fault/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/gzip/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/header_to_metadata/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/health_check/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/ip_tagging/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/lua/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/router/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/squash/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/http/transcoder/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/network/http_connection_manager/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/network/mongo_proxy/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/network/redis_proxy/v2:pkg_cc_proto", - "@envoy_api//envoy/config/filter/network/tcp_proxy/v2:pkg_cc_proto", - "@envoy_api//envoy/config/health_checker/redis/v2:pkg_cc_proto", + "@envoy_api//envoy/extensions/compression/gzip/decompressor/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/buffer/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/fault/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/grpc_json_transcoder/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/gzip/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/header_to_metadata/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/health_check/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/ip_tagging/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/lua/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/http/squash/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/network/mongo_proxy/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/network/redis_proxy/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/network/tcp_proxy/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/health_checkers/redis/v3:pkg_cc_proto", ], ) diff --git a/test/validate/pgv_test.cc b/test/validate/pgv_test.cc index b9b1bf05..d89f99cb 100644 --- a/test/validate/pgv_test.cc +++ b/test/validate/pgv_test.cc @@ -9,22 +9,23 @@ #include "envoy/api/v2/listener.pb.validate.h" #include "envoy/api/v2/route.pb.validate.h" #include "envoy/api/v2/core/protocol.pb.validate.h" -#include "envoy/config/health_checker/redis/v2/redis.pb.validate.h" #include "envoy/config/filter/accesslog/v2/accesslog.pb.validate.h" -#include "envoy/config/filter/http/buffer/v2/buffer.pb.validate.h" -#include "envoy/config/filter/http/fault/v2/fault.pb.validate.h" -#include "envoy/config/filter/http/gzip/v2/gzip.pb.validate.h" -#include "envoy/config/filter/http/health_check/v2/health_check.pb.validate.h" -#include "envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.validate.h" -#include "envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.validate.h" -#include "envoy/config/filter/http/lua/v2/lua.pb.validate.h" -#include "envoy/config/filter/http/router/v2/router.pb.validate.h" -#include "envoy/config/filter/http/squash/v2/squash.pb.validate.h" -#include "envoy/config/filter/http/transcoder/v2/transcoder.pb.validate.h" #include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.h" -#include "envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.h" -#include "envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.h" -#include "envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.h" +#include "envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.validate.h" +#include "envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.h" +#include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h" +#include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.h" +#include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.validate.h" +#include "envoy/extensions/filters/http/health_check/v3/health_check.pb.validate.h" +#include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.validate.h" +#include "envoy/extensions/filters/http/lua/v3/lua.pb.validate.h" +#include "envoy/extensions/filters/http/router/v3/router.pb.validate.h" +#include "envoy/extensions/filters/http/squash/v3/squash.pb.validate.h" +#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.h" +#include "envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.validate.h" +#include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" +#include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h" +#include "envoy/extensions/health_checkers/redis/v3/redis.pb.validate.h" #include "envoy/api/v2/listener/listener.pb.validate.h" #include "envoy/api/v2/route/route.pb.validate.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.validate.h"