More bzl file cleanup (#224)

abrisco · web-flow · commit 87bcfd8d19ec · 2025-12-16T14:36:30.000Z
diff --git a/helm/helm_import.bzl b/helm/helm_import.bzl
@@ -1,7 +1,7 @@
 """# helm_import rules."""
 
 load(
-    "//helm/private:helm_import.bzl",
+    "//helm/private:import.bzl",
     _helm_import = "helm_import",
     _helm_import_repository = "helm_import_repository",
 )
diff --git a/helm/helm_install.bzl b/helm/helm_install.bzl
@@ -1,7 +1,7 @@
 """# helm_install rules."""
 
 load(
-    "//helm/private:helm_install.bzl",
+    "//helm/private:install.bzl",
     _helm_install = "helm_install",
     _helm_uninstall = "helm_uninstall",
     _helm_upgrade = "helm_upgrade",
diff --git a/helm/helm_lint.bzl b/helm/helm_lint.bzl
@@ -1,7 +1,7 @@
 """# helm_lint rules."""
 
 load(
-    "//helm/private:helm_lint.bzl",
+    "//helm/private:lint.bzl",
     _helm_lint_aspect = "helm_lint_aspect",
     _helm_lint_test = "helm_lint_test",
 )
diff --git a/helm/helm_package.bzl b/helm/helm_package.bzl
@@ -1,7 +1,7 @@
 """# helm_package rule."""
 
 load(
-    "//helm/private:helm_package.bzl",
+    "//helm/private:package.bzl",
     _helm_package = "helm_package",
 )
 
diff --git a/helm/helm_plugin.bzl b/helm/helm_plugin.bzl
@@ -1,7 +1,7 @@
 """# helm_plugin rule."""
 
 load(
-    "//helm/private:helm_toolchain.bzl",
+    "//helm/private:toolchain.bzl",
     _helm_plugin = "helm_plugin",
 )
 
diff --git a/helm/helm_push.bzl b/helm/helm_push.bzl
@@ -1,7 +1,7 @@
 """# helm_push rules."""
 
 load(
-    "//helm/private:helm_registry.bzl",
+    "//helm/private:registry.bzl",
     _helm_push = "helm_push",
     _helm_push_images = "helm_push_images",
 )
diff --git a/helm/helm_template.bzl b/helm/helm_template.bzl
@@ -1,7 +1,7 @@
 """# helm_template rules."""
 
 load(
-    "//helm/private:helm_template.bzl",
+    "//helm/private:template.bzl",
     _helm_template = "helm_template",
     _helm_template_test = "helm_template_test",
 )
diff --git a/helm/helm_toolchain.bzl b/helm/helm_toolchain.bzl
@@ -1,7 +1,7 @@
 """# helm_toolchain rule."""
 
 load(
-    "//helm/private:helm_toolchain.bzl",
+    "//helm/private:toolchain.bzl",
     _helm_toolchain = "helm_toolchain",
 )
 
diff --git a/helm/private/helm.bzl b/helm/private/helm.bzl
@@ -1,8 +1,8 @@
 """Helm rules"""
 
-load("//helm/private:helm_install.bzl", "helm_install", "helm_uninstall", "helm_upgrade")
-load("//helm/private:helm_package.bzl", "helm_package")
-load("//helm/private:helm_registry.bzl", "helm_push", "helm_push_images")
+load(":install.bzl", "helm_install", "helm_uninstall", "helm_upgrade")
+load(":package.bzl", "helm_package")
+load(":registry.bzl", "helm_push", "helm_push_images")
 
 def helm_chart(
         *,
diff --git a/helm/private/import.bzl b/helm/private/import.bzl
@@ -1,6 +1,6 @@
 """Helm rules for managing external dependencies"""
 
-load(":helm_import_authn.bzl", "authn")
+load(":import_authn.bzl", "authn")
 load(":providers.bzl", "HelmPackageInfo")
 
 def _helm_import_impl(ctx):
diff --git a/helm/private/import_authn.bzl b/helm/private/import_authn.bzl
diff --git a/helm/private/install.bzl b/helm/private/install.bzl
diff --git a/helm/private/lint.bzl b/helm/private/lint.bzl
diff --git a/helm/private/package.bzl b/helm/private/package.bzl
@@ -1,8 +1,8 @@
 """Helm rules"""
 
-load("//helm/private:helm_utils.bzl", "is_stamping_enabled")
-load("//helm/private:json_to_yaml.bzl", "json_to_yaml")
+load(":helm_utils.bzl", "is_stamping_enabled")
 load(":image_utils.bzl", "ImagePushRepositoryInfo", "image_push_repository_aspect")
+load(":json_to_yaml.bzl", "json_to_yaml")
 load(":providers.bzl", "HelmPackageInfo")
 
 def _rlocationpath(file, workspace_name):
diff --git a/helm/private/registry.bzl b/helm/private/registry.bzl
diff --git a/helm/private/template.bzl b/helm/private/template.bzl
@@ -1,7 +1,7 @@
 """Helm rules"""
 
-load(":helm_install.bzl", "HelmInstallInfo")
 load(":helm_utils.bzl", "rlocationpath", "symlink")
+load(":install.bzl", "HelmInstallInfo")
 load(":providers.bzl", "HelmPackageInfo")
 
 def _helm_template_test_impl(ctx):
diff --git a/helm/private/toolchain.bzl b/helm/private/toolchain.bzl

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`"""# helm_import rules."""`
`2`	`2`
`3`	`3`	`load(`
`4`		`- "//helm/private:helm_import.bzl",`
	`4`	`+ "//helm/private:import.bzl",`
`5`	`5`	`_helm_import = "helm_import",`
`6`	`6`	`_helm_import_repository = "helm_import_repository",`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`"""# helm_lint rules."""`
`2`	`2`
`3`	`3`	`load(`
`4`		`- "//helm/private:helm_lint.bzl",`
	`4`	`+ "//helm/private:lint.bzl",`
`5`	`5`	`_helm_lint_aspect = "helm_lint_aspect",`
`6`	`6`	`_helm_lint_test = "helm_lint_test",`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`"""# helm_package rule."""`
`2`	`2`
`3`	`3`	`load(`
`4`		`- "//helm/private:helm_package.bzl",`
	`4`	`+ "//helm/private:package.bzl",`
`5`	`5`	`_helm_package = "helm_package",`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`"""# helm_plugin rule."""`
`2`	`2`
`3`	`3`	`load(`
`4`		`- "//helm/private:helm_toolchain.bzl",`
	`4`	`+ "//helm/private:toolchain.bzl",`
`5`	`5`	`_helm_plugin = "helm_plugin",`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`"""# helm_push rules."""`
`2`	`2`
`3`	`3`	`load(`
`4`		`- "//helm/private:helm_registry.bzl",`
	`4`	`+ "//helm/private:registry.bzl",`
`5`	`5`	`_helm_push = "helm_push",`
`6`	`6`	`_helm_push_images = "helm_push_images",`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`"""# helm_template rules."""`
`2`	`2`
`3`	`3`	`load(`
`4`		`- "//helm/private:helm_template.bzl",`
	`4`	`+ "//helm/private:template.bzl",`
`5`	`5`	`_helm_template = "helm_template",`
`6`	`6`	`_helm_template_test = "helm_template_test",`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`"""# helm_toolchain rule."""`
`2`	`2`
`3`	`3`	`load(`
`4`		`- "//helm/private:helm_toolchain.bzl",`
	`4`	`+ "//helm/private:toolchain.bzl",`
`5`	`5`	`_helm_toolchain = "helm_toolchain",`
`6`	`6`	`)`
`7`	`7`