Skip to content

Commit 175affe

Browse files
Pichugin Anatolyshirshanka
authored andcommitted
fix(notifications): fix wrong urls in ms teams notifications
1 parent c5af228 commit 175affe

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

datahub-actions/src/datahub_actions/utils/datahub_util.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,7 @@ def make_datahub_url(urn: str, base_url: str) -> str:
6565
entity_type = entity_type_from_urn(urn)
6666
urn = urn.replace("/", "%2F")
6767
return f"{base_url}/{ENTITY_TYPE_TO_URL_PATH_MAP[entity_type]}/{urn}/"
68+
69+
def make_entity_url(urn: str, entity_type: str, base_url: str) -> str:
70+
urn = urn.replace("/", "%2F")
71+
return f"{base_url}/{entity_type}/{urn}"

datahub-actions/src/datahub_actions/utils/social_util.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from datahub.metadata.schema_classes import EntityChangeEventClass as EntityChangeEvent
88
from datahub.utilities.urns.urn import Urn
99

10+
from datahub_actions.utils.datahub_util import make_entity_url
1011
from datahub_actions.utils.name_resolver import (
1112
get_entity_name_from_urn,
1213
get_entity_qualifier_from_urn,
@@ -108,20 +109,20 @@ def get_message_from_entity_change_event(
108109
parent_specialized_type = get_entity_qualifier_from_urn(
109110
str(parent_entity_urn), datahub_graph
110111
)
111-
parent_entity_url = f"{datahub_base_url}/{parent_entity_urn.get_type()}/{parent_entity_urn}/Schema?schemaFilter={entity_name}"
112+
parent_entity_url = f"{make_entity_url(str(parent_entity_urn), parent_entity_urn.get_type(), datahub_base_url)}/Schema?schemaFilter={entity_name}"
112113
entity_message_trailer = f"{entity_name} of {parent_specialized_type} {make_url_with_title(title=parent_entity_name, url=parent_entity_url, channel=channel)}"
113114
elif event.entityType == "dataFlow":
114-
entity_url = f"{datahub_base_url}/pipelines/{event.entityUrn}"
115+
entity_url = make_entity_url(event.entityUrn, "pipelines", datahub_base_url)
115116
entity_message_trailer = make_url_with_title(
116117
title=entity_name, url=entity_url, channel=channel
117118
)
118119
elif event.entityType == "dataJob":
119-
entity_url = f"{datahub_base_url}/tasks/{event.entityUrn}"
120+
entity_url = make_entity_url(event.entityUrn, "tasks", datahub_base_url)
120121
entity_message_trailer = make_url_with_title(
121122
title=entity_name, url=entity_url, channel=channel
122123
)
123124
else:
124-
entity_url = f"{datahub_base_url}/{event.entityType}/{event.entityUrn}"
125+
entity_url = make_entity_url(event.entityUrn, event.entityType, datahub_base_url)
125126
entity_message_trailer = make_url_with_title(
126127
title=entity_name, url=entity_url, channel=channel
127128
)

0 commit comments

Comments
 (0)