Merge remote-tracking branch 'origin/master' into fast-dev

blueprints/data-solutions/bq-ml/README.md

@@ -97,5 +97,5 @@ module "test" {
   prefix     = "prefix"
 }
 
-# tftest modules=9 resources=67
+# tftest modules=9 resources=68
 ```

blueprints/data-solutions/data-playground/README.md

@@ -84,5 +84,5 @@ module "test" {
     parent             = "folders/467898377"
   }
 }
-# tftest modules=8 resources=66
+# tftest modules=8 resources=67
 ```

blueprints/data-solutions/vertex-mlops/README.md

@@ -72,7 +72,7 @@ module "test" {
     project_id         = "test-dev"
   }
 }
-# tftest modules=11 resources=90
+# tftest modules=11 resources=89
 ```
 <!-- BEGIN TFDOC -->
 ## Variables
@@ -128,5 +128,5 @@ module "test" {
     project_id         = "test-dev"
   }
 }
-# tftest modules=13 resources=95 e2e
+# tftest modules=13 resources=94 e2e
 ```

blueprints/data-solutions/vertex-mlops/main.tf

@@ -234,11 +234,18 @@ module "project" {
       module.service-account-github.iam_email,
       module.project.service_agents.cloudbuild.iam_email
     ]
-    "roles/monitoring.metricWriter" = [module.service-account-mlops.iam_email]
-    "roles/run.invoker"             = [module.service-account-mlops.iam_email]
+    "roles/logging.logWriter" = [
+      module.service-account-notebook.iam_email,
+    ]
+    "roles/monitoring.metricWriter" = [
+      module.service-account-mlops.iam_email,
+      module.service-account-notebook.iam_email,
+    ]
+    "roles/run.invoker" = [module.service-account-mlops.iam_email]
     "roles/serviceusage.serviceUsageConsumer" = [
       module.service-account-mlops.iam_email,
-      module.service-account-github.iam_email
+      module.service-account-github.iam_email,
+      module.service-account-notebook.iam_email,
     ]
     "roles/storage.admin" = [
       module.service-account-mlops.iam_email,

blueprints/data-solutions/vertex-mlops/vertex.tf

@@ -37,13 +37,6 @@ module "service-account-notebook" {
   source     = "../../../modules/iam-service-account"
   project_id = module.project.project_id
   name       = "notebook-sa"
-  iam_project_roles = {
-    (module.project.project_id) = [
-      "roles/logging.logWriter",
-      "roles/monitoring.metricWriter",
-      "roles/serviceusage.serviceUsageConsumer",
-    ]
-  }
 }
 
 resource "google_notebooks_runtime" "runtime" {