allow to repackage third party charts

Author: slamdev

docs/rules.md

@@ -19,7 +19,7 @@ Defines a helm chart.
 | :------------- | :------------- | :------------- | :------------- | :------------- |
 | <a id="helm_chart-name"></a>name |  A unique name for this target.   | <a href="https://bazel.build/docs/build-ref.html#name">Name</a> | required |  |
 | <a id="helm_chart-app_version"></a>app_version |  Set the appVersion on the chart to this version.   | String | optional | "" |
-| <a id="helm_chart-deps"></a>deps |  Chart dependencies; must much the ones defined in a Chart.yaml file..   | <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a> | optional | [] |
+| <a id="helm_chart-deps"></a>deps |  Chart dependencies; must much the ones defined in a Chart.yaml file.   | <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a> | optional | [] |
 | <a id="helm_chart-image_digest_vars"></a>image_digest_vars |  Map of container image labels to a template keys, to extract digest from. <pre><code>image_digest_vars = {<br><br>    ":image": "{img_digest}",<br><br>}</code></pre>   | <a href="https://bazel.build/docs/skylark/lib/dict.html">Dictionary: Label -> String</a> | optional | {} |
 | <a id="helm_chart-srcs"></a>srcs |  Files to package into a chart; must contain a Chart.yaml file.   | <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a> | optional | [] |
 | <a id="helm_chart-values_files"></a>values_files |  Specify values in a YAML file (can specify multiple).   | <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a> | optional | [] |

example/repackage/BUILD.bazel

@@ -0,0 +1,48 @@
+load("//helm:defs.bzl", "helm_chart", "helm_install", "helm_lint_test", "helm_template")
+load("@bazel_tools//tools/build_rules:test_rules.bzl", "rule_test")
+
+helm_chart(
+    name = "chart",
+    srcs = ["@redis//:srcs"],
+    values_json = json.encode({
+        "image": {
+            "tag": "some-tag",
+        },
+    }),
+    values_files = ["values.yaml"],
+)
+
+rule_test(
+    name = "chart_test",
+    generates = ["chart.tgz"],
+    rule = ":chart",
+)
+
+helm_install(
+    name = "install",
+    chart = ":chart",
+    release_name = "hello-world",
+)
+
+rule_test(
+    name = "install_test",
+    generates = ["install"],
+    rule = ":install",
+)
+
+helm_template(
+    name = "template",
+    chart = ":chart",
+    release_name = "hello-world",
+)
+
+rule_test(
+    name = "template_test",
+    generates = ["template.yaml"],
+    rule = ":template",
+)
+
+helm_lint_test(
+    name = "lint",
+    chart = ":chart",
+)

example/repackage/values.yaml

@@ -0,0 +1 @@
+architecture: standalone

helm/private/rules/chart.bzl

@@ -45,7 +45,7 @@ _ATTRS = {
         allow_files = [".yml", ".yaml"],
     ),
     "deps": attr.label_list(
-        doc = "Chart dependencies; must much the ones defined in a Chart.yaml file..",
+        doc = "Chart dependencies; must much the ones defined in a Chart.yaml file.",
         allow_files = [".tgz"],
     ),
     "_windows_constraint": attr.label(
@@ -109,14 +109,12 @@ def _build_user_values_file(ctx):
     return out_yaml
 
 def _package(ctx, srcs, user_values_file):
-    chart_path = None
-    for f in srcs:
-        if f.path.endswith("Chart.yaml"):
-            chart_path = f.dirname
-            break
-    if not chart_path:
+    chart_yaml = _root_file("Chart.yaml", srcs)
+    if chart_yaml == None:
         fail("Chart.yaml file is not found in srcs")
 
+    chart_path = chart_yaml.dirname
+
     out = ctx.actions.declare_directory(ctx.label.name + "-helm-chart-out")
 
     args = []
@@ -150,24 +148,32 @@ def _package(ctx, srcs, user_values_file):
 
     return out
 
-def _merge_values(ctx, user_values_file):
-    default_values_file = None
-    for f in ctx.files.srcs:
-        if f.path.endswith("values.yaml"):
-            default_values_file = f
-            break
-
-    if not default_values_file:
+def _file_len(file):
+    str = file.short_path
+    return len(str)
+
+def _root_file(name, files):
+    found = []
+    for f in files:
+        if f.basename == name:
+            found.append(f)
+    found = sorted(found, key = _file_len)
+    if len(found) == 0:
         return None
+    return found[0]
+
+def _merge_values(ctx, user_values_file):
+    default_values_file = _root_file("values.yaml", ctx.files.srcs)
 
     out_yaml = ctx.actions.declare_file(ctx.label.name + "-merged-values.yaml")
 
+    inputs = []
     args = ctx.actions.args()
     args.add("merge-yamls")
     args.add("-output", out_yaml.path)
-    args.add("-file", default_values_file.path)
-
-    inputs = [default_values_file]
+    if default_values_file:
+        args.add("-file", default_values_file.path)
+        inputs.append(default_values_file)
 
     for f in ctx.files.values_files:
         args.add("-file", f.path)
@@ -188,13 +194,12 @@ def _merge_values(ctx, user_values_file):
     return out_yaml
 
 def _copy_chart(ctx, merged_values_file):
+    values_file = _root_file("values.yaml", ctx.files.srcs)
+
     outs = []
-    chart_path = None
     for f in ctx.files.srcs:
         src = f
-        if f.path.endswith("Chart.yaml"):
-            chart_path = ctx.label.name + "/" + f.dirname
-        if f.path.endswith("values.yaml") and merged_values_file:
+        if f == values_file and merged_values_file:
             src = merged_values_file
         copy = ctx.actions.declare_file(ctx.label.name + "/" + f.path)
         outs.append(copy)
@@ -212,8 +217,10 @@ def _copy_chart(ctx, merged_values_file):
             progress_message = "Copying %s file to %s " % (src.short_path, copy.short_path),
         )
 
-    if not chart_path:
+    chart_yaml = _root_file("Chart.yaml", ctx.files.srcs)
+    if chart_yaml == None:
         fail("Chart.yaml file is not found in srcs")
+    chart_path = ctx.label.name + "/" + chart_yaml.dirname
 
     for f in ctx.files.deps:
         src = f

helm/private/rules/import.bzl

@@ -33,13 +33,20 @@ def _impl(repository_ctx):
         ),
         sha256 = repository_ctx.attr.sha256,
     )
+    repository_ctx.extract(
+        archive = file_name,
+    )
     repository_ctx.file("BUILD.bazel", content = """
 package(default_visibility = ["//visibility:public"])
 filegroup(
     name = "chart",
-    srcs = glob(["{}"]),
+    srcs = ["{}"],
+)
+filegroup(
+    name = "srcs",
+    srcs = glob(["{}/**"]),
 )
-    """.format(file_name))
+    """.format(file_name, repository_ctx.attr.chart_name))
 
 helm_import = repository_rule(
     doc = _DOC,