Merge branch 'datahub-project:master' into master

docs-website/src/pages/cloud/UnifiedTabs/index.js

@@ -11,21 +11,21 @@ const TabbedComponent = () => {
       title: 'Discovery',
       description: 'All the search and discovery features of DataHub Core you already love, enhanced.',
       icon: "/img/assets/data-discovery.svg",
-      link: "https://www.acryldata.io/acryl-datahub",
+      link: "https://datahubproject.io/solutions/discovery",
       image: 'https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/demo/discovery.webm',
     },
     {
       title: 'Observability',
       description: 'Detect, resolve, and prevent data quality issues before they impact your business. Unify data health signals from all your data quality tools, including dbt tests and more.',
       icon: "/img/assets/data-ob.svg",
-      link: "https://www.acryldata.io/observe",
+      link: "https://datahubproject.io/solutions/observability",
       image: 'https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/demo/observe.webm',
     },
     {
       title: 'Governance',
       description: 'Powerful Automation, Reporting and Organizational tools to help you govern effectively.',
       icon: "/img/assets/data-governance.svg",
-      link: "https://www.acryldata.io/acryl-datahub#governance",
+      link: "https://datahubproject.io/solutions/governance",
       image: 'https://raw.githubusercontent.com/datahub-project/static-assets/main/imgs/saas/demo/governance.webm',
     },
   ];

metadata-ingestion-modules/airflow-plugin/setup.py

@@ -96,7 +96,7 @@ def get_long_description():
     *plugins["datahub-kafka"],
     f"acryl-datahub[testing-utils]{_self_pin}",
     # Extra requirements for loading our test dags.
-    "apache-airflow[snowflake]>=2.0.2",
+    "apache-airflow[snowflake,amazon]>=2.0.2",
     # A collection of issues we've encountered:
     # - Connexion's new version breaks Airflow:
     #   See https://github.com/apache/airflow/issues/35234.

metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/_extractors.py

@@ -50,7 +50,6 @@ def __init__(self):
             "BigQueryOperator",
             "BigQueryExecuteQueryOperator",
             # Athena also does something similar.
-            "AthenaOperator",
             "AWSAthenaOperator",
             # Additional types that OL doesn't support. This is only necessary because
             # on older versions of Airflow, these operators don't inherit from SQLExecuteQueryOperator.
@@ -59,6 +58,8 @@ def __init__(self):
         for operator in _sql_operator_overrides:
             self.task_to_extractor.extractors[operator] = GenericSqlExtractor
 
+        self.task_to_extractor.extractors["AthenaOperator"] = AthenaOperatorExtractor
+
         self.task_to_extractor.extractors[
             "BigQueryInsertJobOperator"
         ] = BigQueryInsertJobOperatorExtractor
@@ -276,6 +277,27 @@ def extract(self) -> Optional[TaskMetadata]:
         )
 
 
+class AthenaOperatorExtractor(BaseExtractor):
+    def extract(self) -> Optional[TaskMetadata]:
+        from airflow.providers.amazon.aws.operators.athena import (
+            AthenaOperator,  # type: ignore
+        )
+
+        operator: "AthenaOperator" = self.operator
+        sql = operator.query
+        if not sql:
+            self.log.warning("No query found in AthenaOperator")
+            return None
+
+        return _parse_sql_into_task_metadata(
+            self,
+            sql,
+            platform="athena",
+            default_database=None,
+            default_schema=self.operator.database,
+        )
+
+
 def _snowflake_default_schema(self: "SnowflakeExtractor") -> Optional[str]:
     if hasattr(self.operator, "schema") and self.operator.schema is not None:
         return self.operator.schema

metadata-ingestion-modules/airflow-plugin/tests/integration/dags/athena_operator.py

@@ -0,0 +1,43 @@
+from datetime import datetime
+
+from airflow import DAG
+from airflow.providers.amazon.aws.operators.athena import AthenaOperator
+
+ATHENA_COST_TABLE = "costs"
+ATHENA_PROCESSED_TABLE = "processed_costs"
+
+
+def _fake_athena_execute(*args, **kwargs):
+    pass
+
+
+with DAG(
+    "athena_operator",
+    start_date=datetime(2023, 1, 1),
+    schedule_interval=None,
+    catchup=False,
+) as dag:
+    # HACK: We don't want to send real requests to Athena. As a workaround,
+    # we can simply monkey-patch the operator.
+    AthenaOperator.execute = _fake_athena_execute  # type: ignore
+
+    transform_cost_table = AthenaOperator(
+        aws_conn_id="my_aws",
+        task_id="transform_cost_table",
+        database="athena_db",
+        query="""
+        CREATE OR REPLACE TABLE {{ params.out_table_name }} AS
+        SELECT
+            id,
+            month,
+            total_cost,
+            area,
+            total_cost / area as cost_per_area
+        FROM {{ params.in_table_name }}
+        """,
+        params={
+            "in_table_name": ATHENA_COST_TABLE,
+            "out_table_name": ATHENA_PROCESSED_TABLE,
+        },
+        output_location="s3://athena-results-bucket/",
+    )