Skip to content

More code reuse #116

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

Open
mering wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −20
Open

More code reuse #116

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
7219c2c
Re-use write_metadata_info()
mering Sep 11, 2023
d739509
Re-use write_licenses_info()
mering Sep 11, 2023
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
13 changes: 4 additions & 9 deletions rules/gather_licenses_info.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,9 @@ def _write_licenses_info_impl(target, ctx):
return [OutputGroupInfo(licenses = depset())]

# Write the output file for the target
name = "%s_licenses_info.json" % ctx.label.name
lic_info, _ = licenses_info_to_json(info)
content = "[\n%s\n]\n" % ",\n".join(lic_info)
out = ctx.actions.declare_file(name)
ctx.actions.write(
output = out,
content = content,
)
outs.append(out)
json_out = ctx.actions.declare_file("%s_licenses_info.json" % ctx.label.name)
write_licenses_info(ctx, target, json_out)
outs.append(json_out)

if ctx.attr._trace[TraceInfo].trace:
trace = ctx.actions.declare_file("%s_trace_info.json" % ctx.label.name)
Expand Down Expand Up @@ -146,6 +140,7 @@ def write_licenses_info(ctx, deps, json_out):
Returns:
A list of License File objects for each of the license paths referenced in the json.
"""

licenses_json = []
licenses_files = []
for dep in deps:
Expand Down
19 changes: 8 additions & 11 deletions rules_gathering/gather_metadata.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,9 @@ def _write_metadata_info_impl(target, ctx):
return [OutputGroupInfo(licenses = depset())]

# Write the output file for the target
name = "%s_metadata_info.json" % ctx.label.name
content = "[\n%s\n]\n" % ",\n".join(metadata_info_to_json(info))
out = ctx.actions.declare_file(name)
ctx.actions.write(
output = out,
content = content,
)
outs.append(out)
json_out = ctx.actions.declare_file("%s_metadata_info.json" % ctx.label.name)
write_metadata_info(ctx, target, json_out)
outs.append(json_out)

if ctx.attr._trace[TraceInfo].trace:
trace = ctx.actions.declare_file("%s_trace_info.json" % ctx.label.name)
Expand Down Expand Up @@ -140,8 +135,8 @@ def write_metadata_info(ctx, deps, json_out):

def _foo_impl(ctx):
...
out = ctx.actions.declare_file("%s_licenses.json" % ctx.label.name)
write_metadata_info(ctx, ctx.attr.deps, metadata_file)
json_file = ctx.actions.declare_file("%s_licenses.json" % ctx.label.name)
write_metadata_info(ctx, ctx.attr.deps, json_file)

Args:
ctx: context of the caller
Expand All @@ -150,10 +145,12 @@ def write_metadata_info(ctx, deps, json_out):
aspect over them
json_out: output handle to write the JSON info
"""

licenses = []
for dep in deps:
if TransitiveMetadataInfo in dep:
licenses.extend(metadata_info_to_json(dep[TransitiveMetadataInfo]))
metadata_info = dep[TransitiveMetadataInfo]
licenses.extend(metadata_info_to_json(metadata_info))
ctx.actions.write(
output = json_out,
content = "[\n%s\n]\n" % ",\n".join(licenses),
Expand Down