Merge branch 'main' into statefulMigMetadata

terraform-google-modules · Oct 24, 2023 · 1adbdd5 · 1adbdd5
2 parents 32e6927 + b4affee
commit 1adbdd5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/bigquery/biglake/bigquery_create_object_table/main.tf b/bigquery/biglake/bigquery_create_object_table/main.tf
@@ -25,7 +25,7 @@
 # [START bigquery_create_object_table]
 
 # This queries the provider for project information.
-data "google_project" "main" {}
+data "google_project" "default" {}
 
 # This creates a connection in the US region named "my-connection-id".
 # This connection is used to access the bucket.
@@ -38,7 +38,7 @@ resource "google_bigquery_connection" "default" {
 # This grants the previous connection IAM role access to the bucket.
 resource "google_project_iam_member" "default" {
   role    = "roles/storage.objectViewer"
-  project = data.google_project.main.project_id
+  project = data.google_project.default.project_id
   member  = "serviceAccount:${google_bigquery_connection.default.cloud_resource[0].service_account_id}"
 }
 

diff --git a/run/scheduled/main.tf b/run/scheduled/main.tf
@@ -64,6 +64,13 @@ resource "google_service_account" "default" {
     google_project_service.iam_api
   ]
 }
+
+resource "google_cloud_run_service_iam_member" "default" {
+  location = google_cloud_run_v2_service.default.location
+  service  = google_cloud_run_v2_service.default.name
+  role     = "roles/run.invoker"
+  member   = "serviceAccount:${google_service_account.default.email}"
+}
 # [END cloudrun_service_scheduled_sa]
 
 # [START cloudrun_service_scheduled_job]
@@ -95,12 +102,4 @@ resource "google_cloud_scheduler_job" "default" {
 }
 # [END cloudrun_service_scheduled_job]
 
-# [START cloudrun_service_scheduled_iam]
-resource "google_cloud_run_service_iam_member" "default" {
-  location = google_cloud_run_v2_service.default.location
-  service  = google_cloud_run_v2_service.default.name
-  role     = "roles/run.invoker"
-  member   = "serviceAccount:${google_service_account.default.email}"
-}
-# [END cloudrun_service_scheduled_iam]
 # [END cloudrun_scheduled_parent_tag]