Merge branch 'master' into net-lb-proxy-int

GoogleCloudPlatform · Jul 31, 2023 · 2cc94bb · 2cc94bb
2 parents d06b8cf + 4f5d953
commit 2cc94bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/blueprints/data-solutions/vertex-mlops/main.tf b/blueprints/data-solutions/vertex-mlops/main.tf
@@ -116,8 +116,7 @@ module "gcs-bucket" {
 module "gcs-bucket-cloudbuild" {
   source         = "../../../modules/gcs"
   project_id     = module.project.project_id
-  name           = "${var.prefix}_cloudbuild"
-  prefix         = var.prefix
+  name           = "${module.project.project_id}_cloudbuild"
   location       = var.region
   storage_class  = "REGIONAL"
   versioning     = false
@@ -137,10 +136,10 @@ module "vpc-local" {
   count      = local.use_shared_vpc ? 0 : 1
   source     = "../../../modules/net-vpc"
   project_id = module.project.project_id
-  name       = "default"
+  name       = "vertex"
   subnets = [
     {
-      "name" : "default",
+      "name" : "subnet-${var.region}",
       "region" : "${var.region}",
       "ip_cidr_range" : "10.4.0.0/24",
       "secondary_ip_range" : null

diff --git a/modules/cloud-function-v2/main.tf b/modules/cloud-function-v2/main.tf
@@ -155,7 +155,7 @@ resource "google_cloudfunctions2_function" "function" {
 }
 
 resource "google_cloudfunctions2_function_iam_binding" "default" {
-  for_each       = var.iam
+  for_each       = local.iam
   project        = var.project_id
   location       = google_cloudfunctions2_function.function.location
   cloud_function = google_cloudfunctions2_function.function.name