From 7de637374758a95e809f4c21de3a230fe5ce58fa Mon Sep 17 00:00:00 2001 From: Doug Beatty Date: Wed, 18 Sep 2024 16:15:07 -0600 Subject: [PATCH 1/4] Remove duplicated constructor for `ResourceTypeSelector` --- core/dbt/task/build.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/core/dbt/task/build.py b/core/dbt/task/build.py index 832f7f0fe4..625a4498d6 100644 --- a/core/dbt/task/build.py +++ b/core/dbt/task/build.py @@ -196,13 +196,6 @@ def get_node_selector(self, no_unit_tests=False) -> ResourceTypeSelector: resource_types = self.resource_types(no_unit_tests) - if resource_types == [NodeType.Test]: - return ResourceTypeSelector( - graph=self.graph, - manifest=self.manifest, - previous_state=self.previous_state, - resource_types=resource_types, - ) return ResourceTypeSelector( graph=self.graph, manifest=self.manifest, From 3930eef092fb1327b735c25a1240468ff26c1d39 Mon Sep 17 00:00:00 2001 From: Doug Beatty Date: Wed, 18 Sep 2024 16:17:12 -0600 Subject: [PATCH 2/4] Add type annotation for `ResourceTypeSelector` --- core/dbt/task/list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dbt/task/list.py b/core/dbt/task/list.py index 180cfc7169..5fe10daf29 100644 --- a/core/dbt/task/list.py +++ b/core/dbt/task/list.py @@ -196,7 +196,7 @@ def selection_arg(self): else: return self.args.select - def get_node_selector(self): + def get_node_selector(self) -> ResourceTypeSelector: if self.manifest is None or self.graph is None: raise DbtInternalError("manifest and graph must be set to get perform node selection") if self.resource_types == [NodeType.Test]: From 4555df341434bab0ef7953157ece5a70272e313c Mon Sep 17 00:00:00 2001 From: Doug Beatty Date: Wed, 18 Sep 2024 16:18:24 -0600 Subject: [PATCH 3/4] Standardize on constructor for `ResourceTypeSelector` where `include_empty_nodes=True` --- core/dbt/task/list.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/core/dbt/task/list.py b/core/dbt/task/list.py index 5fe10daf29..2638920976 100644 --- a/core/dbt/task/list.py +++ b/core/dbt/task/list.py @@ -199,21 +199,13 @@ def selection_arg(self): def get_node_selector(self) -> ResourceTypeSelector: if self.manifest is None or self.graph is None: raise DbtInternalError("manifest and graph must be set to get perform node selection") - if self.resource_types == [NodeType.Test]: - return ResourceTypeSelector( - graph=self.graph, - manifest=self.manifest, - previous_state=self.previous_state, - resource_types=self.resource_types, - ) - else: - return ResourceTypeSelector( - graph=self.graph, - manifest=self.manifest, - previous_state=self.previous_state, - resource_types=self.resource_types, - include_empty_nodes=True, - ) + return ResourceTypeSelector( + graph=self.graph, + manifest=self.manifest, + previous_state=self.previous_state, + resource_types=self.resource_types, + include_empty_nodes=True, + ) def interpret_results(self, results): # list command should always return 0 as exit code From 092034e74b1ed3b79ebebfa65fde7d54d0c4155d Mon Sep 17 00:00:00 2001 From: Doug Beatty Date: Wed, 18 Sep 2024 17:10:02 -0600 Subject: [PATCH 4/4] Changelog entry --- .changes/unreleased/Under the Hood-20240918-170325.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changes/unreleased/Under the Hood-20240918-170325.yaml diff --git a/.changes/unreleased/Under the Hood-20240918-170325.yaml b/.changes/unreleased/Under the Hood-20240918-170325.yaml new file mode 100644 index 0000000000..3f265a36ed --- /dev/null +++ b/.changes/unreleased/Under the Hood-20240918-170325.yaml @@ -0,0 +1,7 @@ +kind: Under the Hood +body: Standardize returning `ResourceTypeSelector` instances in `dbt list` and `dbt + build` +time: 2024-09-18T17:03:25.639516-06:00 +custom: + Author: dbeatty10 + Issue: "10739"