fix: Combine san_francisco_bikeshare_* folders into `san_francisco_…

…bikeshare` (#211)

datasets/san_francisco_bikeshare/_terraform/bikeshare_station_info_pipeline.tf

@@ -0,0 +1,39 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+resource "google_bigquery_table" "san_francisco_bikeshare_bikeshare_station_info" {
+  project    = var.project_id
+  dataset_id = "san_francisco_bikeshare"
+  table_id   = "bikeshare_station_info"
+
+
+
+
+
+
+  depends_on = [
+    google_bigquery_dataset.san_francisco_bikeshare
+  ]
+}
+
+output "bigquery_table-san_francisco_bikeshare_bikeshare_station_info-table_id" {
+  value = google_bigquery_table.san_francisco_bikeshare_bikeshare_station_info.table_id
+}
+
+output "bigquery_table-san_francisco_bikeshare_bikeshare_station_info-id" {
+  value = google_bigquery_table.san_francisco_bikeshare_bikeshare_station_info.id
+}

datasets/san_francisco_bikeshare/_terraform/bikeshare_station_status_pipeline.tf

@@ -0,0 +1,39 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+resource "google_bigquery_table" "san_francisco_bikeshare_bikeshare_station_status" {
+  project    = var.project_id
+  dataset_id = "san_francisco_bikeshare"
+  table_id   = "bikeshare_station_status"
+
+  description = "san_francisco_bikeshare_station_statusspc"
+
+
+
+
+  depends_on = [
+    google_bigquery_dataset.san_francisco_bikeshare
+  ]
+}
+
+output "bigquery_table-san_francisco_bikeshare_bikeshare_station_status-table_id" {
+  value = google_bigquery_table.san_francisco_bikeshare_bikeshare_station_status.table_id
+}
+
+output "bigquery_table-san_francisco_bikeshare_bikeshare_station_status-id" {
+  value = google_bigquery_table.san_francisco_bikeshare_bikeshare_station_status.id
+}

datasets/san_francisco_bikeshare/_terraform/san_francisco_bikeshare_dataset.tf

@@ -0,0 +1,26 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+resource "google_bigquery_dataset" "san_francisco_bikeshare" {
+  dataset_id  = "san_francisco_bikeshare"
+  project     = var.project_id
+  description = "san_francisco_bikeshare"
+}
+
+output "bigquery_dataset-san_francisco_bikeshare-dataset_id" {
+  value = google_bigquery_dataset.san_francisco_bikeshare.dataset_id
+}

datasets/san_francisco_bikeshare/bikeshare_station_info/bikeshare_station_info_dag.py

@@ -0,0 +1,159 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from airflow import DAG
+from airflow.providers.cncf.kubernetes.operators import kubernetes_pod
+from airflow.providers.google.cloud.transfers import gcs_to_bigquery
+
+default_args = {
+    "owner": "Google",
+    "depends_on_past": False,
+    "start_date": "2021-03-01",
+}
+
+
+with DAG(
+    dag_id="san_francisco_bikeshare.bikeshare_station_info",
+    default_args=default_args,
+    max_active_runs=1,
+    schedule_interval="@daily",
+    catchup=False,
+    default_view="graph",
+) as dag:
+
+    # Run CSV transform within kubernetes pod
+    transform_csv = kubernetes_pod.KubernetesPodOperator(
+        task_id="transform_csv",
+        name="bikeshare_station_info",
+        namespace="default",
+        affinity={
+            "nodeAffinity": {
+                "requiredDuringSchedulingIgnoredDuringExecution": {
+                    "nodeSelectorTerms": [
+                        {
+                            "matchExpressions": [
+                                {
+                                    "key": "cloud.google.com/gke-nodepool",
+                                    "operator": "In",
+                                    "values": ["pool-e2-standard-4"],
+                                }
+                            ]
+                        }
+                    ]
+                }
+            }
+        },
+        image_pull_policy="Always",
+        image="{{ var.json.san_francisco_bikeshare.container_registry.bikeshare_station_info }}",
+        env_vars={
+            "SOURCE_URL_JSON": "https://gbfs.baywheels.com/gbfs/fr/station_information",
+            "SOURCE_FILE": "files/data.csv",
+            "TARGET_FILE": "files/data_output.csv",
+            "CHUNKSIZE": "750000",
+            "TARGET_GCS_BUCKET": "{{ var.value.composer_bucket }}",
+            "TARGET_GCS_PATH": "data/san_francisco_bikeshare/bikeshare_station_info/data_output.csv",
+        },
+        resources={"limit_memory": "8G", "limit_cpu": "3"},
+    )
+
+    # Task to load CSV data to a BigQuery table
+    load_to_bq = gcs_to_bigquery.GCSToBigQueryOperator(
+        task_id="load_to_bq",
+        bucket="{{ var.value.composer_bucket }}",
+        source_objects=[
+            "data/san_francisco_bikeshare/bikeshare_station_info/data_output.csv"
+        ],
+        source_format="CSV",
+        destination_project_dataset_table="san_francisco_bikeshare.bikeshare_station_info",
+        skip_leading_rows=1,
+        allow_quoted_newlines=True,
+        write_disposition="WRITE_TRUNCATE",
+        schema_fields=[
+            {
+                "name": "station_id",
+                "type": "INTEGER",
+                "description": "Unique identifier of a station.",
+                "mode": "REQUIRED",
+            },
+            {
+                "name": "name",
+                "type": "STRING",
+                "description": "Public name of the station",
+                "mode": "REQUIRED",
+            },
+            {
+                "name": "short_name",
+                "type": "STRING",
+                "description": "Short name or other type of identifier, as used by the data publisher",
+                "mode": "NULLABLE",
+            },
+            {
+                "name": "lat",
+                "type": "FLOAT",
+                "description": "The latitude of station. The field value must be a valid WGS 84 latitude in decimal degrees format. See: http://en.wikipedia.org/wiki/World_Geodetic_System, https://en.wikipedia.org/wiki/Decimal_degrees",
+                "mode": "REQUIRED",
+            },
+            {
+                "name": "lon",
+                "type": "FLOAT",
+                "description": "The longitude of station. The field value must be a valid WGS 84 longitude in decimal degrees format. See: http://en.wikipedia.org/wiki/World_Geodetic_System, https://en.wikipedia.org/wiki/Decimal_degrees",
+                "mode": "REQUIRED",
+            },
+            {
+                "name": "region_id",
+                "type": "INTEGER",
+                "description": "ID of the region where station is located",
+                "mode": "NULLABLE",
+            },
+            {
+                "name": "rental_methods",
+                "type": "STRING",
+                "description": "Array of enumerables containing the payment methods accepted at this station.  Current valid values (in CAPS) are: KEY (i.e. operator issued bike key / fob / card) CREDITCARD PAYPASS APPLEPAY ANDROIDPAY TRANSITCARD ACCOUNTNUMBER PHONE This list is intended to be as comprehensive at the time of publication as possible but is subject to change, as defined in File Requirements above",
+                "mode": "NULLABLE",
+            },
+            {
+                "name": "capacity",
+                "type": "INTEGER",
+                "description": "Number of total docking points installed at this station, both available and unavailable",
+                "mode": "NULLABLE",
+            },
+            {
+                "name": "external_id",
+                "type": "STRING",
+                "description": "",
+                "mode": "NULLABLE",
+            },
+            {
+                "name": "eightd_has_key_dispenser",
+                "type": "BOOLEAN",
+                "description": "",
+                "mode": "NULLABLE",
+            },
+            {
+                "name": "has_kiosk",
+                "type": "BOOLEAN",
+                "description": "",
+                "mode": "NULLABLE",
+            },
+            {
+                "name": "station_geom",
+                "type": "GEOGRAPHY",
+                "description": "",
+                "mode": "NULLABLE",
+            },
+        ],
+    )
+
+    transform_csv >> load_to_bq

datasets/san_francisco_bikeshare_stations/bikeshare_stations/pipeline.yaml → datasets/san_francisco_bikeshare/bikeshare_station_info/pipeline.yaml

@@ -16,13 +16,13 @@
 resources:
 
   - type: bigquery_table
-    table_id: "bikeshare_stations"
-    description: "san francisco bikeshare stations"
+    table_id: "bikeshare_station_info"
+    description: ""
 
 dag:
   airflow_version: 2
   initialize:
-    dag_id: bikeshare_stations
+    dag_id: bikeshare_station_info
     default_args:
       owner: "Google"
       depends_on_past: False
@@ -40,7 +40,7 @@ dag:
       args:
 
         task_id: "transform_csv"
-        name: "bikeshare_stations"
+        name: "bikeshare_station_info"
         namespace: "default"
         affinity:
           nodeAffinity:
@@ -52,14 +52,14 @@ dag:
                       values:
                         - "pool-e2-standard-4"
         image_pull_policy: "Always"
-        image: "{{ var.json.san_francisco_bikeshare_stations.container_registry.run_csv_transform_kub }}"
+        image: "{{ var.json.san_francisco_bikeshare.container_registry.bikeshare_station_info }}"
         env_vars:
           SOURCE_URL_JSON: "https://gbfs.baywheels.com/gbfs/fr/station_information"
           SOURCE_FILE: "files/data.csv"
           TARGET_FILE: "files/data_output.csv"
           CHUNKSIZE: "750000"
           TARGET_GCS_BUCKET: "{{ var.value.composer_bucket }}"
-          TARGET_GCS_PATH: "data/san_francisco_bikeshare_stations/bikeshare_stations/data_output.csv"
+          TARGET_GCS_PATH: "data/san_francisco_bikeshare/bikeshare_station_info/data_output.csv"
         resources:
           limit_memory: "8G"
           limit_cpu: "3"
@@ -70,9 +70,9 @@ dag:
       args:
         task_id: "load_to_bq"
         bucket: "{{ var.value.composer_bucket }}"
-        source_objects: ["data/san_francisco_bikeshare_stations/bikeshare_stations/data_output.csv"]
+        source_objects: ["data/san_francisco_bikeshare/bikeshare_station_info/data_output.csv"]
         source_format: "CSV"
-        destination_project_dataset_table: "san_francisco.bikeshare_station_info"
+        destination_project_dataset_table: "san_francisco_bikeshare.bikeshare_station_info"
         skip_leading_rows: 1
         allow_quoted_newlines: True
         write_disposition: "WRITE_TRUNCATE"