build: removing hard-coded extension from generate_extension_db.py (e…

…nvoyproxy#11711) Risk Level: Low Testing: n/a Docs Changes: n/a Release Notes: n/a Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
songhu · Jun 25, 2020 · 616796c · 616796c
1 parent c5b1fa1
commit 616796c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/docs/generate_extension_db.py b/docs/generate_extension_db.py
@@ -55,8 +55,11 @@ def GetExtensionMetadata(target):
   extension_db = {}
   for extension, target in extensions_build_config.EXTENSIONS.items():
     extension_db[extension] = GetExtensionMetadata(target)
-  # The TLS transport extension is not in source/extensions/extensions_build_config.bzl
+  # The TLS and generic upstream extensions are hard-coded into the build, so
+  # not in source/extensions/extensions_build_config.bzl
   extension_db['envoy.transport_sockets.tls'] = GetExtensionMetadata(
       '//source/extensions/transport_sockets/tls:config')
+  extension_db['envoy.upstreams.http.generic'] = GetExtensionMetadata(
+      '//source/extensions/upstreams/http/generic:config')
 
   pathlib.Path(output_path).write_text(json.dumps(extension_db))
diff --git a/source/extensions/extensions_build_config.bzl b/source/extensions/extensions_build_config.bzl
@@ -191,10 +191,7 @@ EXTENSIONS = {
     "envoy.internal_redirect_predicates.previous_routes":     "//source/extensions/internal_redirect/previous_routes:config",
     "envoy.internal_redirect_predicates.safe_cross_scheme":   "//source/extensions/internal_redirect/safe_cross_scheme:config",
 
-    # Http Upstreams
-    # TODO(alyssawilk) these are linked in the default build and shouldn't be here: fix tooling and remove.
-
-    "envoy.upstreams.http.generic":                     "//source/extensions/upstreams/http/generic:config",
+    # Http Upstreams (excepting envoy.upstreams.http.generic which is hard-coded into the build so not registered here)
     "envoy.upstreams.http.http":                     "//source/extensions/upstreams/http/http:config",
     "envoy.upstreams.http.tcp":                     "//source/extensions/upstreams/http/tcp:config",
 

diff --git a/source/server/BUILD b/source/server/BUILD
@@ -329,8 +329,6 @@ envoy_cc_library(
         "//source/extensions/filters/network/http_connection_manager:config",
         "//source/extensions/transport_sockets:well_known_names",
         "//source/extensions/upstreams/http/generic:config",
-        "//source/extensions/upstreams/http/http:config",
-        "//source/extensions/upstreams/http/tcp:config",
         "@envoy_api//envoy/admin/v3:pkg_cc_proto",
         "@envoy_api//envoy/api/v2:pkg_cc_proto",
         "@envoy_api//envoy/api/v2/listener:pkg_cc_proto",

diff --git a/test/extensions/filters/http/common/fuzz/BUILD b/test/extensions/filters/http/common/fuzz/BUILD
@@ -59,6 +59,7 @@ envoy_cc_fuzz_test(
         ":uber_filter_lib",
         "//source/common/config:utility_lib",
         "//source/common/protobuf:utility_lib",
+        "//source/extensions/upstreams/http/generic:config",
         "//test/config:utility_lib",
         "@envoy_api//envoy/service/auth/v3:pkg_cc_proto",
         "@envoy_api//envoy/service/auth/v2alpha:pkg_cc_proto",