Chiebot-Mirror
/
data-plane-api
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

v2: updating pgv and removing dfp v2 config (#17575)

Browse Source 
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>

Mirrored from https://github.com/envoyproxy/envoy @ 9edd1c4401a7b15f55ab115ba6333c964c91151a
pull/624/head
data-plane-api(Azure Pipelines) 4 years ago
parent e01b00e614
commit 3a71d52b66
5 changed files with 16 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BUILD
  2. 1
      envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD
  3. 1
      envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
  4. 11
      test/validate/BUILD
  5. 25
      test/validate/pgv_test.cc

2
BUILD
Unescape View File

@ -18,8 +18,6 @@ proto_library(
"//envoy/api/v2/ratelimit:pkg",
"//envoy/api/v2/route:pkg",
"//envoy/config/bootstrap/v2:pkg",
"//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg",
"//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg",
"//envoy/config/filter/accesslog/v2:pkg",
"//envoy/config/filter/fault/v2:pkg",
"//envoy/config/filter/network/http_connection_manager/v2:pkg",

1
envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD
Unescape View File

@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2
api_proto_package(
deps = [
"//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg",
"//envoy/extensions/common/dynamic_forward_proxy/v3:pkg",
"@com_github_cncf_udpa//udpa/annotations:pkg",
],

1
envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
Unescape View File

@ -8,7 +8,6 @@ api_proto_package(
deps = [
"//envoy/annotations:pkg",
"//envoy/config/cluster/v3:pkg",
"//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg",
"//envoy/config/core/v3:pkg",
"@com_github_cncf_udpa//udpa/annotations:pkg",
],

11
test/validate/BUILD
Unescape View File

@ -6,12 +6,10 @@ api_cc_test(
name = "pgv_test",
srcs = ["pgv_test.cc"],
deps = [
"@envoy_api//envoy/api/v2:pkg_cc_proto",
"@envoy_api//envoy/api/v2/core:pkg_cc_proto",
"@envoy_api//envoy/api/v2/listener:pkg_cc_proto",
"@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/accesslog/v3:pkg_cc_proto",
"@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
"@envoy_api//envoy/config/listener/v3: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",
@ -28,5 +26,6 @@ api_cc_test(
"@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",
"@envoy_api//envoy/service/listener/v3:pkg_cc_proto",
],
)

25
test/validate/pgv_test.cc
Unescape View File

@ -4,13 +4,12 @@
// We don't use all the headers in the test below, but including them anyway as
// a cheap way to get some C++ compiler sanity checking.
#include "envoy/api/v2/cluster.pb.validate.h"
#include "envoy/api/v2/endpoint.pb.validate.h"
#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/filter/accesslog/v2/accesslog.pb.validate.h"
#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.h"
#include "envoy/config/cluster/v3/cluster.pb.validate.h"
#include "envoy/config/endpoint/v3/endpoint.pb.validate.h"
#include "envoy/config/listener/v3/listener.pb.validate.h"
#include "envoy/config/route/v3/route.pb.validate.h"
#include "envoy/config/core/v3/protocol.pb.validate.h"
#include "envoy/config/accesslog/v3/accesslog.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"
@ -26,9 +25,7 @@
#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"
#include "envoy/config/bootstrap/v3/bootstrap.pb.validate.h"
#include "google/protobuf/text_format.h"
@ -53,8 +50,8 @@ template <class Proto> struct TestCase {
// Basic protoc-gen-validate C++ validation header inclusion and Validate calls
// from data plane API.
int main(int argc, char* argv[]) {
envoy::config::bootstrap::v2::Bootstrap invalid_bootstrap;
int main(int /*argc*/, char* /*argv*/[]) {
envoy::config::bootstrap::v3::Bootstrap invalid_bootstrap;
invalid_bootstrap.mutable_static_resources()->add_clusters();
// This is a baseline test of the validation features we care about. It's
// probably not worth adding in every filter and field that we want to valid
@ -68,12 +65,12 @@ int main(int argc, char* argv[]) {
address { pipe { path: "/" } }
}
)EOF";
envoy::config::bootstrap::v2::Bootstrap valid_bootstrap;
envoy::config::bootstrap::v3::Bootstrap valid_bootstrap;
if (!google::protobuf::TextFormat::ParseFromString(valid_bootstrap_text, &valid_bootstrap)) {
std::cerr << "Unable to parse text proto: " << valid_bootstrap_text << std::endl;
exit(EXIT_FAILURE);
}
TestCase<envoy::config::bootstrap::v2::Bootstrap>{invalid_bootstrap, valid_bootstrap}.run();
TestCase<envoy::config::bootstrap::v3::Bootstrap>{invalid_bootstrap, valid_bootstrap}.run();
exit(EXIT_SUCCESS);
}

Write Preview
Loading…
Cancel
Save