From f4f80dbcd218aaa9804f526048fbff9486ef4b89 Mon Sep 17 00:00:00 2001 From: "data-plane-api(Azure Pipelines)" Date: Fri, 13 Aug 2021 01:04:45 +0000 Subject: [PATCH] build: setup contrib (#17595) Signed-off-by: Matt Klein Mirrored from https://github.com/envoyproxy/envoy @ e385e016e941b6c2d91096b0b792aa6940d4b38c --- BUILD | 2 +- .../envoy}/extensions/filters/http/squash/v3/BUILD | 0 .../envoy}/extensions/filters/http/squash/v3/squash.proto | 0 test/validate/BUILD | 1 - test/validate/pgv_test.cc | 1 - versioning/BUILD | 2 +- 6 files changed, 2 insertions(+), 4 deletions(-) rename {envoy => contrib/envoy}/extensions/filters/http/squash/v3/BUILD (100%) rename {envoy => contrib/envoy}/extensions/filters/http/squash/v3/squash.proto (100%) diff --git a/BUILD b/BUILD index 24e0ea0d..044bc7d1 100644 --- a/BUILD +++ b/BUILD @@ -57,6 +57,7 @@ proto_library( name = "v3_protos", visibility = ["//visibility:public"], deps = [ + "//contrib/envoy/extensions/filters/http/squash/v3:pkg", "//envoy/admin/v3:pkg", "//envoy/config/accesslog/v3:pkg", "//envoy/config/bootstrap/v3:pkg", @@ -143,7 +144,6 @@ proto_library( "//envoy/extensions/filters/http/rbac/v3:pkg", "//envoy/extensions/filters/http/router/v3:pkg", "//envoy/extensions/filters/http/set_metadata/v3:pkg", - "//envoy/extensions/filters/http/squash/v3:pkg", "//envoy/extensions/filters/http/tap/v3:pkg", "//envoy/extensions/filters/http/wasm/v3:pkg", "//envoy/extensions/filters/listener/http_inspector/v3:pkg", diff --git a/envoy/extensions/filters/http/squash/v3/BUILD b/contrib/envoy/extensions/filters/http/squash/v3/BUILD similarity index 100% rename from envoy/extensions/filters/http/squash/v3/BUILD rename to contrib/envoy/extensions/filters/http/squash/v3/BUILD diff --git a/envoy/extensions/filters/http/squash/v3/squash.proto b/contrib/envoy/extensions/filters/http/squash/v3/squash.proto similarity index 100% rename from envoy/extensions/filters/http/squash/v3/squash.proto rename to contrib/envoy/extensions/filters/http/squash/v3/squash.proto diff --git a/test/validate/BUILD b/test/validate/BUILD index 049780c2..79b6d6d9 100644 --- a/test/validate/BUILD +++ b/test/validate/BUILD @@ -20,7 +20,6 @@ api_cc_test( "@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", diff --git a/test/validate/pgv_test.cc b/test/validate/pgv_test.cc index feee839c..75f7692b 100644 --- a/test/validate/pgv_test.cc +++ b/test/validate/pgv_test.cc @@ -19,7 +19,6 @@ #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" diff --git a/versioning/BUILD b/versioning/BUILD index ef972635..33e48b64 100644 --- a/versioning/BUILD +++ b/versioning/BUILD @@ -9,6 +9,7 @@ proto_library( name = "active_protos", visibility = ["//visibility:public"], deps = [ + "//contrib/envoy/extensions/filters/http/squash/v3:pkg", "//envoy/admin/v3:pkg", "//envoy/config/accesslog/v3:pkg", "//envoy/config/bootstrap/v3:pkg", @@ -95,7 +96,6 @@ proto_library( "//envoy/extensions/filters/http/rbac/v3:pkg", "//envoy/extensions/filters/http/router/v3:pkg", "//envoy/extensions/filters/http/set_metadata/v3:pkg", - "//envoy/extensions/filters/http/squash/v3:pkg", "//envoy/extensions/filters/http/tap/v3:pkg", "//envoy/extensions/filters/http/wasm/v3:pkg", "//envoy/extensions/filters/listener/http_inspector/v3:pkg",