Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix custom selector when select has a subset of tags of the models' tags #606

Merged
merged 2 commits into from
Oct 17, 2023
Merged

Fix custom selector when select has a subset of tags of the models' tags #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e475146
Update test
david-mag Oct 17, 2023
e9f2b48
Updated selector.py and related tests.
david-mag Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cosmos/dbt/selector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def should_include_node(node_id: str, node: DbtNode) -> bool:
visited_nodes.add(node_id)

if config.tags:
if not (set(config.tags) == set(node.tags)):
if not (set(config.tags) <= set(node.tags)):
return False

node_config = {key: value for key, value in node.config.items() if key in SUPPORTED_CONFIG}
Expand Down
34 changes: 24 additions & 10 deletions tests/dbt/test_selector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,25 +45,25 @@ def test_is_empty_config(selector_config, paths, tags, config, other, expected):
depends_on=[],
file_path=SAMPLE_PROJ_PATH / "gen1/models/grandparent.sql",
tags=["has_child"],
config={"materialized": "view"},
config={"materialized": "view", "tags": ["has_child"]},
)
parent_node = DbtNode(
name="parent",
unique_id="parent",
resource_type=DbtResourceType.MODEL,
depends_on=["grandparent"],
file_path=SAMPLE_PROJ_PATH / "gen2/models/parent.sql",
tags=["has_child"],
config={"materialized": "view"},
tags=["has_child", "is_child"],
config={"materialized": "view", "tags": ["has_child", "is_child"]},
)
child_node = DbtNode(
name="child",
unique_id="child",
resource_type=DbtResourceType.MODEL,
depends_on=["parent"],
file_path=SAMPLE_PROJ_PATH / "gen3/models/child.sql",
tags=["nightly"],
config={"materialized": "table", "tags": ["is_child"]},
tags=["nightly", "is_child"],
config={"materialized": "table", "tags": ["nightly", "is_child"]},
)

grandchild_1_test_node = DbtNode(
Expand All @@ -72,8 +72,8 @@ def test_is_empty_config(selector_config, paths, tags, config, other, expected):
resource_type=DbtResourceType.MODEL,
depends_on=["parent"],
file_path=SAMPLE_PROJ_PATH / "gen3/models/grandchild_1.sql",
tags=["nightly"],
config={"materialized": "table", "tags": ["deprecated", "test"]},
tags=["nightly", "deprecated", "test"],
config={"materialized": "table", "tags": ["nightly", "deprecated", "test"]},
)

grandchild_2_test_node = DbtNode(
Expand All @@ -82,8 +82,8 @@ def test_is_empty_config(selector_config, paths, tags, config, other, expected):
resource_type=DbtResourceType.MODEL,
depends_on=["parent"],
file_path=SAMPLE_PROJ_PATH / "gen3/models/grandchild_2.sql",
tags=["nightly"],
config={"materialized": "table", "tags": ["deprecated", "test2"]},
tags=["nightly", "deprecated", "test2"],
config={"materialized": "table", "tags": ["nightly", "deprecated", "test2"]},
)

sample_nodes = {
Expand Down Expand Up @@ -114,6 +114,7 @@ def test_select_nodes_by_select_config():
def test_select_nodes_by_select_config_tag():
selected = select_nodes(project_dir=SAMPLE_PROJ_PATH, nodes=sample_nodes, select=["config.tags:is_child"])
expected = {
parent_node.unique_id: parent_node,
child_node.unique_id: child_node,
}
assert selected == expected
Expand Down Expand Up @@ -146,11 +147,24 @@ def test_select_nodes_by_select_union_config_test_tags():
assert selected == expected


def test_select_nodes_by_select_intersection_tag():
selected = select_nodes(
project_dir=SAMPLE_PROJ_PATH, nodes=sample_nodes, select=["tag:is_child,config.materialized:view"]
)
expected = {
parent_node.unique_id: parent_node,
}
assert selected == expected


def test_select_nodes_by_select_intersection_config_tag():
selected = select_nodes(
project_dir=SAMPLE_PROJ_PATH, nodes=sample_nodes, select=["config.tags:is_child,config.materialized:view"]
)
assert selected == {}
expected = {
parent_node.unique_id: parent_node,
}
assert selected == expected


def test_select_nodes_by_select_path():
Expand Down
Loading