Skip to content

Removed key not in catalog filter from dbt and added node filter using AllowDenyPattern #2702

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

Merged
shirshanka merged 4 commits into from
Jun 17, 2021
Merged

Removed key not in catalog filter from dbt and added node filter using AllowDenyPattern #2702

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8163c7b
removed key not in catalog filter and added node filter using AllowDe…
vijayan-nallasami-curve Jun 15, 2021
7128191
Merge branch 'master' of github.com:linkedin/datahub into fix-dbt-ing…
vijayan-nallasami-curve Jun 16, 2021
e838fce
renamed node_pattern as node_type_pattern
vijayan-nallasami-curve Jun 16, 2021
a12912b
fixed checkstyle issue
vijayan-nallasami-curve Jun 17, 2021
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
18 changes: 12 additions & 6 deletions metadata-ingestion/src/datahub/ingestion/source/dbt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Any, Dict, Iterable, List

from datahub.configuration import ConfigModel
from datahub.configuration.common import AllowDenyPattern
from datahub.ingestion.api.common import PipelineContext
from datahub.ingestion.api.source import Source, SourceReport
from datahub.ingestion.source.metadata_common import MetadataWorkUnit
Expand Down Expand Up @@ -38,6 +39,7 @@ class DBTConfig(ConfigModel):
env: str = "PROD"
target_platform: str
load_schemas: bool
node_type_pattern: AllowDenyPattern = AllowDenyPattern.allow_all()


class DBTColumn:
Expand Down Expand Up @@ -91,24 +93,25 @@ def extract_dbt_entities(
load_catalog: bool,
target_platform: str,
environment: str,
node_type_pattern: AllowDenyPattern,
) -> List[DBTNode]:
dbt_entities = []
for key in nodes:
node = nodes[key]
dbtNode = DBTNode()

if key not in catalog and load_catalog is False:
# check if node pattern allowed based on config file
if not node_type_pattern.allowed(node["resource_type"]):
continue

if "identifier" in node and load_catalog is False:
dbtNode.name = node["identifier"]
else:
dbtNode.name = node["name"]
dbtNode.dbt_name = key
dbtNode.database = node["database"]
dbtNode.schema = node["schema"]
dbtNode.dbt_file_path = node["original_file_path"]
dbtNode.node_type = node["resource_type"]
if "identifier" in node and load_catalog is False:
dbtNode.name = node["identifier"]
else:
dbtNode.name = node["name"]

if "materialized" in node["config"].keys():
# It's a model
Expand Down Expand Up @@ -154,6 +157,7 @@ def loadManifestAndCatalog(
load_catalog: bool,
target_platform: str,
environment: str,
node_type_pattern: AllowDenyPattern,
) -> List[DBTNode]:
with open(manifest_path, "r") as manifest:
with open(catalog_path, "r") as catalog:
Expand All @@ -176,6 +180,7 @@ def loadManifestAndCatalog(
load_catalog,
target_platform,
environment,
node_type_pattern,
)

return nodes
Expand Down Expand Up @@ -339,6 +344,7 @@ def get_workunits(self) -> Iterable[MetadataWorkUnit]:
self.config.load_schemas,
self.config.target_platform,
self.config.env,
self.config.node_type_pattern,
)

for node in nodes:
Expand Down