diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py index 8a934d6bf5c72..7c50a3d00411b 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py +++ b/metadata-ingestion/src/datahub/ingestion/source/aws/glue.py @@ -52,6 +52,10 @@ from datahub.ingestion.source.aws import s3_util from datahub.ingestion.source.aws.aws_common import AwsSourceConfig from datahub.ingestion.source.aws.s3_util import is_s3_uri, make_s3_urn +from datahub.ingestion.source.common.subtypes import ( + DatasetContainerSubTypes, + DatasetSubTypes, +) from datahub.ingestion.source.glue_profiling_config import GlueProfilingConfig from datahub.ingestion.source.state.checkpoint import Checkpoint from datahub.ingestion.source.state.sql_common_state import ( @@ -881,7 +885,7 @@ def gen_database_containers( container_workunits = gen_containers( container_key=database_container_key, name=database["Name"], - sub_types=["Database"], + sub_types=[DatasetContainerSubTypes.DATABASE], domain_urn=domain_urn, description=database.get("Description"), qualified_name=self.get_glue_arn( @@ -965,7 +969,7 @@ def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]: # possible via Dataset snapshot embedded in a mce, so we have to generate a mcp. workunit = MetadataChangeProposalWrapper( entityUrn=dataset_urn, - aspect=SubTypes(typeNames=["table"]), + aspect=SubTypes(typeNames=[DatasetSubTypes.TABLE]), ).as_workunit() self.report.report_workunit(workunit) yield workunit @@ -1147,9 +1151,8 @@ def get_s3_tags() -> Optional[GlobalTagsClass]: logger.warning( "Could not connect to DatahubApi. No current tags to maintain" ) - # Remove duplicate tags - tags_to_add = list(set(tags_to_add)) + tags_to_add = sorted(list(set(tags_to_add))) new_tags = GlobalTagsClass( tags=[TagAssociationClass(tag_to_add) for tag_to_add in tags_to_add] ) diff --git a/metadata-ingestion/src/datahub/ingestion/source/aws/s3_boto_utils.py b/metadata-ingestion/src/datahub/ingestion/source/aws/s3_boto_utils.py index 24c310c40dcf3..682cddca8f415 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/aws/s3_boto_utils.py +++ b/metadata-ingestion/src/datahub/ingestion/source/aws/s3_boto_utils.py @@ -67,7 +67,7 @@ def get_s3_tags( else: logger.warn("Could not connect to DatahubApi. No current tags to maintain") # Remove duplicate tags - tags_to_add = list(set(tags_to_add)) + tags_to_add = sorted(list(set(tags_to_add))) new_tags = GlobalTagsClass( tags=[TagAssociationClass(tag_to_add) for tag_to_add in tags_to_add] ) diff --git a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py index febf3d15e3e32..022abcc4fea82 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py +++ b/metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py @@ -60,6 +60,10 @@ ) from datahub.ingestion.source.bigquery_v2.profiler import BigqueryProfiler from datahub.ingestion.source.bigquery_v2.usage import BigQueryUsageExtractor +from datahub.ingestion.source.common.subtypes import ( + DatasetContainerSubTypes, + DatasetSubTypes, +) from datahub.ingestion.source.sql.sql_utils import ( add_table_to_schema_container, gen_database_container, @@ -455,7 +459,7 @@ def gen_project_id_containers(self, database: str) -> Iterable[MetadataWorkUnit] yield from gen_database_container( database=database, name=database, - sub_types=["Project"], + sub_types=[DatasetContainerSubTypes.BIGQUERY_PROJECT], domain_registry=self.domain_registry, domain_config=self.config.domain, report=self.report, @@ -472,7 +476,7 @@ def gen_dataset_containers( yield from gen_schema_container( database=project_id, schema=dataset, - sub_types=["Dataset"], + sub_types=[DatasetContainerSubTypes.BIGQUERY_DATASET], domain_registry=self.domain_registry, domain_config=self.config.domain, report=self.report, @@ -911,11 +915,11 @@ def gen_table_dataset_workunits( custom_properties["max_partition_id"] = str(table.max_partition_id) custom_properties["is_partitioned"] = str(True) - sub_types: List[str] = ["table"] + sub_types: List[str] = [DatasetSubTypes.TABLE] if table.max_shard_id: custom_properties["max_shard_id"] = str(table.max_shard_id) custom_properties["is_sharded"] = str(True) - sub_types = ["sharded table", "table"] + sub_types = ["sharded table"] + sub_types tags_to_add = None if table.labels and self.config.capture_table_label_as_tag: @@ -946,7 +950,7 @@ def gen_view_dataset_workunits( columns=columns, project_id=project_id, dataset_name=dataset_name, - sub_types=["view"], + sub_types=[DatasetSubTypes.VIEW], ) view = cast(BigqueryView, table) diff --git a/metadata-ingestion/src/datahub/ingestion/source/common/__init__.py b/metadata-ingestion/src/datahub/ingestion/source/common/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py b/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py new file mode 100644 index 0000000000000..f19d8c92af0d6 --- /dev/null +++ b/metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py @@ -0,0 +1,40 @@ +from enum import Enum + + +class DatasetSubTypes(str, Enum): + # Generic SubTypes + TABLE = "Table" + VIEW = "View" + TOPIC = "Topic" + SCHEMA = "Schema" + # System-Specific SubTypes + LOOKER_EXPLORE = "Explore" + ELASTIC_INDEX_TEMPLATE = "Index Template" + ELASTIC_INDEX = "Index" + ELASTIC_DATASTREAM = "Datastream" + SALESFORCE_CUSTOM_OBJECT = "Custom Object" + SALESFORCE_STANDARD_OBJECT = "Object" + + +class DatasetContainerSubTypes(str, Enum): + # Generic SubTypes + DATABASE = "Database" + SCHEMA = "Schema" + # System-Specific SubTypes + PRESTO_CATALOG = "Catalog" + BIGQUERY_PROJECT = "Project" + BIGQUERY_DATASET = "Dataset" + DATABRICKS_METASTORE = "Metastore" + S3_FOLDER = "Folder" + S3_BUCKET = "S3 bucket" + + +class BIContainerSubTypes(str, Enum): + LOOKER_FOLDER = "Folder" + TABLEAU_WORKBOOK = "Workbook" + POWERBI_WORKSPACE = "Workspace" + + +class BIAssetSubTypes(str, Enum): + # Generic SubTypes + REPORT = "Report" diff --git a/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py b/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py index 00391ac4c004e..da3156d24f2aa 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py +++ b/metadata-ingestion/src/datahub/ingestion/source/elastic_search.py @@ -29,6 +29,7 @@ ) from datahub.ingestion.api.source import Source, SourceReport from datahub.ingestion.api.workunit import MetadataWorkUnit +from datahub.ingestion.source.common.subtypes import DatasetSubTypes from datahub.metadata.com.linkedin.pegasus2avro.common import StatusClass from datahub.metadata.com.linkedin.pegasus2avro.schema import ( SchemaField, @@ -407,11 +408,11 @@ def _extract_mcps( entityUrn=dataset_urn, aspect=SubTypesClass( typeNames=[ - "Index Template" + DatasetSubTypes.ELASTIC_INDEX_TEMPLATE if not is_index - else "Index" + else DatasetSubTypes.ELASTIC_INDEX if not data_stream - else "Datastream" + else DatasetSubTypes.ELASTIC_DATASTREAM ] ), ) diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka.py b/metadata-ingestion/src/datahub/ingestion/source/kafka.py index bac72e165646a..6d312a68a1eb6 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/kafka.py +++ b/metadata-ingestion/src/datahub/ingestion/source/kafka.py @@ -37,6 +37,7 @@ from datahub.ingestion.api.registry import import_path from datahub.ingestion.api.source import SourceCapability from datahub.ingestion.api.workunit import MetadataWorkUnit +from datahub.ingestion.source.common.subtypes import DatasetSubTypes from datahub.ingestion.source.kafka_schema_registry_base import KafkaSchemaRegistryBase from datahub.ingestion.source.state.entity_removal_state import GenericCheckpointState from datahub.ingestion.source.state.stale_entity_removal_handler import ( @@ -281,7 +282,7 @@ def _extract_record( id=f"{topic}-subtype", mcp=MetadataChangeProposalWrapper( entityUrn=dataset_urn, - aspect=SubTypesClass(typeNames=["topic"]), + aspect=SubTypesClass(typeNames=[DatasetSubTypes.TOPIC]), ), ) self.report.report_workunit(subtype_wu) diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py index 77cc96baeb26b..d45f0e748a7d5 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py +++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_common.py @@ -34,6 +34,7 @@ from datahub.emitter.mcp_builder import create_embed_mcp from datahub.ingestion.api.report import Report from datahub.ingestion.api.source import SourceReport +from datahub.ingestion.source.common.subtypes import DatasetSubTypes from datahub.ingestion.source.looker.looker_lib_wrapper import LookerAPI from datahub.ingestion.source.sql.sql_types import ( POSTGRES_TYPES_MAP, @@ -894,7 +895,7 @@ def _to_metadata_events( # noqa: C901 changeType=ChangeTypeClass.UPSERT, entityUrn=dataset_snapshot.urn, aspectName="subTypes", - aspect=SubTypesClass(typeNames=["explore"]), + aspect=SubTypesClass(typeNames=[DatasetSubTypes.LOOKER_EXPLORE]), ) proposals: List[Union[MetadataChangeEvent, MetadataChangeProposalWrapper]] = [ diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py index bee8fd5d05a0e..039bd08e7f565 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py +++ b/metadata-ingestion/src/datahub/ingestion/source/looker/looker_source.py @@ -586,7 +586,7 @@ def _get_looker_dashboard_element( # noqa: C901 ) ) - explores = list(set(explores)) # dedup the list of views + explores = sorted(list(set(explores))) # dedup the list of views return LookerDashboardElement( id=element.id, diff --git a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py index a6095489ca24e..144c0d902bbfb 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py +++ b/metadata-ingestion/src/datahub/ingestion/source/looker/lookml_source.py @@ -33,6 +33,7 @@ ) from datahub.ingestion.api.registry import import_path from datahub.ingestion.api.workunit import MetadataWorkUnit +from datahub.ingestion.source.common.subtypes import DatasetSubTypes from datahub.ingestion.source.git.git_import import GitClone from datahub.ingestion.source.looker.looker_common import ( LookerCommonConfig, @@ -1357,7 +1358,7 @@ def _build_dataset_mcps( changeType=ChangeTypeClass.UPSERT, entityUrn=looker_view.id.get_urn(self.source_config), aspectName="subTypes", - aspect=SubTypesClass(typeNames=["view"]), + aspect=SubTypesClass(typeNames=[DatasetSubTypes.VIEW]), ) events = [subTypeEvent] if looker_view.view_details is not None: diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py index 699920a037677..4d0cc534aaf93 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py +++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/config.py @@ -9,6 +9,7 @@ import datahub.emitter.mce_builder as builder from datahub.configuration.common import AllowDenyPattern from datahub.configuration.source_common import DEFAULT_ENV +from datahub.ingestion.source.common.subtypes import BIAssetSubTypes from datahub.ingestion.source.state.stale_entity_removal_handler import ( StaleEntityRemovalSourceReport, StatefulStaleMetadataRemovalConfig, @@ -97,7 +98,7 @@ class Constant: EXPRESSION = "expression" SOURCE = "source" PLATFORM_NAME = "powerbi" - REPORT_TYPE_NAME = "Report" + REPORT_TYPE_NAME = BIAssetSubTypes.REPORT CHART_COUNT = "chartCount" WORKSPACE_NAME = "workspaceName" DATASET_WEB_URL = "datasetWebUrl" diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py index 3c6f9e7da66f1..4f4d503752f54 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py +++ b/metadata-ingestion/src/datahub/ingestion/source/powerbi/powerbi.py @@ -23,6 +23,7 @@ ) from datahub.ingestion.api.source import SourceReport from datahub.ingestion.api.workunit import MetadataWorkUnit +from datahub.ingestion.source.common.subtypes import BIContainerSubTypes from datahub.ingestion.source.powerbi.config import ( Constant, PlatformDetail, @@ -525,7 +526,7 @@ def generate_container_for_workspace( container_work_units = gen_containers( container_key=workspace_key, name=workspace.name, - sub_types=["Workspace"], + sub_types=[BIContainerSubTypes.POWERBI_WORKSPACE], ) return container_work_units diff --git a/metadata-ingestion/src/datahub/ingestion/source/pulsar.py b/metadata-ingestion/src/datahub/ingestion/source/pulsar.py index ab9c62ee4414d..c25c794a9c4ab 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/pulsar.py +++ b/metadata-ingestion/src/datahub/ingestion/source/pulsar.py @@ -27,6 +27,7 @@ ) from datahub.ingestion.api.workunit import MetadataWorkUnit from datahub.ingestion.extractor import schema_util +from datahub.ingestion.source.common.subtypes import DatasetSubTypes from datahub.ingestion.source.state.entity_removal_state import GenericCheckpointState from datahub.ingestion.source.state.stale_entity_removal_handler import ( StaleEntityRemovalHandler, @@ -484,7 +485,7 @@ def _extract_record( # 6. Emit subtype aspect marking this as a "topic" subtype_wu = MetadataChangeProposalWrapper( entityUrn=dataset_urn, - aspect=SubTypesClass(typeNames=["topic"]), + aspect=SubTypesClass(typeNames=[DatasetSubTypes.TOPIC]), ).as_workunit() self.report.report_workunit(subtype_wu) yield subtype_wu diff --git a/metadata-ingestion/src/datahub/ingestion/source/s3/data_lake_utils.py b/metadata-ingestion/src/datahub/ingestion/source/s3/data_lake_utils.py index 243bdcf7cd325..3d679de49e71c 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/s3/data_lake_utils.py +++ b/metadata-ingestion/src/datahub/ingestion/source/s3/data_lake_utils.py @@ -15,6 +15,7 @@ get_bucket_relative_path, is_s3_uri, ) +from datahub.ingestion.source.common.subtypes import DatasetContainerSubTypes # hide annoying debug errors from py4j logging.getLogger("py4j").setLevel(logging.ERROR) @@ -79,7 +80,7 @@ def create_container_hierarchy( yield from self.create_emit_containers( container_key=bucket_key, name=bucket_name, - sub_types=["S3 bucket"], + sub_types=[DatasetContainerSubTypes.S3_BUCKET], parent_container_key=None, ) parent_key = bucket_key @@ -111,7 +112,7 @@ def create_container_hierarchy( yield from self.create_emit_containers( container_key=folder_key, name=folder, - sub_types=["Folder"], + sub_types=[DatasetContainerSubTypes.S3_FOLDER], parent_container_key=parent_key, ) parent_key = folder_key diff --git a/metadata-ingestion/src/datahub/ingestion/source/salesforce.py b/metadata-ingestion/src/datahub/ingestion/source/salesforce.py index 9ad0272bfea28..e8900d1efad53 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/salesforce.py +++ b/metadata-ingestion/src/datahub/ingestion/source/salesforce.py @@ -28,6 +28,7 @@ support_status, ) from datahub.ingestion.api.source import Source, SourceReport +from datahub.ingestion.source.common.subtypes import DatasetSubTypes from datahub.metadata.schema_classes import ( AuditStampClass, BooleanTypeClass, @@ -448,11 +449,11 @@ def get_properties_workunit( ).as_workunit() def get_subtypes_workunit(self, sObjectName: str, datasetUrn: str) -> WorkUnit: - subtypes = [] + subtypes: List[str] = [] if sObjectName.endswith("__c"): - subtypes.append("Custom Object") + subtypes.append(DatasetSubTypes.SALESFORCE_CUSTOM_OBJECT) else: - subtypes.append("Standard Object") + subtypes.append(DatasetSubTypes.SALESFORCE_STANDARD_OBJECT) return MetadataChangeProposalWrapper( entityUrn=datasetUrn, aspect=SubTypesClass(typeNames=subtypes) diff --git a/metadata-ingestion/src/datahub/ingestion/source/schema/json_schema.py b/metadata-ingestion/src/datahub/ingestion/source/schema/json_schema.py index c850623bc1bd8..344a118661c20 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/schema/json_schema.py +++ b/metadata-ingestion/src/datahub/ingestion/source/schema/json_schema.py @@ -36,6 +36,7 @@ JsonSchemaTranslator, get_schema_metadata, ) +from datahub.ingestion.source.common.subtypes import DatasetSubTypes from datahub.ingestion.source.state.entity_removal_state import GenericCheckpointState from datahub.ingestion.source.state.stale_entity_removal_handler import ( StaleEntityRemovalHandler, @@ -314,7 +315,7 @@ def _load_one_file( yield self._report_and_return( MetadataChangeProposalWrapper( entityUrn=dataset_urn, - aspect=models.SubTypesClass(typeNames=["schema"]), + aspect=models.SubTypesClass(typeNames=[DatasetSubTypes.SCHEMA]), ).as_workunit() ) diff --git a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py index 20dbb0bbc7d34..09abb7cd21626 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py +++ b/metadata-ingestion/src/datahub/ingestion/source/snowflake/snowflake_v2.py @@ -36,6 +36,10 @@ ) from datahub.ingestion.api.workunit import MetadataWorkUnit from datahub.ingestion.glossary.classification_mixin import ClassificationMixin +from datahub.ingestion.source.common.subtypes import ( + DatasetContainerSubTypes, + DatasetSubTypes, +) from datahub.ingestion.source.snowflake.constants import ( GENERIC_PERMISSION_ERROR_KEY, SNOWFLAKE_DATABASE, @@ -73,7 +77,6 @@ SnowflakePermissionError, SnowflakeQueryMixin, ) -from datahub.ingestion.source.sql.sql_common import SqlContainerSubTypes from datahub.ingestion.source.sql.sql_utils import ( add_table_to_schema_container, gen_database_container, @@ -1013,7 +1016,9 @@ def gen_dataset_workunits( yield dpi_aspect subTypes = SubTypes( - typeNames=["view"] if isinstance(table, SnowflakeView) else ["table"] + typeNames=[DatasetSubTypes.VIEW] + if isinstance(table, SnowflakeView) + else [DatasetSubTypes.TABLE] ) yield MetadataChangeProposalWrapper( @@ -1222,7 +1227,7 @@ def gen_database_containers( name=database.name, database=self.snowflake_identifier(database.name), database_container_key=database_container_key, - sub_types=[SqlContainerSubTypes.DATABASE], + sub_types=[DatasetContainerSubTypes.DATABASE], domain_registry=self.domain_registry, domain_config=self.config.domain, report=self.report, @@ -1269,7 +1274,7 @@ def gen_schema_containers( database_container_key=database_container_key, domain_config=self.config.domain, schema_container_key=schema_container_key, - sub_types=[SqlContainerSubTypes.SCHEMA], + sub_types=[DatasetContainerSubTypes.SCHEMA], report=self.report, domain_registry=self.domain_registry, description=schema.comment, diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py index 4b0399034141f..198677a315676 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py +++ b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py @@ -20,10 +20,8 @@ ) from datahub.ingestion.api.workunit import MetadataWorkUnit from datahub.ingestion.source.aws.s3_util import make_s3_urn -from datahub.ingestion.source.sql.sql_common import ( - SQLAlchemySource, - SqlContainerSubTypes, -) +from datahub.ingestion.source.common.subtypes import DatasetContainerSubTypes +from datahub.ingestion.source.sql.sql_common import SQLAlchemySource from datahub.ingestion.source.sql.sql_config import ( SQLAlchemyConfig, make_sqlalchemy_uri, @@ -207,7 +205,7 @@ def gen_schema_containers( yield from gen_database_container( database=database, database_container_key=database_container_key, - sub_types=[SqlContainerSubTypes.DATABASE], + sub_types=[DatasetContainerSubTypes.DATABASE], domain_registry=self.domain_registry, domain_config=self.config.domain, report=self.report, diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/presto_on_hive.py b/metadata-ingestion/src/datahub/ingestion/source/sql/presto_on_hive.py index 5d28f906c375d..de25dc50cb5c6 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/sql/presto_on_hive.py +++ b/metadata-ingestion/src/datahub/ingestion/source/sql/presto_on_hive.py @@ -27,6 +27,10 @@ support_status, ) from datahub.ingestion.api.workunit import MetadataWorkUnit +from datahub.ingestion.source.common.subtypes import ( + DatasetContainerSubTypes, + DatasetSubTypes, +) from datahub.ingestion.source.sql.sql_common import ( SQLAlchemySource, SqlWorkUnit, @@ -63,17 +67,6 @@ TableKey = namedtuple("TableKey", ["schema", "table"]) -class PrestoOnHiveContainerSubTypes(str, Enum): - DATABASE = "Database" - CATALOG = "Catalog" - SCHEMA = "Schema" - - -class PrestoOnHiveDatasetSubTypes(str, Enum): - VIEW = "View" - TABLE = "Table" - - class PrestoOnHiveConfigMode(str, Enum): hive: str = "hive" # noqa: F811 presto: str = "presto" @@ -292,19 +285,19 @@ def __init__(self, config: PrestoOnHiveConfig, ctx: PipelineContext) -> None: self.config: PrestoOnHiveConfig = config self._alchemy_client = SQLAlchemyClient(config) self.database_container_subtype = ( - PrestoOnHiveContainerSubTypes.CATALOG + DatasetContainerSubTypes.PRESTO_CATALOG if config.use_catalog_subtype - else PrestoOnHiveContainerSubTypes.DATABASE + else DatasetContainerSubTypes.DATABASE ) self.view_subtype = ( - PrestoOnHiveDatasetSubTypes.VIEW + DatasetSubTypes.VIEW.title() if config.use_dataset_pascalcase_subtype - else PrestoOnHiveDatasetSubTypes.VIEW.lower() + else DatasetSubTypes.VIEW.lower() ) self.table_subtype = ( - PrestoOnHiveDatasetSubTypes.TABLE + DatasetSubTypes.TABLE.title() if config.use_dataset_pascalcase_subtype - else PrestoOnHiveDatasetSubTypes.TABLE.lower() + else DatasetSubTypes.TABLE.lower() ) def get_db_name(self, inspector: Inspector) -> str: @@ -389,7 +382,7 @@ def gen_schema_containers( yield from gen_schema_container( database=database, schema=schema, - sub_types=["Schema"], + sub_types=[DatasetContainerSubTypes.SCHEMA], database_container_key=database_container_key, schema_container_key=schema_container_key, domain_registry=self.domain_registry, diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py index 676ebc38c6ce0..2ce393f02b7ef 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py +++ b/metadata-ingestion/src/datahub/ingestion/source/sql/sql_common.py @@ -3,7 +3,6 @@ import traceback from collections import OrderedDict from dataclasses import dataclass, field -from enum import Enum from typing import ( TYPE_CHECKING, Any, @@ -34,6 +33,10 @@ from datahub.emitter.mcp import MetadataChangeProposalWrapper from datahub.ingestion.api.common import PipelineContext from datahub.ingestion.api.workunit import MetadataWorkUnit +from datahub.ingestion.source.common.subtypes import ( + DatasetContainerSubTypes, + DatasetSubTypes, +) from datahub.ingestion.source.sql.sql_config import SQLAlchemyConfig from datahub.ingestion.source.sql.sql_utils import ( add_table_to_schema_container, @@ -151,11 +154,6 @@ def get_platform_from_sqlalchemy_uri(sqlalchemy_uri: str) -> str: return "external" -class SqlContainerSubTypes(str, Enum): - DATABASE = "Database" - SCHEMA = "Schema" - - @dataclass class SQLSourceReport(StaleEntityRemovalSourceReport): tables_scanned: int = 0 @@ -429,7 +427,7 @@ def gen_database_containers( yield from gen_database_container( database=database, database_container_key=database_container_key, - sub_types=[SqlContainerSubTypes.DATABASE], + sub_types=[DatasetContainerSubTypes.DATABASE], domain_registry=self.domain_registry, domain_config=self.config.domain, report=self.report, @@ -463,7 +461,7 @@ def gen_schema_containers( schema=schema, schema_container_key=schema_container_key, database_container_key=database_container_key, - sub_types=[SqlContainerSubTypes.SCHEMA], + sub_types=[DatasetContainerSubTypes.SCHEMA], domain_registry=self.domain_registry, domain_config=self.config.domain, report=self.report, @@ -752,7 +750,7 @@ def _process_table( changeType=ChangeTypeClass.UPSERT, entityUrn=dataset_urn, aspectName="subTypes", - aspect=SubTypesClass(typeNames=["table"]), + aspect=SubTypesClass(typeNames=[DatasetSubTypes.TABLE]), ), ) self.report.report_workunit(subtypes_aspect) @@ -1029,7 +1027,7 @@ def _process_view( changeType=ChangeTypeClass.UPSERT, entityUrn=dataset_urn, aspectName="subTypes", - aspect=SubTypesClass(typeNames=["view"]), + aspect=SubTypesClass(typeNames=[DatasetSubTypes.VIEW]), ), ) self.report.report_workunit(subtypes_aspect) diff --git a/metadata-ingestion/src/datahub/ingestion/source/tableau.py b/metadata-ingestion/src/datahub/ingestion/source/tableau.py index 75b9e6cfb2e83..dc4143b10f3d9 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/tableau.py +++ b/metadata-ingestion/src/datahub/ingestion/source/tableau.py @@ -38,6 +38,10 @@ ) from datahub.ingestion.api.source import Source from datahub.ingestion.api.workunit import MetadataWorkUnit +from datahub.ingestion.source.common.subtypes import ( + BIContainerSubTypes, + DatasetSubTypes, +) from datahub.ingestion.source.state.entity_removal_state import GenericCheckpointState from datahub.ingestion.source.state.stale_entity_removal_handler import ( StaleEntityRemovalHandler, @@ -937,7 +941,7 @@ def emit_custom_sql_datasources(self) -> Iterable[MetadataWorkUnit]: yield self.get_metadata_change_proposal( dataset_snapshot.urn, aspect_name="subTypes", - aspect=SubTypesClass(typeNames=["view", "Custom SQL"]), + aspect=SubTypesClass(typeNames=[DatasetSubTypes.VIEW, "Custom SQL"]), ) def get_schema_metadata_for_custom_sql( @@ -1485,7 +1489,7 @@ def emit_workbook_as_container(self, workbook: Dict) -> Iterable[MetadataWorkUni container_workunits = gen_containers( container_key=workbook_container_key, name=workbook.get("name", ""), - sub_types=["Workbook"], + sub_types=[BIContainerSubTypes.TABLEAU_WORKBOOK], description=workbook.get("description"), owner_urn=owner_urn, external_url=workbook_external_url, diff --git a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py index afd87e2009c54..90491ac103e34 100644 --- a/metadata-ingestion/src/datahub/ingestion/source/unity/source.py +++ b/metadata-ingestion/src/datahub/ingestion/source/unity/source.py @@ -32,6 +32,10 @@ TestConnectionReport, ) from datahub.ingestion.api.workunit import MetadataWorkUnit +from datahub.ingestion.source.common.subtypes import ( + DatasetContainerSubTypes, + DatasetSubTypes, +) from datahub.ingestion.source.state.entity_removal_state import GenericCheckpointState from datahub.ingestion.source.state.stale_entity_removal_handler import ( StaleEntityRemovalHandler, @@ -347,7 +351,7 @@ def gen_schema_containers(self, schema: Schema) -> Iterable[MetadataWorkUnit]: yield from gen_containers( container_key=schema_container_key, name=schema.name, - sub_types=["Schema"], + sub_types=[DatasetContainerSubTypes.SCHEMA], parent_container_key=self.gen_catalog_key(catalog=schema.catalog), domain_urn=domain_urn, description=schema.comment, @@ -363,7 +367,7 @@ def gen_metastore_containers( yield from gen_containers( container_key=metastore_container_key, name=metastore.name, - sub_types=["Metastore"], + sub_types=[DatasetContainerSubTypes.DATABRICKS_METASTORE], domain_urn=domain_urn, description=metastore.comment, ) @@ -378,7 +382,7 @@ def gen_catalog_containers(self, catalog: Catalog) -> Iterable[MetadataWorkUnit] yield from gen_containers( container_key=catalog_container_key, name=catalog.name, - sub_types=["Catalog"], + sub_types=[DatasetContainerSubTypes.PRESTO_CATALOG], domain_urn=domain_urn, parent_container_key=metastore_container_key, description=catalog.comment, @@ -457,7 +461,11 @@ def _create_table_property_aspect( def _create_table_sub_type_aspect(self, table: proxy.Table) -> SubTypesClass: return SubTypesClass( - typeNames=["View" if table.table_type.lower() == "view" else "Table"] + typeNames=[ + DatasetSubTypes.VIEW + if table.table_type.lower() == "view" + else DatasetSubTypes.TABLE + ] ) def _create_view_property_aspect(self, table: proxy.Table) -> ViewProperties: diff --git a/metadata-ingestion/tests/integration/clickhouse/clickhouse_mces_golden.json b/metadata-ingestion/tests/integration/clickhouse/clickhouse_mces_golden.json index 8cc83ddd92765..85fc739cc11eb 100644 --- a/metadata-ingestion/tests/integration/clickhouse/clickhouse_mces_golden.json +++ b/metadata-ingestion/tests/integration/clickhouse/clickhouse_mces_golden.json @@ -299,7 +299,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -896,7 +896,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1039,7 +1039,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1272,7 +1272,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1456,7 +1456,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"view\"]}", + "value": "{\"typeNames\": [\"View\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1654,7 +1654,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"view\"]}", + "value": "{\"typeNames\": [\"View\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1800,7 +1800,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"view\"]}", + "value": "{\"typeNames\": [\"View\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1822,4 +1822,4 @@ "runId": "clickhouse-test" } } -] \ No newline at end of file +] diff --git a/metadata-ingestion/tests/integration/hana/hana_mces_golden.json b/metadata-ingestion/tests/integration/hana/hana_mces_golden.json index 2332eb3eda105..84ad1f3d3e592 100644 --- a/metadata-ingestion/tests/integration/hana/hana_mces_golden.json +++ b/metadata-ingestion/tests/integration/hana/hana_mces_golden.json @@ -332,7 +332,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -562,7 +562,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -774,7 +774,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/hive/hive_mces_golden.json b/metadata-ingestion/tests/integration/hive/hive_mces_golden.json index 356c73b86514f..4251c0df352e0 100644 --- a/metadata-ingestion/tests/integration/hive/hive_mces_golden.json +++ b/metadata-ingestion/tests/integration/hive/hive_mces_golden.json @@ -239,7 +239,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -396,7 +396,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -522,7 +522,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -697,7 +697,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -818,7 +818,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -971,7 +971,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1193,7 +1193,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/kafka/kafka_mces_golden.json b/metadata-ingestion/tests/integration/kafka/kafka_mces_golden.json index e576acb67a7e2..5ac9d2c18cd80 100644 --- a/metadata-ingestion/tests/integration/kafka/kafka_mces_golden.json +++ b/metadata-ingestion/tests/integration/kafka/kafka_mces_golden.json @@ -118,7 +118,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"topic\"]}", + "value": "{\"typeNames\": [\"Topic\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -221,7 +221,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"topic\"]}", + "value": "{\"typeNames\": [\"Topic\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -360,7 +360,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"topic\"]}", + "value": "{\"typeNames\": [\"Topic\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/looker/golden_looker_mces.json b/metadata-ingestion/tests/integration/looker/golden_looker_mces.json index 48ab7e9b729b4..f3fbc3c459043 100644 --- a/metadata-ingestion/tests/integration/looker/golden_looker_mces.json +++ b/metadata-ingestion/tests/integration/looker/golden_looker_mces.json @@ -195,7 +195,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"explore\"]}", + "value": "{\"typeNames\": [\"Explore\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -319,7 +319,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"explore\"]}", + "value": "{\"typeNames\": [\"Explore\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/looker/golden_test_allow_ingest.json b/metadata-ingestion/tests/integration/looker/golden_test_allow_ingest.json index 075fd18a20707..f4d53360d270b 100644 --- a/metadata-ingestion/tests/integration/looker/golden_test_allow_ingest.json +++ b/metadata-ingestion/tests/integration/looker/golden_test_allow_ingest.json @@ -181,7 +181,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"explore\"]}", + "value": "{\"typeNames\": [\"Explore\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/looker/golden_test_ingest.json b/metadata-ingestion/tests/integration/looker/golden_test_ingest.json index 2abca60748270..788e0fcf1cf40 100644 --- a/metadata-ingestion/tests/integration/looker/golden_test_ingest.json +++ b/metadata-ingestion/tests/integration/looker/golden_test_ingest.json @@ -181,7 +181,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"explore\"]}", + "value": "{\"typeNames\": [\"Explore\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/looker/golden_test_ingest_joins.json b/metadata-ingestion/tests/integration/looker/golden_test_ingest_joins.json index 71792c980f59a..2536f2290150f 100644 --- a/metadata-ingestion/tests/integration/looker/golden_test_ingest_joins.json +++ b/metadata-ingestion/tests/integration/looker/golden_test_ingest_joins.json @@ -205,7 +205,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"explore\"]}", + "value": "{\"typeNames\": [\"Explore\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/looker/golden_test_ingest_unaliased_joins.json b/metadata-ingestion/tests/integration/looker/golden_test_ingest_unaliased_joins.json index 94ee9525b0cbc..80674911f09be 100644 --- a/metadata-ingestion/tests/integration/looker/golden_test_ingest_unaliased_joins.json +++ b/metadata-ingestion/tests/integration/looker/golden_test_ingest_unaliased_joins.json @@ -197,7 +197,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"explore\"]}", + "value": "{\"typeNames\": [\"Explore\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/looker/looker_mces_golden_deleted_stateful.json b/metadata-ingestion/tests/integration/looker/looker_mces_golden_deleted_stateful.json index 536f1b826aa6f..374d4b69bbd6f 100644 --- a/metadata-ingestion/tests/integration/looker/looker_mces_golden_deleted_stateful.json +++ b/metadata-ingestion/tests/integration/looker/looker_mces_golden_deleted_stateful.json @@ -181,7 +181,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"explore\"]}", + "value": "{\"typeNames\": [\"Explore\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/looker/looker_mces_usage_history.json b/metadata-ingestion/tests/integration/looker/looker_mces_usage_history.json index 448a88d72182d..68f01840ca39f 100644 --- a/metadata-ingestion/tests/integration/looker/looker_mces_usage_history.json +++ b/metadata-ingestion/tests/integration/looker/looker_mces_usage_history.json @@ -181,7 +181,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"explore\"]}", + "value": "{\"typeNames\": [\"Explore\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/lookml/expected_output.json b/metadata-ingestion/tests/integration/lookml/expected_output.json index 117b0a11f10c7..c5819df877170 100644 --- a/metadata-ingestion/tests/integration/lookml/expected_output.json +++ b/metadata-ingestion/tests/integration/lookml/expected_output.json @@ -187,7 +187,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -380,7 +380,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -462,7 +462,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -544,7 +544,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -671,7 +671,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -753,7 +753,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -835,7 +835,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -992,7 +992,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1074,7 +1074,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1235,7 +1235,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1409,7 +1409,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_api_bigquery.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_api_bigquery.json index bf5db943f468c..bb10ea39d36fb 100644 --- a/metadata-ingestion/tests/integration/lookml/lookml_mces_api_bigquery.json +++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_api_bigquery.json @@ -187,7 +187,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -380,7 +380,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -462,7 +462,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -544,7 +544,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -671,7 +671,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -753,7 +753,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -835,7 +835,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -992,7 +992,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1074,7 +1074,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1235,7 +1235,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1409,7 +1409,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_api_hive2.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_api_hive2.json index 19643ee900d3d..5816aec177787 100644 --- a/metadata-ingestion/tests/integration/lookml/lookml_mces_api_hive2.json +++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_api_hive2.json @@ -187,7 +187,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -380,7 +380,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -462,7 +462,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -544,7 +544,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -671,7 +671,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -753,7 +753,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -835,7 +835,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -992,7 +992,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1074,7 +1074,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1235,7 +1235,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1409,7 +1409,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_badsql_parser.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_badsql_parser.json index 73ac55c248a70..3822a4874bf66 100644 --- a/metadata-ingestion/tests/integration/lookml/lookml_mces_badsql_parser.json +++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_badsql_parser.json @@ -173,7 +173,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -352,7 +352,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -434,7 +434,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -516,7 +516,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -643,7 +643,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -725,7 +725,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -807,7 +807,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -875,7 +875,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -957,7 +957,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1118,7 +1118,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1292,7 +1292,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_golden_deleted_stateful.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_golden_deleted_stateful.json index bd16f598d28e1..401d86d0ff90b 100644 --- a/metadata-ingestion/tests/integration/lookml/lookml_mces_golden_deleted_stateful.json +++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_golden_deleted_stateful.json @@ -187,7 +187,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -361,7 +361,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline.json index f700fb529c8c4..2e9440ab31c0d 100644 --- a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline.json +++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline.json @@ -187,7 +187,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -380,7 +380,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -462,7 +462,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -544,7 +544,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -671,7 +671,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -753,7 +753,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -835,7 +835,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -992,7 +992,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1074,7 +1074,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1235,7 +1235,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1409,7 +1409,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_deny_pattern.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_deny_pattern.json index 18344e5809d3c..dda7a653d60fd 100644 --- a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_deny_pattern.json +++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_deny_pattern.json @@ -55,7 +55,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -137,7 +137,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -264,7 +264,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -346,7 +346,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -428,7 +428,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_platform_instance.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_platform_instance.json index dd5b4f1c0df0e..f1d72be24ff81 100644 --- a/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_platform_instance.json +++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_offline_platform_instance.json @@ -187,7 +187,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -380,7 +380,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -462,7 +462,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -544,7 +544,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -671,7 +671,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -753,7 +753,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -835,7 +835,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -992,7 +992,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1074,7 +1074,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1235,7 +1235,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1409,7 +1409,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/lookml/lookml_mces_with_external_urls.json b/metadata-ingestion/tests/integration/lookml/lookml_mces_with_external_urls.json index b57e3402d9bda..eb45d0ca841d2 100644 --- a/metadata-ingestion/tests/integration/lookml/lookml_mces_with_external_urls.json +++ b/metadata-ingestion/tests/integration/lookml/lookml_mces_with_external_urls.json @@ -188,7 +188,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -382,7 +382,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -465,7 +465,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -548,7 +548,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -676,7 +676,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -759,7 +759,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -842,7 +842,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1000,7 +1000,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1083,7 +1083,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1245,7 +1245,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -1420,7 +1420,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/lookml/lookml_reachable_views.json b/metadata-ingestion/tests/integration/lookml/lookml_reachable_views.json index e5acf27c8debf..068762aca6ff2 100644 --- a/metadata-ingestion/tests/integration/lookml/lookml_reachable_views.json +++ b/metadata-ingestion/tests/integration/lookml/lookml_reachable_views.json @@ -187,7 +187,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -361,7 +361,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -575,7 +575,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/mysql/mysql_mces_no_db_golden.json b/metadata-ingestion/tests/integration/mysql/mysql_mces_no_db_golden.json index c456a5667b020..9d6d307b4adba 100644 --- a/metadata-ingestion/tests/integration/mysql/mysql_mces_no_db_golden.json +++ b/metadata-ingestion/tests/integration/mysql/mysql_mces_no_db_golden.json @@ -195,7 +195,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -319,7 +319,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -577,7 +577,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -753,7 +753,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -894,7 +894,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"view\"]}", + "value": "{\"typeNames\": [\"View\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1126,7 +1126,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1250,7 +1250,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1422,7 +1422,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1510,7 +1510,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/mysql/mysql_mces_with_db_golden.json b/metadata-ingestion/tests/integration/mysql/mysql_mces_with_db_golden.json index a5b66f8469f51..acf214b1d56b8 100644 --- a/metadata-ingestion/tests/integration/mysql/mysql_mces_with_db_golden.json +++ b/metadata-ingestion/tests/integration/mysql/mysql_mces_with_db_golden.json @@ -209,7 +209,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -347,7 +347,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_database.json b/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_database.json index 5981abe6f33b5..6aeb517b3a5e7 100644 --- a/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_database.json +++ b/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_database.json @@ -195,7 +195,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -273,7 +273,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -421,7 +421,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -499,7 +499,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_out_database.json b/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_out_database.json index 20ce20f40e595..1a4d7b63ccbcb 100644 --- a/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_out_database.json +++ b/metadata-ingestion/tests/integration/oracle/golden_test_ingest_with_out_database.json @@ -195,7 +195,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -273,7 +273,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -421,7 +421,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -499,7 +499,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/salesforce/salesforce_mces_golden.json b/metadata-ingestion/tests/integration/salesforce/salesforce_mces_golden.json index 6cb938aaa04c6..9e519428e39b4 100644 --- a/metadata-ingestion/tests/integration/salesforce/salesforce_mces_golden.json +++ b/metadata-ingestion/tests/integration/salesforce/salesforce_mces_golden.json @@ -45,7 +45,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"Standard Object\"]}", + "value": "{\"typeNames\": [\"Object\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json b/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json index 77fa32961b2b0..714c38bc746e6 100644 --- a/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json +++ b/metadata-ingestion/tests/integration/snowflake/snowflake_golden.json @@ -468,7 +468,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -726,7 +726,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -984,7 +984,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -1242,7 +1242,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -1500,7 +1500,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -1758,7 +1758,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -2016,7 +2016,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -2274,7 +2274,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -2532,7 +2532,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -2790,7 +2790,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -3049,7 +3049,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, @@ -3333,7 +3333,7 @@ "aspect": { "json": { "typeNames": [ - "view" + "View" ] } }, diff --git a/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json b/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json index c24dd5173d381..c5a06c7339fac 100644 --- a/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json +++ b/metadata-ingestion/tests/integration/snowflake/snowflake_privatelink_golden.json @@ -187,7 +187,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -271,7 +271,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -355,7 +355,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -439,7 +439,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -523,7 +523,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -607,7 +607,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -691,7 +691,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -775,7 +775,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -859,7 +859,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -943,7 +943,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json index 7b83b919cbc4a..a1be4cdb30beb 100644 --- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json +++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_to_file.json @@ -847,7 +847,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1018,7 +1018,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1143,7 +1143,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1255,7 +1255,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -2321,7 +2321,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -2491,7 +2491,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -2615,7 +2615,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json index 5f2216cf3b79d..6844a64e32f74 100644 --- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json +++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_no_db_with_filter.json @@ -847,7 +847,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1018,7 +1018,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1143,7 +1143,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1255,7 +1255,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json index b590d6c1567da..6995644bdb103 100644 --- a/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json +++ b/metadata-ingestion/tests/integration/sql_server/golden_files/golden_mces_mssql_to_file.json @@ -847,7 +847,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1018,7 +1018,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1143,7 +1143,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1255,7 +1255,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/tableau/tableau_mces_golden.json b/metadata-ingestion/tests/integration/tableau/tableau_mces_golden.json index 8a649e38a7858..91bbf2568b4f3 100644 --- a/metadata-ingestion/tests/integration/tableau/tableau_mces_golden.json +++ b/metadata-ingestion/tests/integration/tableau/tableau_mces_golden.json @@ -32372,7 +32372,7 @@ "aspect": { "json": { "typeNames": [ - "view", + "View", "Custom SQL" ] } @@ -32576,7 +32576,7 @@ "aspect": { "json": { "typeNames": [ - "view", + "View", "Custom SQL" ] } diff --git a/metadata-ingestion/tests/integration/tableau/tableau_state_mces_golden.json b/metadata-ingestion/tests/integration/tableau/tableau_state_mces_golden.json index 2f12b9b71d12d..fb884f79c0977 100644 --- a/metadata-ingestion/tests/integration/tableau/tableau_state_mces_golden.json +++ b/metadata-ingestion/tests/integration/tableau/tableau_state_mces_golden.json @@ -23566,7 +23566,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"view\", \"Custom SQL\"]}", + "value": "{\"typeNames\": [\"View\", \"Custom SQL\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -23754,7 +23754,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"view\", \"Custom SQL\"]}", + "value": "{\"typeNames\": [\"View\", \"Custom SQL\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/tableau/tableau_with_platform_instance_mces_golden.json b/metadata-ingestion/tests/integration/tableau/tableau_with_platform_instance_mces_golden.json index 247bee687ef63..b464cf3868f93 100644 --- a/metadata-ingestion/tests/integration/tableau/tableau_with_platform_instance_mces_golden.json +++ b/metadata-ingestion/tests/integration/tableau/tableau_with_platform_instance_mces_golden.json @@ -32419,7 +32419,7 @@ "aspect": { "json": { "typeNames": [ - "view", + "View", "Custom SQL" ] } @@ -32624,7 +32624,7 @@ "aspect": { "json": { "typeNames": [ - "view", + "View", "Custom SQL" ] } diff --git a/metadata-ingestion/tests/integration/trino/trino_hive_mces_golden.json b/metadata-ingestion/tests/integration/trino/trino_hive_mces_golden.json index 75a9c114b49b1..6f97019e79f38 100644 --- a/metadata-ingestion/tests/integration/trino/trino_hive_mces_golden.json +++ b/metadata-ingestion/tests/integration/trino/trino_hive_mces_golden.json @@ -264,7 +264,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -375,7 +375,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -535,7 +535,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -649,7 +649,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -787,7 +787,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -922,7 +922,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1029,7 +1029,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1220,7 +1220,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -1359,7 +1359,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"view\"]}", + "value": "{\"typeNames\": [\"View\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/integration/trino/trino_mces_golden.json b/metadata-ingestion/tests/integration/trino/trino_mces_golden.json index b0892c16a27f8..5eaa402c2def7 100644 --- a/metadata-ingestion/tests/integration/trino/trino_mces_golden.json +++ b/metadata-ingestion/tests/integration/trino/trino_mces_golden.json @@ -270,7 +270,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -394,7 +394,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -494,7 +494,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { @@ -642,7 +642,7 @@ "changeType": "UPSERT", "aspectName": "subTypes", "aspect": { - "value": "{\"typeNames\": [\"table\"]}", + "value": "{\"typeNames\": [\"Table\"]}", "contentType": "application/json" }, "systemMetadata": { diff --git a/metadata-ingestion/tests/unit/glue/glue_deleted_actor_mces_golden.json b/metadata-ingestion/tests/unit/glue/glue_deleted_actor_mces_golden.json index 821cebb81b7e2..dad17fe5b73b4 100644 --- a/metadata-ingestion/tests/unit/glue/glue_deleted_actor_mces_golden.json +++ b/metadata-ingestion/tests/unit/glue/glue_deleted_actor_mces_golden.json @@ -227,7 +227,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, @@ -412,7 +412,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } }, diff --git a/metadata-ingestion/tests/unit/glue/glue_mces_golden.json b/metadata-ingestion/tests/unit/glue/glue_mces_golden.json index cb1c05b44cd3f..847b97277ce75 100644 --- a/metadata-ingestion/tests/unit/glue/glue_mces_golden.json +++ b/metadata-ingestion/tests/unit/glue/glue_mces_golden.json @@ -240,10 +240,10 @@ "com.linkedin.pegasus2avro.common.GlobalTags": { "tags": [ { - "tag": "urn:li:tag:baz:bob" + "tag": "urn:li:tag:foo:bar" }, { - "tag": "urn:li:tag:foo:bar" + "tag": "urn:li:tag:baz:bob" } ] } @@ -260,7 +260,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } } @@ -476,10 +476,10 @@ "com.linkedin.pegasus2avro.common.GlobalTags": { "tags": [ { - "tag": "urn:li:tag:baz:bob" + "tag": "urn:li:tag:foo:bar" }, { - "tag": "urn:li:tag:foo:bar" + "tag": "urn:li:tag:baz:bob" } ] } @@ -496,7 +496,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } } @@ -661,10 +661,10 @@ "com.linkedin.pegasus2avro.common.GlobalTags": { "tags": [ { - "tag": "urn:li:tag:baz:bob" + "tag": "urn:li:tag:foo:bar" }, { - "tag": "urn:li:tag:foo:bar" + "tag": "urn:li:tag:baz:bob" } ] } @@ -681,7 +681,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } } @@ -1254,4 +1254,4 @@ } } } -] +] \ No newline at end of file diff --git a/metadata-ingestion/tests/unit/glue/glue_mces_platform_instance_golden.json b/metadata-ingestion/tests/unit/glue/glue_mces_platform_instance_golden.json index 242afccecbd22..a78c48189f863 100644 --- a/metadata-ingestion/tests/unit/glue/glue_mces_platform_instance_golden.json +++ b/metadata-ingestion/tests/unit/glue/glue_mces_platform_instance_golden.json @@ -242,10 +242,10 @@ "com.linkedin.pegasus2avro.common.GlobalTags": { "tags": [ { - "tag": "urn:li:tag:baz:bob" + "tag": "urn:li:tag:foo:bar" }, { - "tag": "urn:li:tag:foo:bar" + "tag": "urn:li:tag:baz:bob" } ] } @@ -262,7 +262,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } } @@ -480,10 +480,10 @@ "com.linkedin.pegasus2avro.common.GlobalTags": { "tags": [ { - "tag": "urn:li:tag:baz:bob" + "tag": "urn:li:tag:foo:bar" }, { - "tag": "urn:li:tag:foo:bar" + "tag": "urn:li:tag:baz:bob" } ] } @@ -500,7 +500,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } } @@ -666,10 +666,10 @@ "com.linkedin.pegasus2avro.common.GlobalTags": { "tags": [ { - "tag": "urn:li:tag:baz:bob" + "tag": "urn:li:tag:foo:bar" }, { - "tag": "urn:li:tag:foo:bar" + "tag": "urn:li:tag:baz:bob" } ] } @@ -686,7 +686,7 @@ "aspect": { "json": { "typeNames": [ - "table" + "Table" ] } } @@ -1259,4 +1259,4 @@ } } } -] +] \ No newline at end of file