test: removing deps on the tls inspector extension (envoyproxy#20614)

Fixes envoyproxy#9953 Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
ravenblackx · Jun 8, 2022 · 02fdd41 · 02fdd41
1 parent 811587e
commit 02fdd41
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 37 deletions.
diff --git a/source/extensions/filters/listener/tls_inspector/BUILD b/source/extensions/filters/listener/tls_inspector/BUILD
@@ -17,10 +17,6 @@ envoy_cc_library(
     srcs = ["tls_inspector.cc"],
     hdrs = ["tls_inspector.h"],
     external_deps = ["ssl"],
-    # TODO(#9953) clean up.
-    visibility = [
-        "//visibility:public",
-    ],
     deps = [
         "//envoy/event:dispatcher_interface",
         "//envoy/event:timer_interface",
@@ -39,10 +35,6 @@ envoy_cc_library(
 envoy_cc_extension(
     name = "config",
     srcs = ["config.cc"],
-    # TODO(#9953) clean up.
-    extra_visibility = [
-        "//test/integration:__subpackages__",
-    ],
     deps = [
         "//envoy/registry",
         "//envoy/server:filter_config_interface",

diff --git a/test/integration/BUILD b/test/integration/BUILD
@@ -178,10 +178,10 @@ envoy_cc_test(
         ":filter_manager_integration_proto_cc_proto",
         ":http_integration_lib",
         ":integration_lib",
-        "//source/extensions/filters/listener/tls_inspector:config",
         "//source/extensions/filters/network/common:factory_base_lib",
         "//source/extensions/filters/network/echo:config",
         "//source/extensions/filters/network/tcp_proxy:config",
+        "//test/integration/filters:test_listener_filter_lib",
         "//test/server:utility_lib",
         "//test/test_common:registry_lib",
         "//test/test_common:utility_lib",
@@ -1432,7 +1432,6 @@ envoy_cc_test(
     deps = [
         ":http_integration_lib",
         ":http_protocol_integration_lib",
-        "//source/extensions/filters/listener/tls_inspector:config",
         "//source/extensions/filters/network/tcp_proxy:config",
         "//source/extensions/transport_sockets/tls:config",
         "//source/extensions/transport_sockets/tls:context_config_lib",

diff --git a/test/server/BUILD b/test/server/BUILD
@@ -322,14 +322,14 @@ envoy_cc_test(
         "//source/common/protobuf",
         "//source/extensions/filters/listener/original_dst:config",
         "//source/extensions/filters/listener/proxy_protocol:config",
-        "//source/extensions/filters/listener/tls_inspector:config",
         "//source/extensions/filters/network/http_connection_manager:config",
         "//source/extensions/filters/network/tcp_proxy:config",
         "//source/extensions/request_id/uuid:config",
         "//source/extensions/transport_sockets/raw_buffer:config",
         "//source/extensions/transport_sockets/tls:config",
         "//source/extensions/transport_sockets/tls:ssl_socket_lib",
         "//source/server:active_raw_udp_listener_config",
+        "//test/integration/filters:test_listener_filter_lib",
         "//test/test_common:network_utility_lib",
         "//test/test_common:registry_lib",
         "//test/test_common:test_runtime_lib",

diff --git a/test/server/listener_manager_impl_test.cc b/test/server/listener_manager_impl_test.cc
@@ -2581,7 +2581,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithDestinationP
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         destination_port: 8080
@@ -2626,8 +2628,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithDirectSource
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
-      typed_config: {}
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         direct_source_prefix_ranges: { address_prefix: 127.0.0.0, prefix_len: 8 }
@@ -2672,7 +2675,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithDestinationI
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         prefix_ranges: { address_prefix: 127.0.0.0, prefix_len: 8 }
@@ -2717,7 +2722,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithServerNamesM
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         server_names: "server1.example.com"
@@ -2763,7 +2770,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithTransportPro
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         transport_protocol: "tls"
@@ -2804,7 +2813,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithApplicationP
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         application_protocols: "http/1.1"
@@ -2850,7 +2861,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceTypeMa
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         source_type: SAME_IP_OR_LOOPBACK
@@ -2908,7 +2921,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceIpMatc
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         source_prefix_ranges:
@@ -2967,7 +2982,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceIpv6Ma
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         source_prefix_ranges:
@@ -3006,7 +3023,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourcePortMa
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         source_ports:
@@ -3052,7 +3071,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainWithSourceType
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         source_type: SAME_IP_OR_LOOPBACK
@@ -3139,7 +3160,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDestinati
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         # empty
@@ -3224,7 +3247,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDestinati
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         # empty
@@ -3318,7 +3343,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDirectSou
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
       typed_config: {}
     filter_chains:
     - filter_chain_match:
@@ -3404,7 +3431,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithServerNam
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         # empty
@@ -3502,7 +3531,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithTransport
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         # empty
@@ -3546,7 +3577,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithApplicati
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         # empty
@@ -3593,7 +3626,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithMultipleR
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         # empty
@@ -3655,7 +3690,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDifferent
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         server_names: "example.com"
@@ -3698,7 +3735,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest,
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         server_names: "example.com"
@@ -3737,7 +3776,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithInvalidDesti
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         prefix_ranges: { address_prefix: a.b.c.d, prefix_len: 32 }
@@ -3753,7 +3794,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithInvalidServe
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         server_names: "*w.example.com"
@@ -3771,7 +3814,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithSameMatch
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - name : foo
       filter_chain_match:
@@ -3794,7 +3839,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest,
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - name: foo
       filter_chain_match:
@@ -3816,7 +3863,9 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithOverlappi
     address:
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
-    - name: "envoy.filters.listener.tls_inspector"
+    - name: "envoy.filters.listener.test"
+      typed_config:
+        "@type": type.googleapis.com/google.protobuf.Struct
     filter_chains:
     - filter_chain_match:
         server_names: "example.com"