Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: removing hard-coded extension from generate_extension_db.py #11711

Merged
merged 3 commits into from
Jun 25, 2020
Merged

build: removing hard-coded extension from generate_extension_db.py #11711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91ab61c
docs: fixing build
alyssawilk Jun 22, 2020
7f0e802
whitespace
alyssawilk Jun 23, 2020
fa4e8de
maybe fixing release build
alyssawilk Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion docs/generate_extension_db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
5 changes: 1 addition & 4 deletions source/extensions/extensions_build_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,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",

Expand Down
2 changes: 0 additions & 2 deletions source/server/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,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",
Expand Down
1 change: 1 addition & 0 deletions test/extensions/filters/http/common/fuzz/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down