fix: re-create publishing task queue (#1021)

Author: lucacasonato

terraform/.terraform.lock.hcl

@@ -24,8 +24,8 @@ locals {
     "EMAIL_FROM"      = "help@${var.domain_name}"
     "EMAIL_FROM_NAME" = var.email_from_name
 
-    "PUBLISH_QUEUE_ID"           = google_cloud_tasks_queue.publishing_tasks.id
-    "NPM_TARBALL_BUILD_QUEUE_ID" = google_cloud_tasks_queue.npm_tarball_build_tasks.id
+    "PUBLISH_QUEUE_ID"           = "projects/${var.gcp_project}/locations/us-central1/queues/${local.publishing_tasks_queue_name}"
+    "NPM_TARBALL_BUILD_QUEUE_ID" = "projects/${var.gcp_project}/locations/us-central1/queues/${local.npm_tarball_build_tasks_queue_name}"
 
     "LOGS_BIGQUERY_TABLE_ID" = "${data.google_bigquery_dataset.default.dataset_id}._Default"
     "GCP_PROJECT_ID"         = var.gcp_project

terraform/cloud_run_api.tf

@@ -8,7 +8,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.0.0, < 6.0.0"
+      version = ">= 6.0.0, < 7.0.0"
     }
   }
 }

terraform/providers.tf

@@ -1,6 +1,11 @@
 // Copyright 2024 the JSR authors. All rights reserved. MIT license.
+locals {
+  publishing_tasks_queue_name        = var.gcp_project == "deno-registry3-prod" ? "publishing-tasks3" : "publishing-tasks"
+  npm_tarball_build_tasks_queue_name = "npm-tarball-build-tasks2"
+}
+
 resource "google_cloud_tasks_queue" "publishing_tasks" {
-  name     = "publishing-tasks"
+  name     = local.publishing_tasks_queue_name
   location = "us-central1"
 
   retry_config {
@@ -22,29 +27,22 @@ resource "google_cloud_tasks_queue" "publishing_tasks" {
     prevent_destroy = true
   }
 
-  # TODO: Set up queue-level routing from terraform.
-  # Blocked on: https://github.com/hashicorp/terraform-provider-google/issues/15022
-  # For now, manually set up queue level routing with these settings:
-  #  {
-  #   "httpTarget": {
-  #     "uriOverride": {
-  #       "host": "${stripPrefix("https://", google_cloud_run_v2_service.registry_api_tasks.uri)}",
-  #       "pathOverride": { "path": "/tasks/publish" }
-  #     },
-  #     "oidcToken": {
-  #       "serviceAccountEmail": "${google_service_account.task_dispatcher.email}"
-  #     }
-  #   }
-  # }
-  # The command to do this:
-  # curl -X PATCH -d @./data.json -i \
-  #   -H "Authorization: Bearer $(gcloud auth print-access-token)" \
-  #   -H "Content-Type: application/json" \
-  #   "https://cloudtasks.googleapis.com/v2beta3/projects/$PROJECT_ID/locations/us-central1/queues/publishing-tasks?updateMask=httpTarget.uriOverride,httpTarget.oidcToken"
+  http_target {
+    uri_override {
+      host = trimprefix(google_cloud_run_v2_service.registry_api_tasks.uri, "https://")
+      path_override {
+        path = "/tasks/publish"
+      }
+    }
+
+    oidc_token {
+      service_account_email = google_service_account.task_dispatcher.email
+    }
+  }
 }
 
 resource "google_cloud_tasks_queue" "npm_tarball_build_tasks" {
-  name     = "npm-tarball-build-tasks2"
+  name     = local.npm_tarball_build_tasks_queue_name
   location = "us-central1"
 
   retry_config {
@@ -66,25 +64,18 @@ resource "google_cloud_tasks_queue" "npm_tarball_build_tasks" {
     prevent_destroy = true
   }
 
-  # TODO: Set up queue-level routing from terraform.
-  # Blocked on: https://github.com/hashicorp/terraform-provider-google/issues/15022
-  # For now, manually set up queue level routing with these settings:
-  #  {
-  #   "httpTarget": {
-  #     "uriOverride": {
-  #       "host": "${stripPrefix("https://", google_cloud_run_v2_service.registry_api_tasks.uri)}",
-  #       "pathOverride": { "path": "/tasks/npm_tarball_build" }
-  #     },
-  #     "oidcToken": {
-  #       "serviceAccountEmail": "${google_service_account.task_dispatcher.email}"
-  #     }
-  #   }
-  # }
-  # The command to do this:
-  # curl -X PATCH -d @./data.json -i \
-  #   -H "Authorization: Bearer $(gcloud auth print-access-token)" \
-  #   -H "Content-Type: application/json" \
-  #   "https://cloudtasks.googleapis.com/v2beta3/projects/$PROJECT_ID/locations/us-central1/queues/npm-tarball-build-tasks2?updateMask=httpTarget.uriOverride,httpTarget.oidcToken"
+  http_target {
+    uri_override {
+      host = trimprefix(google_cloud_run_v2_service.registry_api_tasks.uri, "https://")
+      path_override {
+        path = "/tasks/npm_tarball_build"
+      }
+    }
+
+    oidc_token {
+      service_account_email = google_service_account.task_dispatcher.email
+    }
+  }
 }
 
 resource "google_service_account" "task_dispatcher" {