Revert "Bug: 1866834 - Add public json = true flag"

[scholtzan]

Reverts #4845

┆Issue is synchronized with this Jira Task

[dataops-ci-bot]

Integration report for "Revert "Bug: 1866834 - Add public json = true flag""

sql.diff

Click to expand!

diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/dags/bqetl_public_data_json.py /tmp/workspace/generated-sql/dags/bqetl_public_data_json.py
--- /tmp/workspace/main-generated-sql/dags/bqetl_public_data_json.py	2024-01-17 20:56:57.000000000 +0000
+++ /tmp/workspace/generated-sql/dags/bqetl_public_data_json.py	2024-01-17 20:56:09.000000000 +0000
@@ -67,34 +67,6 @@
         image=docker_image,
     )
 
-    export_public_data_json_fenix_derived__fenix_use_counters__v2 = GKEPodOperator(
-        task_id="export_public_data_json_fenix_derived__fenix_use_counters__v2",
-        name="export_public_data_json_fenix_derived__fenix_use_counters__v2",
-        arguments=["script/publish_public_data_json"]
-        + [
-            "--query_file=sql/moz-fx-data-shared-prod/fenix_derived/fenix_use_counters_v2/query.sql"
-        ]
-        + ["--destination_table=fenix_use_counters${{ds_nodash}}"]
-        + ["--dataset_id=fenix_derived"]
-        + ["--project_id=moz-fx-data-shared-prod"]
-        + ["--parameter=submission_date:DATE:{{ds}}"],
-        image=docker_image,
-    )
-
-    export_public_data_json_firefox_desktop_derived__firefox_desktop_use_counters__v2 = GKEPodOperator(
-        task_id="export_public_data_json_firefox_desktop_derived__firefox_desktop_use_counters__v2",
-        name="export_public_data_json_firefox_desktop_derived__firefox_desktop_use_counters__v2",
-        arguments=["script/publish_public_data_json"]
-        + [
-            "--query_file=sql/moz-fx-data-shared-prod/firefox_desktop_derived/firefox_desktop_use_counters_v2/query.sql"
-        ]
-        + ["--destination_table=firefox_desktop_use_counters${{ds_nodash}}"]
-        + ["--dataset_id=firefox_desktop_derived"]
-        + ["--project_id=moz-fx-data-shared-prod"]
-        + ["--parameter=submission_date:DATE:{{ds}}"],
-        image=docker_image,
-    )
-
     export_public_data_json_glam_derived__client_probe_counts_firefox_desktop_beta__v1 = GKEPodOperator(
         task_id="export_public_data_json_glam_derived__client_probe_counts_firefox_desktop_beta__v1",
         name="export_public_data_json_glam_derived__client_probe_counts_firefox_desktop_beta__v1",
@@ -161,38 +133,6 @@
         pool="DATA_ENG_EXTERNALTASKSENSOR",
     )
 
-    export_public_data_json_fenix_derived__fenix_use_counters__v2.set_upstream(
-        wait_for_copy_deduplicate_all
-    )
-
-    wait_for_copy_deduplicate_all = ExternalTaskSensor(
-        task_id="wait_for_copy_deduplicate_all",
-        external_dag_id="copy_deduplicate",
-        external_task_id="copy_deduplicate_all",
-        execution_delta=datetime.timedelta(seconds=14400),
-        check_existence=True,
-        mode="reschedule",
-        allowed_states=ALLOWED_STATES,
-        failed_states=FAILED_STATES,
-        pool="DATA_ENG_EXTERNALTASKSENSOR",
-    )
-
-    export_public_data_json_firefox_desktop_derived__firefox_desktop_use_counters__v2.set_upstream(
-        wait_for_copy_deduplicate_all
-    )
-
-    wait_for_copy_deduplicate_all = ExternalTaskSensor(
-        task_id="wait_for_copy_deduplicate_all",
-        external_dag_id="copy_deduplicate",
-        external_task_id="copy_deduplicate_all",
-        execution_delta=datetime.timedelta(seconds=14400),
-        check_existence=True,
-        mode="reschedule",
-        allowed_states=ALLOWED_STATES,
-        failed_states=FAILED_STATES,
-        pool="DATA_ENG_EXTERNALTASKSENSOR",
-    )
-
     export_public_data_json_mozregression_aggregates__v1.set_upstream(
         wait_for_copy_deduplicate_all
     )
@@ -222,8 +162,6 @@
     public_data_gcs_metadata.set_upstream(
         [
             export_public_data_json_client_probe_processes__v1,
-            export_public_data_json_fenix_derived__fenix_use_counters__v2,
-            export_public_data_json_firefox_desktop_derived__firefox_desktop_use_counters__v2,
             export_public_data_json_glam_derived__client_probe_counts_firefox_desktop_beta__v1,
             export_public_data_json_glam_derived__client_probe_counts_firefox_desktop_nightly__v1,
             export_public_data_json_mozregression_aggregates__v1,
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/fenix_use_counters_v2/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/fenix_use_counters_v2/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/fenix_use_counters_v2/metadata.yaml	2024-01-17 20:55:37.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/fenix_use_counters_v2/metadata.yaml	2024-01-17 20:53:59.000000000 +0000
@@ -6,7 +6,6 @@
 labels:
   incremental: true
   public_bigquery: true
-  public_json: true
   owner1: kwindau
   review_bugs:
   - '1866834'
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop_derived/firefox_desktop_use_counters_v2/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop_derived/firefox_desktop_use_counters_v2/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop_derived/firefox_desktop_use_counters_v2/metadata.yaml	2024-01-17 20:55:38.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop_derived/firefox_desktop_use_counters_v2/metadata.yaml	2024-01-17 20:53:54.000000000 +0000
@@ -6,7 +6,6 @@
 labels:
   incremental: true
   public_bigquery: true
-  public_json: true
   owner1: kwindau
   review_bugs:
   - '1866834'

Link to full diff