From e796e25199c660c20a5dad06db1d4eec94835ff7 Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Tue, 16 Jan 2024 21:22:51 +1100
Subject: [PATCH] fix: apply style guide to run/tasks (#568)

* fix: apply style guide to run/tasks

* fix: update service name (#164)
---
 run/tasks/main.tf | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/run/tasks/main.tf b/run/tasks/main.tf
index e0d17b52..08831f55 100644
--- a/run/tasks/main.tf
+++ b/run/tasks/main.tf
@@ -17,9 +17,9 @@
 # [START cloudrun_tasks_parent_tag]
 # [START cloudrun_service_tasks_service]
 resource "google_cloud_run_v2_service" "default" {
-  name     = "cloud-run-service-name"
+  name     = "cloud-run-task-service"
   location = "us-central1"
-  provider = google-beta
+
   template {
     containers {
       image = "us-docker.pkg.dev/cloudrun/container/hello"
@@ -29,30 +29,26 @@ resource "google_cloud_run_v2_service" "default" {
 # [END cloudrun_service_tasks_service]
 
 # [START cloudrun_service_tasks_sa]
-resource "google_service_account" "sa" {
+resource "google_service_account" "default" {
   account_id   = "cloud-run-task-invoker"
   display_name = "Cloud Run Task Invoker"
-  provider     = google-beta
 }
 # [END cloudrun_service_tasks_sa]
 
 # [START cloudrun_service_tasks_run_invoke_permissions]
-resource "google_cloud_run_service_iam_binding" "binding" {
+resource "google_cloud_run_service_iam_binding" "default" {
   location = google_cloud_run_v2_service.default.location
   service  = google_cloud_run_v2_service.default.name
   role     = "roles/run.invoker"
-  members  = ["serviceAccount:${google_service_account.sa.email}"]
-  provider = google-beta
-  project  = google_cloud_run_v2_service.default.project
+  members  = ["serviceAccount:${google_service_account.default.email}"]
 }
 # [END cloudrun_service_tasks_run_invoke_permissions]
 
 # [START cloudrun_service_tasks_token_permissions]
 resource "google_project_iam_binding" "project_binding" {
-  role     = "roles/iam.serviceAccountTokenCreator"
-  members  = ["serviceAccount:${google_service_account.sa.email}"]
-  provider = google-beta
-  project  = google_cloud_run_v2_service.default.project
+  project = google_cloud_run_v2_service.default.project
+  role    = "roles/iam.serviceAccountTokenCreator"
+  members = ["serviceAccount:${google_service_account.default.email}"]
 }
 # [END cloudrun_service_tasks_token_permissions]
 
@@ -60,7 +56,6 @@ resource "google_project_iam_binding" "project_binding" {
 resource "google_cloud_tasks_queue" "default" {
   name     = "cloud-tasks-queue-name"
   location = "us-central1"
-  provider = google-beta
 }
 # [END cloudrun_service_tasks_queue]
 # [END cloudrun_tasks_parent_tag]