Terraform corrections

Author: jcpitre

.github/workflows/api-deployer.yml

@@ -318,18 +318,18 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PLAN_OUTPUT: ${{ steps.plan.outputs.stdout }}
 
+      - name: Persist TF plan
+        uses: actions/upload-artifact@v4
+        with:
+          name: terraform-plan.txt
+          path: infra/terraform-plan.txt
+          overwrite: true
+
       - name: Terraform Apply
         if: ${{ inputs.TF_APPLY }}
         run: |
           cd infra
           terraform apply -auto-approve tf.plan
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PLAN_OUTPUT: ${{ steps.plan.outputs.stdout }}
-
-      - name: Persist TF plan
-        uses: actions/upload-artifact@v4
-        with:
-          name: terraform-plan.txt
-          path: infra/terraform-plan.txt
-          overwrite: true
+          PLAN_OUTPUT: ${{ steps.plan.outputs.stdout }}

api/src/shared/common/db_utils.py

@@ -12,6 +12,7 @@
     Validationreport,
     Gtfsrealtimefeed,
     Entitytype,
+    Redirectingid,
 )
 
 from shared.feed_filters.gtfs_feed_filter import GtfsFeedFilter, LocationFilter
@@ -90,7 +91,7 @@ def get_all_gtfs_feeds_query(
     feed_query = feed_query.options(
         joinedload(Gtfsfeed.gtfsdatasets)
         .joinedload(Gtfsdataset.validation_reports)
-        .joinedload(Validationreport.notices),
+        .joinedload(Validationreport.features),
         *get_joinedload_options(),
     ).order_by(Gtfsfeed.stable_id)
 
@@ -246,6 +247,6 @@ def get_joinedload_options() -> [_AbstractLoad]:
     return [
         joinedload(Feed.locations),
         joinedload(Feed.externalids),
-        joinedload(Feed.redirectingids),
+        joinedload(Feed.redirectingids).joinedload(Redirectingid.target),
         joinedload(Feed.officialstatushistories),
     ]

infra/functions-python/main.tf

@@ -88,6 +88,10 @@ data "google_pubsub_topic" "datasets_batch_topic" {
   name = "datasets-batch-topic-${var.environment}"
 }
 
+data "google_storage_bucket" "datasets_bucket" {
+  name = "${var.datasets_bucket_name}-${var.environment}"
+}
+
 # Service account to execute the cloud functions
 resource "google_service_account" "functions_service_account" {
   account_id   = "functions-service-account"
@@ -853,6 +857,7 @@ resource "google_cloudfunctions2_function" "export_csv" {
   service_config {
     environment_variables = {
       DATASETS_BUCKET_NANE = var.datasets_bucket_name
+      QAZ = "${var.datasets_bucket_name}-${var.environment}"
       PROJECT_ID  = var.project_id
       ENVIRONMENT = var.environment
     }