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

Writing resolved Go modules as K:V JSON for external bookkeeping #1906

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Writing resolved Go modules as K:V JSON for external bookkeeping #1906

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7916a0f
Writing resolved Go modules as K:V JSON for external bookkeeping
Buzz-Lightyear Aug 29, 2024
f06c5cb
Merge remote-tracking branch 'origin/master' into srini/depgraph
Buzz-Lightyear Aug 29, 2024
dfc4ad6
Only adding K:V for modules that have resolved versions
Buzz-Lightyear Aug 29, 2024
f11a8a6
Trying to explose resolved deps via bazel_gazelle_go_repository_config
Buzz-Lightyear Aug 30, 2024
367d612
For internal modules, version is None, so we're excluding it
Buzz-Lightyear Aug 30, 2024
aa09427
Exporting resolved_deps.json
Buzz-Lightyear Aug 30, 2024
f0e1348
Merge branch 'master' into srini/depgraph
Buzz-Lightyear Sep 9, 2024
a5c9bc3
Merge branch 'master' into srini/depgraph
Buzz-Lightyear Sep 12, 2024
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
11 changes: 10 additions & 1 deletion internal/bzlmod/go_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ def _go_repository_config_impl(ctx):
))

ctx.file("WORKSPACE", "\n".join(repos))
ctx.file("BUILD.bazel", "exports_files(['WORKSPACE', 'config.json'])")
ctx.file("BUILD.bazel", "exports_files(['WORKSPACE', 'config.json', 'resolved_deps.json'])")
ctx.file("go_env.bzl", content = "GO_ENV = " + repr(ctx.attr.go_env))

# For use by @rules_go//go.
Expand All @@ -268,13 +268,17 @@ def _go_repository_config_impl(ctx):
"dep_files": ctx.attr.dep_files,
}))

# For bookkeeping by upstream systems that may want this info
ctx.file("resolved_deps.json", content = json.encode_indent(ctx.attr.resolved_deps))

_go_repository_config = repository_rule(
implementation = _go_repository_config_impl,
attrs = {
"importpaths": attr.string_dict(mandatory = True),
"module_names": attr.string_dict(mandatory = True),
"build_naming_conventions": attr.string_dict(mandatory = True),
"go_env": attr.string_dict(mandatory = True),
"resolved_deps": attr.string_dict(mandatory = True),
"dep_files": attr.string_list(),
},
)
Expand Down Expand Up @@ -592,6 +596,7 @@ def _go_deps_impl(module_ctx):
),
)

resolved_go_modules = {}
for path, module in module_resolutions.items():
if hasattr(module, "module_name"):
# Do not create a go_repository for a Go module provided by a bazel_dep.
Expand Down Expand Up @@ -643,6 +648,9 @@ def _go_deps_impl(module_ctx):

go_repository_args.update(repo_args)

if "version" in go_repository_args and go_repository_args["version"]:
resolved_go_modules[go_repository_args["importpath"]] = go_repository_args["version"]

go_repository(**go_repository_args)

# Create a synthetic WORKSPACE file that lists all Go repositories created
Expand All @@ -669,6 +677,7 @@ def _go_deps_impl(module_ctx):
}),
go_env = go_env,
dep_files = dep_files,
resolved_deps = resolved_go_modules,
)

return extension_metadata(
Expand Down