directly use DeploymentPublishDependencies

instead of including all fields of DeployFieldSet
pantsbuild · Oct 28, 2024 · ee4aecc · ee4aecc
1 parent ab219f2
commit ee4aecc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/python/pants/backend/helm/target_types.py b/src/python/pants/backend/helm/target_types.py
@@ -8,7 +8,7 @@
 
 from pants.backend.helm.resolve.remotes import ALL_DEFAULT_HELM_REGISTRIES
 from pants.base.glob_match_error_behavior import GlobMatchErrorBehavior
-from pants.core.goals.deploy import DeployFieldSet
+from pants.core.goals.deploy import DeploymentPublishDependencies
 from pants.core.goals.package import OutputPathField
 from pants.core.goals.test import TestTimeoutField
 from pants.engine.internals.native_engine import AddressInput
@@ -527,7 +527,7 @@ class HelmDeploymentTarget(Target):
     alias = "helm_deployment"
     core_fields = (
         *COMMON_TARGET_FIELDS,
-        *DeployFieldSet.fields.values(),
+        DeploymentPublishDependencies,
         HelmDeploymentChartField,
         HelmDeploymentReleaseNameField,
         HelmDeploymentDependenciesField,

diff --git a/src/python/pants/backend/terraform/target_types.py b/src/python/pants/backend/terraform/target_types.py
@@ -5,7 +5,7 @@
 
 from dataclasses import dataclass
 
-from pants.core.goals.deploy import DeployFieldSet
+from pants.core.goals.deploy import DeployFieldSet, DeploymentPublishDependencies
 from pants.engine.internals.native_engine import AddressInput
 from pants.engine.rules import collect_rules, rule
 from pants.engine.target import (
@@ -118,7 +118,7 @@ class TerraformDeploymentTarget(Target):
     alias = "terraform_deployment"
     core_fields = (
         *COMMON_TARGET_FIELDS,
-        *DeployFieldSet.fields.values(),
+        DeploymentPublishDependencies,
         TerraformDependenciesField,
         TerraformRootModuleField,
     )

diff --git a/src/python/pants/core/goals/deploy_test.py b/src/python/pants/core/goals/deploy_test.py
@@ -6,7 +6,12 @@
 
 import pytest
 
-from pants.core.goals.deploy import Deploy, DeployFieldSet, DeployProcess
+from pants.core.goals.deploy import (
+    Deploy,
+    DeployFieldSet,
+    DeploymentPublishDependencies,
+    DeployProcess,
+)
 from pants.core.goals.package import BuiltPackage, BuiltPackageArtifact, PackageFieldSet
 from pants.core.goals.publish import (
     PublishFieldSet,
@@ -58,7 +63,7 @@ class MockDeployTarget(Target):
     alias = "mock_deploy"
     core_fields = (
         *COMMON_TARGET_FIELDS,
-        *DeployFieldSet.fields.values(),
+        DeploymentPublishDependencies,
         MockDestinationField,
         MockDependenciesField,
     )