filter: move http_connection_manager from http to network namespace. (#266)

Signed-off-by: Harvey Tuch <htuch@google.com>

api/BUILD

@@ -196,7 +196,7 @@ proto_library(
         ":protocol",
         ":rds",
         "//api/filter:accesslog",
-        "//api/filter/http:http_connection_manager",
+        "//api/filter/network:http_connection_manager",
         "//api/filter/network:mongo_proxy",
     ],
 )

api/filter/http/BUILD

@@ -10,7 +10,6 @@ proto_library(
         "buffer.proto",
         "fault.proto",
         "health_check.proto",
-        "http_connection_manager.proto",
         "ip_tagging.proto",
         "lua.proto",
         "rate_limit.proto",
@@ -50,17 +49,6 @@ go_proto_library(
     ],
 )
 
-api_proto_library(
-    name = "http_connection_manager",
-    srcs = ["http_connection_manager.proto"],
-    deps = [
-        "//api:base",
-        "//api:protocol",
-        "//api:rds",
-        "//api/filter:accesslog",
-    ],
-)
-
 api_proto_library(
     name = "router",
     srcs = ["router.proto"],

api/filter/network/BUILD

@@ -8,6 +8,7 @@ proto_library(
     name = "go_protos",
     srcs = [
         "client_ssl_auth.proto",
+        "http_connection_manager.proto",
         "mongo_proxy.proto",
         "rate_limit.proto",
         "redis_proxy.proto",
@@ -46,6 +47,17 @@ go_proto_library(
     ],
 )
 
+api_proto_library(
+    name = "http_connection_manager",
+    srcs = ["http_connection_manager.proto"],
+    deps = [
+        "//api:base",
+        "//api:protocol",
+        "//api:rds",
+        "//api/filter:accesslog",
+    ],
+)
+
 api_proto_library(
     name = "mongo_proxy",
     srcs = ["mongo_proxy.proto"],

api/filter/network/http_connection_manager.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
-package envoy.api.v2.filter.http;
+package envoy.api.v2.filter.network;
-option go_package = "http";
+option go_package = "network";
 
 import "api/base.proto";
 import "api/protocol.proto";
@@ -146,7 +146,7 @@ message HttpConnectionManager {
   // requests. If not set, there is no idle timeout. When the idle timeout is
   // reached the connection will be closed. If the connection is an HTTP/2
   // connection a drain sequence will occur prior to closing the connection. See
-  // :ref:`drain_timeout <envoy_api_field_filter.http.HttpConnectionManager.drain_timeout>`.
+  // :ref:`drain_timeout <envoy_api_field_filter.network.HttpConnectionManager.drain_timeout>`.
   google.protobuf.Duration idle_timeout = 11;
 
   // The time that Envoy will wait between sending an HTTP/2 “shutdown
@@ -212,7 +212,7 @@ message HttpConnectionManager {
   };
 
   // This field is valid only when :ref:`forward_client_cert_details
-  // <envoy_api_field_filter.http.HttpConnectionManager.forward_client_cert_details>` is
+  // <envoy_api_field_filter.network.HttpConnectionManager.forward_client_cert_details>` is
   // APPEND_FORWARD or SANITIZE_SET and the client connection is mTLS. It specifies the fields in
   // the client certificate to be forwarded. Note that in the
   // :ref:`config_http_conn_man_headers_x-forwarded-client-cert` header, *Hash* is always set, and

docs/build.sh

@@ -38,7 +38,7 @@ PROTO_RST="
   /api/sds/api/sds.proto.rst
   /api/filter/accesslog/api/filter/accesslog.proto.rst
   /api/filter/fault/api/filter/fault.proto.rst
-  /api/filter/http/http_connection_manager/api/filter/http/http_connection_manager.proto.rst
+  /api/filter/network/http_connection_manager/api/filter/network/http_connection_manager.proto.rst
   /api/filter/network/mongo_proxy/api/filter/network/mongo_proxy.proto.rst
   /api/protocol/api/protocol.proto.rst
   /api/rds/api/rds.proto.rst

docs/root/api-v2/filter/http/http.rst

@@ -9,4 +9,3 @@ HTTP filters
   :glob:
   :maxdepth: 2
 
-  *

docs/root/configuration/http_conn_man/http_conn_man.rst

@@ -6,7 +6,7 @@ HTTP connection manager
 * HTTP connection manager :ref:`architecture overview <arch_overview_http_conn_man>`.
 * HTTP protocols :ref:`architecture overview <arch_overview_http_protocols>`.
 * :ref:`v1 API reference <config_http_filters_http_conn_man_v1>`
-* :ref:`v2 API reference <envoy_api_msg_filter.http.HttpConnectionManager>`
+* :ref:`v2 API reference <envoy_api_msg_filter.network.HttpConnectionManager>`
 
 .. toctree::
   :hidden:

docs/root/configuration/overview/v2_overview.rst

@@ -359,8 +359,8 @@ for the service definition. This is used by Envoy as a client when
         cluster_name: [some_xds_cluster]
 
 is set in the :ref:`rds
-<envoy_api_field_filter.http.HttpConnectionManager.rds>` field of the :ref:`HttpConnectionManager
+<envoy_api_field_filter.network.HttpConnectionManager.rds>` field of the :ref:`HttpConnectionManager
-<envoy_api_msg_filter.http.HttpConnectionManager>` config.
+<envoy_api_msg_filter.network.HttpConnectionManager>` config.
 
 REST endpoints
 ^^^^^^^^^^^^^^
@@ -431,8 +431,8 @@ for the service definition. This is used by Envoy as a client when
         cluster_name: [some_xds_cluster]
 
 is set in the :ref:`rds
-<envoy_api_field_filter.http.HttpConnectionManager.rds>` field of the :ref:`HttpConnectionManager
+<envoy_api_field_filter.network.HttpConnectionManager.rds>` field of the :ref:`HttpConnectionManager
-<envoy_api_msg_filter.http.HttpConnectionManager>` config.
+<envoy_api_msg_filter.network.HttpConnectionManager>` config.
 
 Aggregated Discovery Service
 ----------------------------

tools/BUILD

@@ -7,7 +7,7 @@ py_binary(
     visibility = ["//visibility:public"],
     deps = [
         "//api:lds_py",
-        "//api/filter/http:http_connection_manager_py",
+        "//api/filter/network:http_connection_manager_py",
     ],
 )
 

tools/generate_listeners.py

@@ -17,7 +17,7 @@ from google.protobuf import struct_pb2
 from google.protobuf import text_format
 
 from api import lds_pb2
-from api.filter.http import http_connection_manager_pb2
+from api.filter.network import http_connection_manager_pb2
 
 
 # Convert an arbitrary proto object to its Struct proto representation.