fix: tf error

Author: cka-y

api/src/shared/common/gcp_utils.py

@@ -79,8 +79,10 @@ def create_http_task_with_name(
     task_name: str,
     task_time: Timestamp,
     http_method: "tasks_v2.HttpMethod",
+    timeout_s: int = 1800,  # 30 minutes
 ):
     """Creates a GCP Cloud Task."""
+    from google.protobuf import duration_pb2
     token = tasks_v2.OidcToken(service_account_email=os.getenv("SERVICE_ACCOUNT_EMAIL"))
 
     parent = client.queue_path(project_id, gcp_region, queue_name)
@@ -98,6 +100,7 @@ def create_http_task_with_name(
             body=body,
             headers={"Content-Type": "application/json"},
         ),
+        dispatch_deadline=duration_pb2.Duration(seconds=timeout_s),
     )
     try:
         response = client.create_task(parent=parent, task=task)

functions-python/helpers/utils.py

@@ -198,6 +198,7 @@ def create_http_task(
     project_id: str,
     gcp_region: str,
     queue_name: str,
+    timeout_s: int = 1800,  # 30 minutes
 ) -> None:
     from shared.common.gcp_utils import create_http_task_with_name
     from google.cloud import tasks_v2
@@ -216,6 +217,7 @@ def create_http_task(
         task_name=None,  # No specific task name provided
         task_time=proto_time,
         http_method=tasks_v2.HttpMethod.POST,
+        timeout_s=timeout_s
     )
 
 

infra/batch/main.tf

@@ -441,13 +441,6 @@ resource "google_compute_global_forwarding_rule" "files_http_lb_rule_ipv4" {
   load_balancing_scheme = "EXTERNAL_MANAGED"
 }
 
-# This permission is added to allow the function to act as the service account and generate tokens.
-resource "google_project_iam_member" "service_account_workflow_act_as_binding" {
-  project = var.project_id
-  role    = "roles/iam.serviceAccountUser" #iam.serviceAccounts.actAs
-  member  = "serviceAccount:${google_service_account.functions_service_account.email}"
-}
-
 resource "google_cloud_run_service_iam_member" "pmtiles_builder_invoker" {
   project  = var.project_id
   location = var.gcp_region