feat: add optional variable service_directory_namespace and use dynam…

…ic block
terraform-google-modules · Feb 20, 2024 · e12768e · e12768e
1 parent 7a7eaf6
commit e12768e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/modules/private-service-connect/README.md b/modules/private-service-connect/README.md
@@ -57,7 +57,8 @@ If you have a firewall rule blocking egress traffic, you will need to configure
 | private\_service\_connect\_ip   | The internal IP to be used for the private service connect.                                                                                                                                             | `string` | n/a                     |   yes    |
 | private\_service\_connect\_name | Private Service Connect endpoint name. Defaults to `global-psconnect-ip`                                                                                                                                | `string` | `"global-psconnect-ip"` |    no    |
 | project\_id                     | Project ID for Private Service Connect.                                                                                                                                                                 | `string` | n/a                     |   yes    |
-| project\_region                 | Project Region for Private Service Connect.                                                                                                                                                             | `string` | "us-central1"           |   yes    |
+| service\_directory\_namespace   | Service Directory namespace to register the forwarding rule under.                                                                                                                                      | `string` | ""                      |    no    |
+| service\_directory\_region      | Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined.                                                                                       | `string` | ""                      |    no    |
 
 ## Outputs
 

diff --git a/modules/private-service-connect/main.tf b/modules/private-service-connect/main.tf
@@ -38,7 +38,13 @@ resource "google_compute_global_forwarding_rule" "forwarding_rule_private_servic
   network               = var.network_self_link
   ip_address            = google_compute_global_address.private_service_connect.id
   load_balancing_scheme = ""
-  service_directory_registrations {
-    service_directory_region = var.project_region
+
+  dynamic "service_directory_registrations" {
+    for_each = var.service_directory_namespace != "" || var.service_directory_region != "" ? [1] : []
+
+    content {
+      service_directory_namespace = var.service_directory_namespace
+      service_directory_region    = var.service_directory_region
+    }
   }
 }
diff --git a/modules/private-service-connect/variables.tf b/modules/private-service-connect/variables.tf
@@ -19,12 +19,6 @@ variable "project_id" {
   type        = string
 }
 
-variable "project_region" {
-  description = "Project Region for Private Service Connect."
-  type        = string
-  default     = "us-central1"
-}
-
 variable "network_self_link" {
   description = "Network self link for Private Service Connect."
   type        = string
@@ -62,3 +56,15 @@ variable "forwarding_rule_target" {
     error_message = "For forwarding_rule_target only `all-apis` and `vpc-sc` are valid."
   }
 }
+
+variable "service_directory_namespace" {
+  description = "Service Directory namespace to register the forwarding rule under"
+  type        = string
+  default     = ""
+}
+
+variable "service_directory_region" {
+  description = "Service Directory region to register this global forwarding rule under. Defaults to `us-central1` if not defined."
+  type        = string
+  default     = ""
+}