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.

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(ingestion): Tableau test case execution fix #6005

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22236,7 +22236,7 @@
"changeType": "UPSERT",
"aspectName": "upstreamLineage",
"aspect": {
"value": "{\"upstreams\": [{\"auditStamp\": {\"time\": 0, \"actor\": \"urn:li:corpuser:unknown\"}, \"dataset\": \"urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore.xls.people,PROD)\", \"type\": \"TRANSFORMED\"}, {\"auditStamp\": {\"time\": 0, \"actor\": \"urn:li:corpuser:unknown\"}, \"dataset\": \"urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore.xls.returns,PROD)\", \"type\": \"TRANSFORMED\"}, {\"auditStamp\": {\"time\": 0, \"actor\": \"urn:li:corpuser:unknown\"}, \"dataset\": \"urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore.xls.orders,PROD)\", \"type\": \"TRANSFORMED\"}]}",
"value": "{\"upstreams\": [{\"auditStamp\": {\"time\": 0, \"actor\": \"urn:li:corpuser:unknown\"}, \"dataset\": \"urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore%2C %28new%29.xls.people,PROD)\", \"type\": \"TRANSFORMED\"}, {\"auditStamp\": {\"time\": 0, \"actor\": \"urn:li:corpuser:unknown\"}, \"dataset\": \"urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore%2C %28new%29.xls.returns,PROD)\", \"type\": \"TRANSFORMED\"}, {\"auditStamp\": {\"time\": 0, \"actor\": \"urn:li:corpuser:unknown\"}, \"dataset\": \"urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore%2C %28new%29.xls.orders,PROD)\", \"type\": \"TRANSFORMED\"}]}",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we want dataset urns to have spaces in them? I thought we were url encoding them. cc @mayurinehate

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently, we have encoded only those characters that break urn serialization - ( ) ,
While it is possible support encoding for space or other special characters, it would break backward compatibility and hence not done.

"contentType": "application/json"
},
"systemMetadata": {
Expand Down Expand Up @@ -31694,7 +31694,7 @@
{
"proposedSnapshot": {
"com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
"urn": "urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore.xls.people,PROD)",
"urn": "urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore%2C %28new%29.xls.people,PROD)",
"aspects": [
{
"com.linkedin.pegasus2avro.common.BrowsePaths": {
Expand Down Expand Up @@ -31763,7 +31763,7 @@
{
"proposedSnapshot": {
"com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
"urn": "urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore.xls.returns,PROD)",
"urn": "urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore%2C %28new%29.xls.returns,PROD)",
"aspects": [
{
"com.linkedin.pegasus2avro.common.BrowsePaths": {
Expand Down Expand Up @@ -31832,7 +31832,7 @@
{
"proposedSnapshot": {
"com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
"urn": "urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore.xls.orders,PROD)",
"urn": "urn:li:dataset:(urn:li:dataPlatform:external,sample - superstore%2C %28new%29.xls.orders,PROD)",
"aspects": [
{
"com.linkedin.pegasus2avro.common.BrowsePaths": {
Expand Down Expand Up @@ -32205,4 +32205,4 @@
"runId": "tableau-test"
}
}
]
]
134 changes: 0 additions & 134 deletions metadata-ingestion/tests/integration/tableau/test_tableau_common.py

This file was deleted.

150 changes: 147 additions & 3 deletions metadata-ingestion/tests/integration/tableau/test_tableau_ingest.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,154 @@
import json
import pathlib
from unittest import mock

import pytest
import test_tableau_common
from freezegun import freeze_time
from tableauserverclient.models import ViewItem

from datahub.configuration.source_common import DEFAULT_ENV
from datahub.ingestion.run.pipeline import Pipeline
from datahub.ingestion.source.tableau_common import (
TableauLineageOverrides,
make_table_urn,
)
from tests.test_helpers import mce_helpers

FROZEN_TIME = "2021-12-07 07:00:00"

test_resources_dir = None


def _read_response(file_name):
response_json_path = f"{test_resources_dir}/setup/{file_name}"
with open(response_json_path) as file:
data = json.loads(file.read())
return data


def define_query_metadata_func(workbook_0: str, workbook_all: str): # type: ignore
def side_effect_query_metadata(query):
if "workbooksConnection (first:0" in query:
return _read_response(workbook_0)

if "workbooksConnection (first:3" in query:
return _read_response(workbook_all)

if "embeddedDatasourcesConnection (first:0" in query:
return _read_response("embeddedDatasourcesConnection_0.json")

if "embeddedDatasourcesConnection (first:8" in query:
return _read_response("embeddedDatasourcesConnection_all.json")

if "publishedDatasourcesConnection (first:0" in query:
return _read_response("publishedDatasourcesConnection_0.json")

if "publishedDatasourcesConnection (first:2" in query:
return _read_response("publishedDatasourcesConnection_all.json")

if "customSQLTablesConnection (first:0" in query:
return _read_response("customSQLTablesConnection_0.json")

if "customSQLTablesConnection (first:2" in query:
return _read_response("customSQLTablesConnection_all.json")

return side_effect_query_metadata


def side_effect_usage_stat(*arg, **kwargs):
mock_pagination = mock.MagicMock()
mock_pagination.total_available = None

dashboard_stat: ViewItem = ViewItem()

# Added as luid of Dashboard in workbooksConnection_state_all.json
dashboard_stat._id = "fc9ea488-f810-4fa8-ac19-aa96018b5d66"
dashboard_stat._total_views = 3

# Added as luid of Sheet in workbooksConnection_state_all.json
sheet_stat: ViewItem = ViewItem()
sheet_stat._id = "f0779f9d-6765-47a9-a8f6-c740cfd27783"
sheet_stat._total_views = 5

return [dashboard_stat, sheet_stat], mock_pagination


def tableau_ingest_common(
pytestconfig,
tmp_path,
side_effect_query_metadata_func,
golden_file_name,
output_file_name,
):
global test_resources_dir
test_resources_dir = pathlib.Path(
pytestconfig.rootpath / "tests/integration/tableau"
)

with mock.patch("datahub.ingestion.source.tableau.Server") as mock_sdk:
mock_client = mock.Mock()
mocked_metadata = mock.Mock()
mocked_metadata.query.side_effect = side_effect_query_metadata_func
mock_client.metadata = mocked_metadata
mock_client.auth = mock.Mock()
mock_client.views = mock.Mock()
mock_client.views.get.side_effect = side_effect_usage_stat
mock_client.auth.sign_in.return_value = None
mock_client.auth.sign_out.return_value = None
mock_sdk.return_value = mock_client
mock_sdk._auth_token = "ABC"

pipeline = Pipeline.create(
{
"run_id": "tableau-test",
"source": {
"type": "tableau",
"config": {
"username": "username",
"password": "pass`",
"connect_uri": "https://do-not-connect",
"site": "acryl",
"projects": ["default", "Project 2"],
"page_size": 10,
"ingest_tags": True,
"ingest_owner": True,
"ingest_tables_external": True,
"default_schema_map": {
"dvdrental": "public",
"someotherdb": "schema",
},
"platform_instance_map": {"postgres": "demo_postgres_instance"},
"extract_usage_stats": True,
},
},
"sink": {
"type": "file",
"config": {
"filename": f"{tmp_path}/{output_file_name}",
},
},
}
)
pipeline.run()
pipeline.raise_from_status()

mce_helpers.check_golden_file(
pytestconfig,
output_path=f"{tmp_path}/{output_file_name}",
golden_path=test_resources_dir / golden_file_name,
ignore_paths=mce_helpers.IGNORE_PATH_TIMESTAMPS,
)


@freeze_time(FROZEN_TIME)
@pytest.mark.slow_unit
def test_tableau_ingest(pytestconfig, tmp_path):
output_file_name: str = "tableau_mces.json"
golden_file_name: str = "tableau_mces_golden.json"
side_effect_query_metadata = test_tableau_common.define_query_metadata_func(
side_effect_query_metadata = define_query_metadata_func(
"workbooksConnection_0.json", "workbooksConnection_all.json"
)
test_tableau_common.tableau_ingest_common(
tableau_ingest_common(
pytestconfig,
tmp_path,
side_effect_query_metadata,
Expand All @@ -30,6 +157,23 @@ def test_tableau_ingest(pytestconfig, tmp_path):
)


@freeze_time(FROZEN_TIME)
@pytest.mark.slow_unit
def test_tableau_usage_stat(pytestconfig, tmp_path):
output_file_name: str = "tableau_stat_mces.json"
golden_file_name: str = "tableau_state_mces_golden.json"
func = define_query_metadata_func(
"workbooksConnection_0.json", "workbooksConnection_state_all.json"
)
tableau_ingest_common(
pytestconfig,
tmp_path,
func,
golden_file_name,
output_file_name,
)


def test_lineage_overrides():
# Simple - specify platform instance to presto table
assert (
Expand Down