Skip to content

deps: Dump/interpolate repository_locations -> json #19441

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

Merged
htuch merged 2 commits into from
Jan 11, 2022
Merged

deps: Dump/interpolate repository_locations -> json #19441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce7f882
deps: Dump/interpolate repository_locations -> json
phlax Jan 7, 2022
0367f88
bazel-mangle
phlax Jan 8, 2022
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
3 changes: 2 additions & 1 deletion api/bazel/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("@io_bazel_rules_go//proto:compiler.bzl", "go_proto_compiler")
load("//:utils.bzl", "json_data")
load(":repository_locations.bzl", "REPOSITORY_LOCATIONS_SPEC")
load(":repository_locations_utils.bzl", "load_repository_locations_spec")

licenses(["notice"]) # Apache 2

Expand All @@ -20,5 +21,5 @@ go_proto_compiler(

json_data(
name = "repository_locations",
data = REPOSITORY_LOCATIONS_SPEC,
data = load_repository_locations_spec(REPOSITORY_LOCATIONS_SPEC),
)
6 changes: 6 additions & 0 deletions api/bazel/repository_locations_utils.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,9 @@ def load_repository_locations_spec(repository_locations_spec):
mutable_location["strip_prefix"] = _format_version(location["strip_prefix"], location["version"])
mutable_location["urls"] = [_format_version(url, location["version"]) for url in location["urls"]]
return locations

def merge_dicts(*dicts):
result = {}
for d in dicts:
result.update(d)
return result
12 changes: 11 additions & 1 deletion bazel/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ load("//bazel:utils.bzl", "json_data")
load("@bazel_skylib//lib:selects.bzl", "selects")
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
load(":repository_locations.bzl", "REPOSITORY_LOCATIONS_SPEC")
load("@envoy_api//bazel:repository_locations.bzl", API_REPOSITORY_LOCATIONS_SPEC = "REPOSITORY_LOCATIONS_SPEC")
load("@envoy_api//bazel:repository_locations_utils.bzl", "load_repository_locations_spec", "merge_dicts")

licenses(["notice"]) # Apache 2

Expand Down Expand Up @@ -601,5 +603,13 @@ alias(

json_data(
name = "repository_locations",
data = REPOSITORY_LOCATIONS_SPEC,
data = load_repository_locations_spec(REPOSITORY_LOCATIONS_SPEC),
)

json_data(
name = "all_repository_locations",
data = merge_dicts(
load_repository_locations_spec(REPOSITORY_LOCATIONS_SPEC),
load_repository_locations_spec(API_REPOSITORY_LOCATIONS_SPEC),
),
)