Revert "generic proxy: move generic proxy from contrib into extensions (

envoyproxy#34892)" This reverts commit 0dbd441. Signed-off-by: Alyssa Wilk <[email protected]>
alyssawilk · Jul 9, 2024 · 152880f · 152880f
1 parent 0dbd441
commit 152880f
Show file tree

Hide file tree

Showing 97 changed files with 1,018 additions and 2,558 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -343,8 +343,6 @@ extensions/filters/http/oauth2 @derekargueta @mattklein123
 /*/extensions/geoip_providers/maxmind @nezdolik @ravenblackx
 # Match delegate extension
 /*/extensions/filters/http/match_delegate @wbpcode @jstraceski @tyxia
-# Generic proxy and related extensions
-/*/extensions/filters/network/generic_proxy/ @wbpcode @soulxu
 
 /*/extensions/health_checkers/common @zuercher @botengyao
 

diff --git a/api/BUILD b/api/BUILD
@@ -81,7 +81,13 @@ proto_library(
         "//contrib/envoy/extensions/filters/http/squash/v3:pkg",
         "//contrib/envoy/extensions/filters/http/sxg/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/client_ssl_auth/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/v3:pkg",
         "//contrib/envoy/extensions/filters/network/golang/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha:pkg",
@@ -224,12 +230,6 @@ proto_library(
         "//envoy/extensions/filters/network/dubbo_proxy/v3:pkg",
         "//envoy/extensions/filters/network/echo/v3:pkg",
         "//envoy/extensions/filters/network/ext_authz/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/codecs/http1/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
         "//envoy/extensions/filters/network/local_ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/mongo_proxy/v3:pkg",

diff --git a/...ers/network/generic_proxy/action/v3/BUILD → ...ers/network/generic_proxy/action/v3/BUILD b/...ers/network/generic_proxy/action/v3/BUILD → ...ers/network/generic_proxy/action/v3/BUILD
diff --git a/...work/generic_proxy/action/v3/action.proto → ...work/generic_proxy/action/v3/action.proto b/...work/generic_proxy/action/v3/action.proto → ...work/generic_proxy/action/v3/action.proto
@@ -16,7 +16,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.action.v3";
 option java_outer_classname = "ActionProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/action/v3;actionv3";
+option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/action/v3;actionv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

diff --git a/...twork/generic_proxy/codecs/dubbo/v3/BUILD → ...twork/generic_proxy/codecs/dubbo/v3/BUILD b/...twork/generic_proxy/codecs/dubbo/v3/BUILD → ...twork/generic_proxy/codecs/dubbo/v3/BUILD
diff --git a/...generic_proxy/codecs/dubbo/v3/dubbo.proto → ...generic_proxy/codecs/dubbo/v3/dubbo.proto b/...generic_proxy/codecs/dubbo/v3/dubbo.proto → ...generic_proxy/codecs/dubbo/v3/dubbo.proto
@@ -9,7 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.codecs.dubbo.v3";
 option java_outer_classname = "DubboProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3;dubbov3";
+option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3;dubbov3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

diff --git a/...twork/generic_proxy/codecs/http1/v3/BUILD → ...twork/generic_proxy/codecs/http1/v3/BUILD b/...twork/generic_proxy/codecs/http1/v3/BUILD → ...twork/generic_proxy/codecs/http1/v3/BUILD
diff --git a/...generic_proxy/codecs/http1/v3/http1.proto → ...generic_proxy/codecs/http1/v3/http1.proto b/...generic_proxy/codecs/http1/v3/http1.proto → ...generic_proxy/codecs/http1/v3/http1.proto
@@ -11,7 +11,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.codecs.http1.v3";
 option java_outer_classname = "Http1Proto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3;http1v3";
+option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3;http1v3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

diff --git a/...rs/network/generic_proxy/matcher/v3/BUILD → ...rs/network/generic_proxy/matcher/v3/BUILD b/...rs/network/generic_proxy/matcher/v3/BUILD → ...rs/network/generic_proxy/matcher/v3/BUILD
diff --git a/...rk/generic_proxy/matcher/v3/matcher.proto → ...rk/generic_proxy/matcher/v3/matcher.proto b/...rk/generic_proxy/matcher/v3/matcher.proto → ...rk/generic_proxy/matcher/v3/matcher.proto
@@ -12,7 +12,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.matcher.v3";
 option java_outer_classname = "MatcherProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/matcher/v3;matcherv3";
+option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3;matcherv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

diff --git a/...ers/network/generic_proxy/router/v3/BUILD → ...ers/network/generic_proxy/router/v3/BUILD b/...ers/network/generic_proxy/router/v3/BUILD → ...ers/network/generic_proxy/router/v3/BUILD
diff --git a/...work/generic_proxy/router/v3/router.proto → ...work/generic_proxy/router/v3/router.proto b/...work/generic_proxy/router/v3/router.proto → ...work/generic_proxy/router/v3/router.proto
@@ -9,7 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.router.v3";
 option java_outer_classname = "RouterProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/router/v3;routerv3";
+option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/router/v3;routerv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

diff --git a/...ns/filters/network/generic_proxy/v3/BUILD → ...ns/filters/network/generic_proxy/v3/BUILD b/...ns/filters/network/generic_proxy/v3/BUILD → ...ns/filters/network/generic_proxy/v3/BUILD
diff --git a/...work/generic_proxy/v3/generic_proxy.proto → ...work/generic_proxy/v3/generic_proxy.proto b/...work/generic_proxy/v3/generic_proxy.proto → ...work/generic_proxy/v3/generic_proxy.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package envoy.extensions.filters.network.generic_proxy.v3;
 
+import "contrib/envoy/extensions/filters/network/generic_proxy/v3/route.proto";
 import "envoy/config/accesslog/v3/accesslog.proto";
 import "envoy/config/core/v3/config_source.proto";
 import "envoy/config/core/v3/extension.proto";
-import "envoy/extensions/filters/network/generic_proxy/v3/route.proto";
 import "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto";
 
 import "xds/annotations/v3/status.proto";
@@ -16,7 +16,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.v3";
 option java_outer_classname = "GenericProxyProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
+option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

diff --git a/...ters/network/generic_proxy/v3/route.proto → ...ters/network/generic_proxy/v3/route.proto b/...ters/network/generic_proxy/v3/route.proto → ...ters/network/generic_proxy/v3/route.proto
@@ -11,7 +11,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.v3";
 option java_outer_classname = "RouteProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
+option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

diff --git a/api/versioning/BUILD b/api/versioning/BUILD
@@ -19,7 +19,13 @@ proto_library(
         "//contrib/envoy/extensions/filters/http/squash/v3:pkg",
         "//contrib/envoy/extensions/filters/http/sxg/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/client_ssl_auth/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
+        "//contrib/envoy/extensions/filters/network/generic_proxy/v3:pkg",
         "//contrib/envoy/extensions/filters/network/golang/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha:pkg",
@@ -162,12 +168,6 @@ proto_library(
         "//envoy/extensions/filters/network/dubbo_proxy/v3:pkg",
         "//envoy/extensions/filters/network/echo/v3:pkg",
         "//envoy/extensions/filters/network/ext_authz/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/codecs/http1/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
-        "//envoy/extensions/filters/network/generic_proxy/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
         "//envoy/extensions/filters/network/local_ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/mongo_proxy/v3:pkg",

diff --git a/contrib/contrib_build_config.bzl b/contrib/contrib_build_config.bzl
@@ -27,6 +27,7 @@ CONTRIB_EXTENSIONS = {
     "envoy.filters.network.mysql_proxy":                        "//contrib/mysql_proxy/filters/network/source:config",
     "envoy.filters.network.postgres_proxy":                     "//contrib/postgres_proxy/filters/network/source:config",
     "envoy.filters.network.rocketmq_proxy":                     "//contrib/rocketmq_proxy/filters/network/source:config",
+    "envoy.filters.network.generic_proxy":                      "//contrib/generic_proxy/filters/network/source:config",
     "envoy.filters.network.golang":                             "//contrib/golang/filters/network/source:config",
 
     #
@@ -70,6 +71,9 @@ CONTRIB_EXTENSIONS = {
     #
     # Extensions for generic proxy
     #
+    "envoy.filters.generic.router":                             "//contrib/generic_proxy/filters/network/source/router:config",
+    "envoy.generic_proxy.codecs.dubbo":                         "//contrib/generic_proxy/filters/network/source/codecs/dubbo:config",
+    "envoy.generic_proxy.codecs.http1":                         "//contrib/generic_proxy/filters/network/source/codecs/http1:config",
     "envoy.generic_proxy.codecs.kafka":                         "//contrib/generic_proxy/filters/network/source/codecs/kafka:config",
 
     #

diff --git a/contrib/extensions_metadata.yaml b/contrib/extensions_metadata.yaml
@@ -118,13 +118,39 @@ envoy.xds_delegates.kv_store:
   - envoy.xds_delegates
   security_posture: data_plane_agnostic
   status: wip
+envoy.filters.network.generic_proxy:
+  categories:
+  - envoy.filters.network
+  security_posture: requires_trusted_downstream_and_upstream
+  status: wip
+envoy.filters.generic.router:
+  categories:
+  - envoy.generic_proxy.filters
+  security_posture: requires_trusted_downstream_and_upstream
+  status: wip
+  type_urls:
+  - envoy.extensions.filters.network.generic_proxy.router.v3.Router
+envoy.generic_proxy.codecs.dubbo:
+  categories:
+  - envoy.generic_proxy.codecs
+  security_posture: requires_trusted_downstream_and_upstream
+  status: wip
+  type_urls:
+  - envoy.extensions.filters.network.generic_proxy.codecs.dubbo.v3.DubboCodecConfig
 envoy.generic_proxy.codecs.kafka:
   categories:
   - envoy.generic_proxy.codecs
   security_posture: requires_trusted_downstream_and_upstream
   status: wip
   type_urls:
   - envoy.extensions.filters.network.generic_proxy.codecs.kafka.v3.KafkaCodecConfig
+envoy.generic_proxy.codecs.http1:
+  categories:
+  - envoy.generic_proxy.codecs
+  security_posture: requires_trusted_downstream_and_upstream
+  status: wip
+  type_urls:
+  - envoy.extensions.filters.network.generic_proxy.codecs.http1.v3.Http1CodecConfig
 envoy.router.cluster_specifier_plugin.golang:
   categories:
   - envoy.router.cluster_specifier_plugin