helm: cleanup macros, format

Author: tmc

helm.bzl

@@ -1,5 +1,4 @@
 load("@bazel_skylib//lib:paths.bzl", "paths")
-
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 
 HELM_CMD_PREFIX = """
@@ -8,24 +7,15 @@ cat $(location @com_github_tmc_rules_helm//:runfiles_bash) >> $@
 echo "export NAMESPACE=$$(grep NAMESPACE bazel-out/stable-status.txt | cut -d ' ' -f 2)" >> $@
 echo "export BUILD_USER=$$(grep BUILD_USER bazel-out/stable-status.txt | cut -d ' ' -f 2)" >> $@
 cat <<EOF >> $@
-#export RUNFILES_LIB_DEBUG=1
+#export RUNFILES_LIB_DEBUG=1 # For runfiles debugging
 
 export HELM=\$$(rlocation com_github_tmc_rules_helm/helm)
 PATH=\$$(dirname \$$HELM):\$$PATH
 """
 
-def helm_chart(name, srcs, update_deps=False):
+def helm_chart(name, srcs, update_deps = False):
     filegroup_name = name + "_filegroup"
-    tarball_name = name + "_chart.tar.gz"
     helm_cmd_name = name + "_package.sh"
-    #pkg_tar(
-    #    name = name + "_tarball",
-    #    outs = [tarball_name],
-    #    srcs = srcs,
-    #    extension = "tar.gz",
-    #    #package_dir = ".",
-    #    strip_prefix = ".",
-    #)
     package_flags = ""
     if update_deps:
         package_flags = "-u"
@@ -37,7 +27,7 @@ def helm_chart(name, srcs, update_deps=False):
         name = name,
         #srcs = ["@com_github_tmc_rules_helm//:runfiles_bash", filegroup_name, "@bazel_tools//tools/bash/runfiles"],
         srcs = [filegroup_name],
-        outs = ["%s_chart" % name],
+        outs = ["%s_chart.tar.gz" % name],
         tools = ["@com_github_tmc_rules_helm//:helm"],
         cmd = """
 # find Chart.yaml in the filegroup
@@ -51,41 +41,28 @@ done
 $(location @com_github_tmc_rules_helm//:helm) package {package_flags} $$CHARTLOC
 mv *tgz $@
 """.format(
-    package_flags=package_flags,
-)
+            package_flags = package_flags,
+        ),
     )
 
-def helm_cmd(cmd, args, name, helm_cmd_name, tarball_name, values_yaml):
+def helm_cmd(cmd, args, name, helm_cmd_name, values_yaml):
     native.sh_binary(
         name = name + "." + cmd,
         srcs = [helm_cmd_name],
         deps = ["@bazel_tools//tools/bash/runfiles"],
-        data = [tarball_name, values_yaml, "@com_github_tmc_rules_helm//:helm"],
+        data = [values_yaml, "@com_github_tmc_rules_helm//:helm"],
         args = args,
     )
 
-def helm_release(name, release_name, chart, values_yaml, namespace=""):
-    # Unclear why we need this genrule to expose the chart tarball.
-    tarball_name = name + "_chart.tar.gz"
+def helm_release(name, release_name, chart, values_yaml, namespace = ""):
     helm_cmd_name = name + "_run_helm_cmd.sh"
-    native.genrule(
-        name = name + "_tarball",
-        outs = [tarball_name],
-        srcs = [chart],
-        cmd = "cp $(location " + chart + ") $@",
-# cmd = """
-# cp $(location " + chart + ") $@",
-# """,
-
-    )
     native.genrule(
         name = name,
-        srcs = ["@com_github_tmc_rules_helm//:runfiles_bash", tarball_name, values_yaml],
+        srcs = ["@com_github_tmc_rules_helm//:runfiles_bash", chart, values_yaml],
         stamp = True,
         outs = [helm_cmd_name],
-        cmd =  HELM_CMD_PREFIX + """
-export CHARTLOC=\$$(rlocation __main__/""" + tarball_name + """)
-
+        cmd = HELM_CMD_PREFIX + """
+export CHARTLOC=$(location """ + chart + """)
 EXPLICIT_NAMESPACE=""" + namespace + """
 NAMESPACE=\$${EXPLICIT_NAMESPACE:-\$$NAMESPACE}
 export NS=\$${NAMESPACE:-\$${BUILD_USER}}
@@ -99,9 +76,9 @@ fi
 
 EOF""",
     )
-    helm_cmd("install", ["upgrade", "--install"], name, helm_cmd_name, tarball_name, values_yaml)
-    helm_cmd("install.wait", ["upgrade", "--install", "--wait"], name, helm_cmd_name, tarball_name, values_yaml)
-    helm_cmd("status", ["status"], name, helm_cmd_name, tarball_name, values_yaml)
-    helm_cmd("delete", ["delete", "--purge"], name, helm_cmd_name, tarball_name, values_yaml)
-    helm_cmd("test", ["test", "--cleanup"], name, helm_cmd_name, tarball_name, values_yaml)
-    helm_cmd("test.noclean", ["test"], name, helm_cmd_name, tarball_name, values_yaml)
+    helm_cmd("install", ["upgrade", "--install"], name, helm_cmd_name, values_yaml)
+    helm_cmd("install.wait", ["upgrade", "--install", "--wait"], name, helm_cmd_name, values_yaml)
+    helm_cmd("status", ["status"], name, helm_cmd_name, values_yaml)
+    helm_cmd("delete", ["delete", "--purge"], name, helm_cmd_name, values_yaml)
+    helm_cmd("test", ["test", "--cleanup"], name, helm_cmd_name, values_yaml)
+    helm_cmd("test.noclean", ["test"], name, helm_cmd_name, values_yaml)