adding tests

internal/bzlmod/go_deps.bzl

@@ -28,6 +28,7 @@ load(
  "format_rule_call",
  "get_directive_value",
  "with_replaced_or_new_fields",
+ "repo_name",
 )
 
 visibility("//")
@@ -163,17 +164,6 @@ def _get_patch_args(path, module_overrides):
  override = _get_override_or_default(module_overrides, struct(), {}, path, None, "patch_strip")
  return ["-p{}".format(override)] if override else []
 
-def _repo_name(importpath):
- path_segments = importpath.split("/")
- segments = reversed(path_segments[0].split(".")) + path_segments[1:]
- candidate_name = "_".join(segments).replace("-", "_")
-
- def _encode_case(c):
- """Repo names end up as directory names, therefore we can't rely on case to distinguish importpaths that only differ in case"""
- return "_" + c.lower() if c.isupper() else c
-
- return "".join([_encode_case(c) if c.isalnum() else "_" for c in candidate_name.elems()])
-
 def _is_dev_dependency(module_ctx, tag):
  if hasattr(tag, "_is_dev_dependency"):
  # Synthetic tags generated from go_deps.from_file have this "hidden" attribute.
@@ -504,9 +494,9 @@ def _go_deps_impl(module_ctx):
  if module.is_root and not module_tag.indirect:
  root_versions[module_tag.path] = raw_version
  if _is_dev_dependency(module_ctx, module_tag):
- root_module_direct_dev_deps[_repo_name(module_tag.path)] = None
+ root_module_direct_dev_deps[repo_name(module_tag.path)] = None
  else:
- root_module_direct_deps[_repo_name(module_tag.path)] = None
+ root_module_direct_deps[repo_name(module_tag.path)] = None
 
  version = semver.to_comparable(raw_version)
  previous = paths.get(module_tag.path)
@@ -528,7 +518,7 @@ def _go_deps_impl(module_ctx):
  local_path = replacement.local_path
 
  module_resolutions[module_tag.path] = struct(
- repo_name = _repo_name(module_tag.path),
+ repo_name = repo_name(module_tag.path),
  version = version,
  raw_version = raw_version,
  to_path = to_path,
@@ -600,8 +590,8 @@ def _go_deps_impl(module_ctx):
  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.
- root_module_direct_deps.pop(_repo_name(path), default = None)
- root_module_direct_dev_deps.pop(_repo_name(path), default = None)
+ root_module_direct_deps.pop(repo_name(path), default = None)
+ root_module_direct_dev_deps.pop(repo_name(path), default = None)
  continue
  if getattr(module_ctx, "is_isolated", False) and path in _SHARED_REPOS:
  # Do not create a go_repository for a dep shared with the non-isolated instance of

internal/bzlmod/utils.bzl

@@ -119,6 +119,17 @@ def with_replaced_or_new_fields(_struct, **replacements):
 
  return struct(**new_struct_assignments)
 
+def repo_name(importpath):
+ path_segments = importpath.split("/")
+ segments = reversed(path_segments[0].split(".")) + path_segments[1:]
+ candidate_name = "_".join(segments).replace("-", "_")
+
+ def _encode_case(c):
+ """Repo names end up as directory names, therefore we can't rely on case to distinguish importpaths that only differ in case"""
+ return "_" + c.lower() if c.isupper() else c
+
+ return "".join([_encode_case(c) if c.isalnum() else "_" for c in candidate_name.elems()])
+
 def extension_metadata(
  module_ctx,
  *,

tests/bcr/go_mod/MODULE.bazel

@@ -137,7 +137,7 @@ use_repo(
  go_deps,
  "com_github_bazelbuild_buildtools",
  "com_github_bmatcuk_doublestar_v4",
- "com_github_datadog_sketches_go",
+ "com_github__data_dog_sketches_go",
  "com_github_envoyproxy_protoc_gen_validate",
  "com_github_fmeum_dep_on_gazelle",
  "com_github_google_go_jsonnet",

tests/bcr/go_work/MODULE.bazel

@@ -128,7 +128,7 @@ use_repo(
  "com_github_99designs_gqlgen",
  "com_github_bazelbuild_buildtools",
  "com_github_bmatcuk_doublestar_v4",
- "com_github_datadog_sketches_go",
+ "com_github__data_dog_sketches_go",
  "com_github_envoyproxy_protoc_gen_validate",
  "com_github_fmeum_dep_on_gazelle",
  "com_github_google_safetext",

tests/bzlmod/utils_test.bzl

@@ -1,5 +1,5 @@
 load("@bazel_skylib//lib:unittest.bzl", "asserts", "unittest")
-load("//internal/bzlmod:utils.bzl", "with_replaced_or_new_fields")
+load("//internal/bzlmod:utils.bzl", "with_replaced_or_new_fields", "repo_name")
 
 _BEFORE_STRUCT = struct(
  direct = True,
@@ -25,8 +25,18 @@ def _with_replaced_or_new_fields_test_impl(ctx):
 
 with_replaced_or_new_fields_test = unittest.make(_with_replaced_or_new_fields_test_impl)
 
+def _repo_name_test_impl(ctx):
+ env = unittest.begin(ctx)
+ asserts.equals(env, "com_github_shurcoo_l_githubv4", repo_name("github.com/shurcooL/githubv4"))
+ asserts.equals(env, "com_github_shurcool_githubv4", repo_name("github.com/shurcool/githubv4"))
+ asserts.equals(env, "com_github__d_a_t_a__d_o_g_go_sqlmock", repo_name("github.com/DATA-DOG/go-sqlmock"))
+ return unittest.end(env)
+
+repo_name_test = unittest.make(_repo_name_test_impl)
+
 def utils_test_suite(name):
  unittest.suite(
  name,
  with_replaced_or_new_fields_test,
+ repo_name_test,
  )