Include Helm chart dependency inference rules (#16368)

Include Helm chart depednency inference rules
pantsbuild · Aug 2, 2022 · 23fc6b1 · 23fc6b1
1 parent 5c78057
commit 23fc6b1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/python/pants/backend/helm/goals/lint_test.py b/src/python/pants/backend/helm/goals/lint_test.py
@@ -11,6 +11,7 @@
 from pants.backend.helm.goals.lint import rules as helm_lint_rules
 from pants.backend.helm.subsystems.helm import HelmSubsystem
 from pants.backend.helm.target_types import HelmChartTarget
+from pants.backend.helm.target_types import rules as target_types_rules
 from pants.backend.helm.testutil import (
     HELM_TEMPLATE_HELPERS_FILE,
     HELM_VALUES_FILE,
@@ -41,6 +42,7 @@ def rule_runner() -> RuleRunner:
             *stripped_source_files.rules(),
             *source_root_rules(),
             *sources.rules(),
+            *target_types_rules(),
             SubsystemRule(HelmSubsystem),
             QueryRule(LintResults, (HelmLintRequest,)),
         ],

diff --git a/src/python/pants/backend/helm/goals/package_test.py b/src/python/pants/backend/helm/goals/package_test.py
@@ -11,6 +11,7 @@
 from pants.backend.helm.goals.package import BuiltHelmArtifact, HelmPackageFieldSet
 from pants.backend.helm.subsystems.helm import HelmSubsystem
 from pants.backend.helm.target_types import HelmChartTarget
+from pants.backend.helm.target_types import rules as target_types_rules
 from pants.backend.helm.testutil import (
     HELM_TEMPLATE_HELPERS_FILE,
     HELM_VALUES_FILE,
@@ -39,6 +40,7 @@ def rule_runner() -> RuleRunner:
             *stripped_source_files.rules(),
             *source_root_rules(),
             *sources.rules(),
+            *target_types_rules(),
             SubsystemRule(HelmSubsystem),
             QueryRule(BuiltPackage, [HelmPackageFieldSet]),
         ],

diff --git a/src/python/pants/backend/helm/util_rules/chart.py b/src/python/pants/backend/helm/util_rules/chart.py
@@ -7,6 +7,7 @@
 import logging
 from dataclasses import dataclass
 
+from pants.backend.helm.dependency_inference import chart as chart_inference
 from pants.backend.helm.resolve import fetch
 from pants.backend.helm.resolve.artifacts import ResolvedHelmArtifact
 from pants.backend.helm.resolve.fetch import (
@@ -195,4 +196,10 @@ async def get_helm_chart(request: HelmChartRequest, subsystem: HelmSubsystem) ->
 
 
 def rules():
-    return [*collect_rules(), *sources.rules(), *chart_metadata.rules(), *fetch.rules()]
+    return [
+        *collect_rules(),
+        *sources.rules(),
+        *chart_metadata.rules(),
+        *chart_inference.rules(),
+        *fetch.rules(),
+    ]
diff --git a/src/python/pants/backend/helm/util_rules/chart_test.py b/src/python/pants/backend/helm/util_rules/chart_test.py
@@ -7,7 +7,6 @@
 
 import pytest
 
-from pants.backend.helm.dependency_inference.chart import rules as chart_infer_rules
 from pants.backend.helm.target_types import HelmArtifactTarget, HelmChartTarget
 from pants.backend.helm.target_types import rules as target_types_rules
 from pants.backend.helm.testutil import (
@@ -39,7 +38,6 @@ def rule_runner() -> RuleRunner:
             *config_files.rules(),
             *external_tool.rules(),
             *chart.rules(),
-            *chart_infer_rules(),
             *sources.rules(),
             *tool.rules(),
             *process.rules(),