From e1c39e59c800239ea67e35d4dcc85888f1735880 Mon Sep 17 00:00:00 2001
From: Chris Collins <chriscollins3456@gmail.com>
Date: Mon, 31 Oct 2022 15:52:13 -0400
Subject: [PATCH] feat(ui) Update bigquery UI ingestion source to be the same
 as bigquery-beta (#6283)

---
 .../source/builder/RecipeForm/constants.ts    | 21 ++++++-------------
 .../app/ingest/source/builder/sources.json    |  2 +-
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts
index c7e62eac75..e024c804a2 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/constants.ts
@@ -10,7 +10,6 @@ import {
     STATEFUL_INGESTION_ENABLED,
     DATABASE_ALLOW,
     DATABASE_DENY,
-    UPSTREAM_LINEAGE_IN_REPORT,
     TABLE_LINEAGE_MODE,
     INGEST_TAGS,
     INGEST_OWNER,
@@ -38,14 +37,10 @@ import {
     SNOWFLAKE_VIEW_DENY,
 } from './snowflake';
 import {
-    BIGQUERY_PROJECT_ID,
-    BIGQUERY_CREDENTIAL_PROJECT_ID,
     BIGQUERY_PRIVATE_KEY,
     BIGQUERY_PRIVATE_KEY_ID,
     BIGQUERY_CLIENT_EMAIL,
     BIGQUERY_CLIENT_ID,
-    BIGQUERY_SCHEMA_ALLOW,
-    BIGQUERY_SCHEMA_DENY,
     BIGQUERY_TABLE_ALLOW,
     BIGQUERY_TABLE_DENY,
     BIGQUERY_VIEW_ALLOW,
@@ -131,22 +126,18 @@ export const RECIPE_FIELDS: RecipeFields = {
     },
     [BIGQUERY]: {
         fields: [
-            BIGQUERY_PROJECT_ID,
-            BIGQUERY_CREDENTIAL_PROJECT_ID,
+            BIGQUERY_BETA_PROJECT_ID,
             BIGQUERY_PRIVATE_KEY,
             BIGQUERY_PRIVATE_KEY_ID,
             BIGQUERY_CLIENT_EMAIL,
             BIGQUERY_CLIENT_ID,
         ],
-        advancedFields: [
-            INCLUDE_TABLE_LINEAGE,
-            PROFILING_ENABLED,
-            STATEFUL_INGESTION_ENABLED,
-            UPSTREAM_LINEAGE_IN_REPORT,
-        ],
+        advancedFields: [INCLUDE_TABLE_LINEAGE, PROFILING_ENABLED, STATEFUL_INGESTION_ENABLED, START_TIME],
         filterFields: [
-            BIGQUERY_SCHEMA_ALLOW,
-            BIGQUERY_SCHEMA_DENY,
+            PROJECT_ALLOW,
+            PROJECT_DENY,
+            DATASET_ALLOW,
+            DATASET_DENY,
             BIGQUERY_TABLE_ALLOW,
             BIGQUERY_TABLE_DENY,
             BIGQUERY_VIEW_ALLOW,
diff --git a/datahub-web-react/src/app/ingest/source/builder/sources.json b/datahub-web-react/src/app/ingest/source/builder/sources.json
index c26a7d2891..7cda84aaff 100644
--- a/datahub-web-react/src/app/ingest/source/builder/sources.json
+++ b/datahub-web-react/src/app/ingest/source/builder/sources.json
@@ -4,7 +4,7 @@
         "name": "bigquery",
         "displayName": "BigQuery",
         "docsUrl": "https://datahubproject.io/docs/generated/ingestion/sources/bigquery/",
-        "recipe": "source:\n    type: bigquery\n    config:\n        # Coordinates\n        project_id: # Your BigQuery project id, e.g. sample_project_id\n        # Credentials\n        credential:\n            project_id: # Your BQ project id, e.g. sample_project_id\n            private_key_id: \"${BQ_PRIVATE_KEY_ID}\"\n            private_key: \"${BQ_PRIVATE_KEY}\"\n            client_email: # Your BQ client email, e.g. \"test@suppproject-id-1234567.iam.gserviceaccount.com\"\n            client_id: # Your BQ client id, e.g.\"123456678890\"\n            \n        include_table_lineage: true\n        profiling:\n            enabled: true\n        stateful_ingestion:\n            enabled: true"
+        "recipe": "source:\n    type: bigquery\n    config:\n        include_table_lineage: true\n        include_usage_statistics: true\n        credential:\n            private_key_id: \n            client_email: \n            private_key: \n            client_id: \n            project_id: \n        profiling:\n            enabled: true\n            profile_table_level_only: true\n        stateful_ingestion:\n            enabled: true"
     },
     {
         "urn": "urn:li:dataPlatform:redshift",