Work in review feedback

Author: Ongy

helm/extensions.bzl

@@ -2,6 +2,10 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load(
+    "//helm:defs.bzl",
+    "helm_import_repository",
+)
 load(
     "//helm:repositories.bzl",
     "helm_host_alias_repository",
@@ -14,25 +18,35 @@ load(
     "DEFAULT_HELM_VERSION",
     "HELM_VERSIONS",
 )
-load(
-    "//helm:defs.bzl",
-    "helm_import_repository",
-)
 
 _HELM_TAR_BUILD_CONTENT = """\
 package(default_visibility = ["//visibility:public"])
 exports_files(glob(["**"]))
 """
 
 def _helm_impl(ctx):
-    module = ctx.modules[0]
-    options = module.tags.options
-    version = options[0].version
-    helm_url_templates = options[0].helm_url_templates
-    plugins = options[0].plugins
+    for mod in ctx.modules:
+        options = mod.tags.options
+        if len(options) > 0:
+            version = options[0].version
+            helm_url_templates = options[0].helm_url_templates
+            plugins = options[0].plugins
+
+            _register_toolchains(version, helm_url_templates, plugins)
+            _register_go_yaml()
 
-    _register_toolchains(version, helm_url_templates, plugins)
-    _register_go_yaml()
+        for repository in mod.tags.import_repository:
+            if not mod.is_root:
+                print("Ignoring import of", repository.chart_name, "from", repository.repository, "because it's not done from the root module")
+                continue
+            helm_import_repository(
+                name = repository.name,
+                chart_name = repository.chart_name,
+                repository = repository.repository,
+                sha256 = repository.sha256,
+                url = repository.url,
+                version = repository.version,
+            )
 
 def _register_toolchains(version, helm_url_templates, plugins):
     if not version in HELM_VERSIONS:
@@ -118,42 +132,28 @@ options = tag_class(attrs = {
 
 helm = module_extension(
     implementation = _helm_impl,
-    tag_classes = {"options": options},
-)
-
-def _helm_import_impl(module_ctx):
-    for mod in module_ctx.modules:
-        for repository in mod.tags.repository:
-            helm_import_repository(
-                name = repository.name,
-                chart_name = repository.chart_name,
-                repository = repository.repository,
-                sha256 = repository.sha256,
-                url = repository.url,
-                version = repository.version,
-            )
-
-helm_import = module_extension(
-    implementation = _helm_import_impl,
-    tag_classes = {"repository": tag_class(attrs = {
-        "name": attr.string(
-            doc = "Name for the import dependency",
-        ),
-        "chart_name": attr.string(
-            doc = "Chart name to import.",
-        ),
-        "repository": attr.string(
-            doc = "Chart repository url where to locate the requested chart.",
-            mandatory = True,
-        ),
-        "sha256": attr.string(
-            doc = "The expected SHA-256 hash of the chart imported.",
-        ),
-        "url": attr.string(
-            doc = "The url where the chart can be directly downloaded.",
-        ),
-        "version": attr.string(
-            doc = "Specify a version constraint for the chart version to use.",
-        ),
-    })},
+    tag_classes = {
+        "options": options,
+        "import_repository": tag_class(attrs = {
+            "name": attr.string(
+                doc = "Name for the import dependency",
+            ),
+            "chart_name": attr.string(
+                doc = "Chart name to import.",
+            ),
+            "repository": attr.string(
+                doc = "Chart repository url where to locate the requested chart.",
+                mandatory = True,
+            ),
+            "sha256": attr.string(
+                doc = "The expected SHA-256 hash of the chart imported.",
+            ),
+            "url": attr.string(
+                doc = "The url where the chart can be directly downloaded.",
+            ),
+            "version": attr.string(
+                doc = "Specify a version constraint for the chart version to use.",
+            ),
+        }),
+    },
 )