feat: set no_match_error if the default_version is unset

aignas · aignas · commit 52bdd014a2c2 · 2023-07-26T09:51:20.000+09:00
diff --git a/python/private/render_pkg_aliases.bzl b/python/private/render_pkg_aliases.bzl
@@ -19,18 +19,54 @@ This is used in bzlmod and non-bzlmod setups."""
 load("//python/private:normalize_name.bzl", "normalize_name")
 load(":version_label.bzl", "version_label")
 
-_DEFAULT = """\
+_ALIAS = """\
 alias(
     name = "{name}",
-    actual = "@{repo_name}_{dep}//:{target}",
+    actual = "{actual}",
 )"""
 
 _SELECT = """\
 alias(
     name = "{name}",
-    actual = select({{{selects}}}),
+    actual = select({args}),
 )"""
 
+def _indent(text, indent = " " * 4):
+    return "\n".join([indent + line for line in text.split("\n")])
+
+def _render_select(name, selects, no_match_error = None):
+    dict_str = "\n".join([
+        "{",
+        _indent("\n".join([
+            "{}: {},".format(repr(k), repr(v))
+            for k, v in selects.items()
+        ])),
+        "},",
+    ])
+    args = _indent(dict_str)
+
+    if no_match_error:
+        args = "\n".join([
+            "",
+            _indent(args),
+            _indent(
+                "no_match_error = \"{error_str}\",".format(
+                    selects = args,
+                    error_str = no_match_error,
+                ),
+                indent = " " * 8,
+            ),
+            _indent(""),
+        ])
+    else:
+        # A single arg is present, so strip spaces and delimiters surrounding the dict
+        args = args.strip(", ")
+
+    return _SELECT.format(
+        name = name,
+        args = args,
+    )
+
 def _render_alias(
         *,
         name,
@@ -47,11 +83,13 @@ def _render_alias(
     generated.
     """
     if versions == None:
-        return _DEFAULT.format(
+        return _ALIAS.format(
             name = name,
-            repo_name = repo_name,
-            dep = dep,
-            target = target,
+            actual = "@{repo_name}_{dep}//:{target}".format(
+                repo_name = repo_name,
+                dep = dep,
+                target = target,
+            ),
         )
 
     # Create the alias repositories which contains different select
@@ -71,35 +109,30 @@ def _render_alias(
         )
         selects[condition] = actual
 
+    if not default_version:
+        return _render_select(
+            name,
+            selects,
+            no_match_error = "PyPI package is only available for versions: {}".format(
+                ",".join(versions),
+            ),
+        )
+
     default_actual = "@{repo_name}_{version}_{dep}//:{target}".format(
         repo_name = repo_name,
         version = version_label(default_version),
         dep = dep,
         target = target,
     )
     selects["//conditions:default"] = default_actual
-
-    return _SELECT.format(
-        name = name,
-        selects = "\n{}    ".format(
-            "".join([
-                "        {}: {},\n".format(repr(k), repr(v))
-                for k, v in selects.items()
-            ]),
-        ),
-    )
+    return _render_select(name, selects)
 
 def _render_common_aliases(repo_name, name, versions = None, default_version = None, rules_python = None):
     return "\n\n".join([
         """package(default_visibility = ["//visibility:public"])""",
-        _render_alias(
+        _ALIAS.format(
             name = name,
-            repo_name = repo_name,
-            dep = name,
-            target = "pkg",
-            versions = versions,
-            default_version = default_version,
-            rules_python = rules_python,
+            actual = ":pkg",
         ),
     ] + [
         _render_alias(
diff --git a/tests/pip_hub_repository/render_pkg_aliases/render_pkg_aliases_test.bzl b/tests/pip_hub_repository/render_pkg_aliases/render_pkg_aliases_test.bzl
@@ -31,7 +31,7 @@ package(default_visibility = ["//visibility:public"])
 
 alias(
     name = "foo",
-    actual = "@pypi_foo//:pkg",
+    actual = ":pkg",
 )
 
 alias(
@@ -87,10 +87,7 @@ package(default_visibility = ["//visibility:public"])
 
 alias(
     name = "bar_baz",
-    actual = select({
-        "@@rules_python//python/config_settings:is_python_3.2.3": "@pypi_32_bar_baz//:pkg",
-        "//conditions:default": "@pypi_32_bar_baz//:pkg",
-    }),
+    actual = ":pkg",
 )
 
 alias(
@@ -130,6 +127,70 @@ alias(
 
 _tests.append(_test_bzlmod_aliases)
 
+def _test_bzlmod_aliases_with_no_default_version(env):
+    actual = render_pkg_aliases(
+        default_version = None,
+        repo_name = "pypi",
+        rules_python = "rules_python",
+        whl_map = {
+            "bar-baz": ["3.2.3"],
+        },
+    )
+
+    want = {
+        "bar_baz/BUILD.bazel": """\
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "bar_baz",
+    actual = ":pkg",
+)
+
+alias(
+    name = "pkg",
+    actual = select(
+        {
+            "@@rules_python//python/config_settings:is_python_3.2.3": "@pypi_32_bar_baz//:pkg",
+        },
+        no_match_error = "PyPI package is only available for versions: 3.2.3",
+    ),
+)
+
+alias(
+    name = "whl",
+    actual = select(
+        {
+            "@@rules_python//python/config_settings:is_python_3.2.3": "@pypi_32_bar_baz//:whl",
+        },
+        no_match_error = "PyPI package is only available for versions: 3.2.3",
+    ),
+)
+
+alias(
+    name = "data",
+    actual = select(
+        {
+            "@@rules_python//python/config_settings:is_python_3.2.3": "@pypi_32_bar_baz//:data",
+        },
+        no_match_error = "PyPI package is only available for versions: 3.2.3",
+    ),
+)
+
+alias(
+    name = "dist_info",
+    actual = select(
+        {
+            "@@rules_python//python/config_settings:is_python_3.2.3": "@pypi_32_bar_baz//:dist_info",
+        },
+        no_match_error = "PyPI package is only available for versions: 3.2.3",
+    ),
+)""",
+    }
+
+    env.expect.that_dict(actual).contains_exactly(want)
+
+_tests.append(_test_bzlmod_aliases_with_no_default_version)
+
 def _test_bzlmod_aliases_are_created_for_all_wheels(env):
     actual = render_pkg_aliases(
         default_version = "3.2.3",
